Skip to content

Commit 445a79b

Browse files
bz2bz2
committed
Adapt imports, metadata, and tests for the github move
1 parent 00e66cc commit 445a79b

File tree

967 files changed

+4124
-4314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

967 files changed

+4124
-4314
lines changed

‎.bzrignore renamed to ‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ cmd/charmload/charmload
88
.emacs.desktop
99
.emacs.desktop.lock
1010
*.test
11+
*.sw[nop]

‎.lbox

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎CONTRIBUTING

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ All changes to `juju-core` must be performed on a branch, that branch reviewed,
4747
then submitted. An overview of the commands used to do so follows. These
4848
examples use the `bzr` command, which is assumed to be aliased to `cobzr`, as
4949
described above. It is also assumed that your working directory is
50-
$GOPATH/src/launchpad.net/juju-core.
50+
$GOPATH/src/github.com/juju/juju.
5151

5252
First, create a branch for your change using the following command
5353

@@ -84,8 +84,8 @@ group is alphabetically sorted. eg:
8484
gc "launchpad.net/gocheck"
8585
"github.com/juju/loggo"
8686

87-
"launchpad.net/juju-core/state"
88-
"launchpad.net/juju-core/worker"
87+
"github.com/juju/juju/state"
88+
"github.com/juju/juju/worker"
8989
)
9090

9191
Because "launchpad.net/gocheck" will be referenced frequently in test suites,
@@ -100,7 +100,7 @@ at http://go.pkgdoc.org/pkg/launchpad.net/gocheck. `gocheck` is integrated
100100
into the source of each package so the standard `go test` command is used
101101
to run `gocheck` tests. For example
102102

103-
go test launchpad.net/juju-core/...
103+
go test github.com/juju/juju/...
104104

105105
will run all the tests in the `juju-core` project. By default `gocheck` prints
106106
only minimal output, and as `gocheck` is hooked into the testing framework via
@@ -127,10 +127,10 @@ to match a subset of test names.
127127
Finally, because by default `go test` runs the tests in the current package, and
128128
is not recursive, the following commands are equal, and will produce no output.
129129

130-
cd $GOPATH/src/launchpad.net/juju-core
130+
cd $GOPATH/src/github.com/juju/juju
131131
go test
132132

133-
go test launchpad.net/juju-core
133+
go test github.com/juju/juju
134134

135135
MongoDB
136136
-------
@@ -143,7 +143,7 @@ that supports Javascript for map-reduce functions. These functions are not
143143
supported by juju-mongodb and the associated tests will fail unless disabled
144144
with an environment variable:
145145

146-
JUJU_NOTEST_MONGOJS=1 go test launchpad.net/juju-core/...
146+
JUJU_NOTEST_MONGOJS=1 go test github.com/juju/juju/...
147147

148148
Proposing
149149
=========
@@ -222,7 +222,7 @@ lbox hooks
222222

223223
Before proposing, `lbox` runs a number of hooks to improve code quality and
224224
ensure that code is properly formatted. These checks are in
225-
`$GOPATH/src/launchpad.net/juju-core/.lbox.check`. They are run automatically
225+
`$GOPATH/src/github.com/juju/juju/.lbox.check`. They are run automatically
226226
by `lbox` before proposing or submitting. If these hooks fail you will have
227227
to resolve those errors before trying again. For example
228228

@@ -247,6 +247,6 @@ installation with all freshly downloaded directories.
247247
The bash commands used to generate it from scratch are as follows:
248248

249249
% export GOPATH=/tmp/juju-build
250-
% go get launchpad.net/juju-core/...
251-
% go test launchpad.net/juju-core/...
252-
% godeps -t $(go list launchpad.net/juju-core/...) > dependencies.tsv
250+
% go get github.com/juju/juju/...
251+
% go test github.com/juju/juju/...
252+
% godeps -t $(go list github.com/juju/juju/...) > dependencies.tsv

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ifndef GOPATH
66
$(warning You need to set up a GOPATH. See the README file.)
77
endif
88

9-
PROJECT := launchpad.net/juju-core
9+
PROJECT := github.com/juju/juju
1010
PROJECT_DIR := $(shell go list -e -f '{{.Dir}}' $(PROJECT))
1111

1212
ifeq ($(shell uname -p | sed -r 's/.*(x86|armel|armhf).*/golang/'), golang)

‎README

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Getting juju-core
6464

6565
The easiest way to get the source for `juju-core` is to use the `go get` command.
6666

67-
go get -v launchpad.net/juju-core/...
67+
go get -v github.com/juju/juju/...
6868

6969
This command will checkout the source of `juju-core` and inspect it for any unmet
7070
Go package dependencies, downloading those as well. `go get` will also build and
@@ -74,16 +74,16 @@ install `juju-core` and its dependencies. To checkout without installing, use th
7474
go help get
7575

7676
At this point you will have the bzr working copy of the `juju-core` source at
77-
`$GOPATH/launchpad.net/juju-core`. The source for any dependent packages will
77+
`$GOPATH/github.com/juju/juju`. The source for any dependent packages will
7878
also be available inside `$GOPATH`. You can use `bzr pull`, or the less convenient
79-
`go get -u launchpad.net/juju-core/...` to update the source from time to time.
79+
`go get -u github.com/juju/juju/...` to update the source from time to time.
8080
If you want to know more about contributing to `juju-core`, please read the
8181
`CONTRIBUTING` companion to this file.
8282

8383
Building juju-core
8484
==================
8585

86-
go install -v launchpad.net/juju-core/...
86+
go install -v github.com/juju/juju/...
8787

8888
Will build juju and install the binary commands into `$GOPATH/bin`. It is likely
8989
if you have just completed the previous step to get the `juju-core` source, the

‎agent/agent.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import (
1818
"github.com/juju/errors"
1919
"github.com/juju/loggo"
2020

21-
"launchpad.net/juju-core/instance"
22-
"launchpad.net/juju-core/state"
23-
"launchpad.net/juju-core/state/api"
24-
"launchpad.net/juju-core/state/api/params"
25-
"launchpad.net/juju-core/utils"
26-
"launchpad.net/juju-core/version"
21+
"github.com/juju/juju/instance"
22+
"github.com/juju/juju/state"
23+
"github.com/juju/juju/state/api"
24+
"github.com/juju/juju/state/api/params"
25+
"github.com/juju/juju/utils"
26+
"github.com/juju/juju/version"
2727
)
2828

2929
var logger = loggo.GetLogger("juju.agent")

‎agent/agent_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import (
1010
jc "github.com/juju/testing/checkers"
1111
gc "launchpad.net/gocheck"
1212

13-
"launchpad.net/juju-core/agent"
14-
"launchpad.net/juju-core/instance"
15-
"launchpad.net/juju-core/state"
16-
"launchpad.net/juju-core/state/api"
17-
"launchpad.net/juju-core/state/api/params"
18-
"launchpad.net/juju-core/testing"
19-
"launchpad.net/juju-core/version"
13+
"github.com/juju/juju/agent"
14+
"github.com/juju/juju/instance"
15+
"github.com/juju/juju/state"
16+
"github.com/juju/juju/state/api"
17+
"github.com/juju/juju/state/api/params"
18+
"github.com/juju/juju/testing"
19+
"github.com/juju/juju/version"
2020
)
2121

2222
type suite struct {

‎agent/bootstrap.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ package agent
66
import (
77
"fmt"
88

9-
"launchpad.net/juju-core/constraints"
10-
"launchpad.net/juju-core/environs/config"
11-
"launchpad.net/juju-core/instance"
12-
"launchpad.net/juju-core/names"
13-
"launchpad.net/juju-core/state"
14-
"launchpad.net/juju-core/state/api/params"
15-
"launchpad.net/juju-core/utils"
16-
"launchpad.net/juju-core/version"
9+
"github.com/juju/juju/constraints"
10+
"github.com/juju/juju/environs/config"
11+
"github.com/juju/juju/instance"
12+
"github.com/juju/juju/names"
13+
"github.com/juju/juju/state"
14+
"github.com/juju/juju/state/api/params"
15+
"github.com/juju/juju/utils"
16+
"github.com/juju/juju/version"
1717
)
1818

1919
// InitializeState should be called on the bootstrap machine's agent

‎agent/bootstrap_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ import (
77
jc "github.com/juju/testing/checkers"
88
gc "launchpad.net/gocheck"
99

10-
"launchpad.net/juju-core/agent"
11-
"launchpad.net/juju-core/constraints"
12-
"launchpad.net/juju-core/environs"
13-
"launchpad.net/juju-core/environs/config"
14-
"launchpad.net/juju-core/instance"
15-
"launchpad.net/juju-core/provider/dummy"
16-
"launchpad.net/juju-core/state"
17-
"launchpad.net/juju-core/state/api/params"
18-
"launchpad.net/juju-core/testing"
19-
"launchpad.net/juju-core/utils"
20-
"launchpad.net/juju-core/version"
10+
"github.com/juju/juju/agent"
11+
"github.com/juju/juju/constraints"
12+
"github.com/juju/juju/environs"
13+
"github.com/juju/juju/environs/config"
14+
"github.com/juju/juju/instance"
15+
"github.com/juju/juju/provider/dummy"
16+
"github.com/juju/juju/state"
17+
"github.com/juju/juju/state/api/params"
18+
"github.com/juju/juju/testing"
19+
"github.com/juju/juju/utils"
20+
"github.com/juju/juju/version"
2121
)
2222

2323
type bootstrapSuite struct {

‎agent/export_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88
"os"
99

10-
"launchpad.net/juju-core/state/api/params"
10+
"github.com/juju/juju/state/api/params"
1111
)
1212

1313
func Password(config Config) string {

‎agent/format-1.16.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111

1212
"launchpad.net/goyaml"
1313

14-
"launchpad.net/juju-core/state/api/params"
15-
"launchpad.net/juju-core/version"
14+
"github.com/juju/juju/state/api/params"
15+
"github.com/juju/juju/version"
1616
)
1717

1818
var format_1_16 = formatter_1_16{}

‎agent/format-1.16_whitebox_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
jc "github.com/juju/testing/checkers"
1515
gc "launchpad.net/gocheck"
1616

17-
"launchpad.net/juju-core/testing"
18-
"launchpad.net/juju-core/utils"
19-
"launchpad.net/juju-core/version"
17+
"github.com/juju/juju/testing"
18+
"github.com/juju/juju/utils"
19+
"github.com/juju/juju/version"
2020
)
2121

2222
type format_1_16Suite struct {

‎agent/format-1.18.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"launchpad.net/goyaml"
1212

13-
"launchpad.net/juju-core/state/api/params"
14-
"launchpad.net/juju-core/version"
13+
"github.com/juju/juju/state/api/params"
14+
"github.com/juju/juju/version"
1515
)
1616

1717
var format_1_18 = formatter_1_18{}

‎agent/format-1.18_whitebox_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
jc "github.com/juju/testing/checkers"
1414
gc "launchpad.net/gocheck"
1515

16-
"launchpad.net/juju-core/state/api/params"
17-
"launchpad.net/juju-core/testing"
18-
"launchpad.net/juju-core/utils"
19-
"launchpad.net/juju-core/version"
16+
"github.com/juju/juju/state/api/params"
17+
"github.com/juju/juju/testing"
18+
"github.com/juju/juju/utils"
19+
"github.com/juju/juju/version"
2020
)
2121

2222
type format_1_18Suite struct {

‎agent/format.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"fmt"
99
"strings"
1010

11-
"launchpad.net/juju-core/utils"
11+
"github.com/juju/juju/utils"
1212
)
1313

1414
// Current agent config format is defined as follows:

‎agent/format_whitebox_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
jc "github.com/juju/testing/checkers"
1111
gc "launchpad.net/gocheck"
1212

13-
"launchpad.net/juju-core/state/api/params"
14-
"launchpad.net/juju-core/testing"
15-
"launchpad.net/juju-core/version"
13+
"github.com/juju/juju/state/api/params"
14+
"github.com/juju/juju/testing"
15+
"github.com/juju/juju/version"
1616
)
1717

1818
type formatSuite struct {

‎agent/identity.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88
"os"
99

10-
"launchpad.net/juju-core/utils"
10+
"github.com/juju/juju/utils"
1111
)
1212

1313
func WriteSystemIdentityFile(c Config) error {

‎agent/identity_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
gc "launchpad.net/gocheck"
1111

12-
"launchpad.net/juju-core/state/api/params"
13-
"launchpad.net/juju-core/testing"
14-
"launchpad.net/juju-core/version"
12+
"github.com/juju/juju/state/api/params"
13+
"github.com/juju/juju/testing"
14+
"github.com/juju/juju/version"
1515
)
1616

1717
type identitySuite struct {

‎agent/mongo/mongo.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ import (
1717
"github.com/juju/loggo"
1818
"labix.org/v2/mgo"
1919

20-
"launchpad.net/juju-core/instance"
21-
"launchpad.net/juju-core/replicaset"
22-
"launchpad.net/juju-core/state/api/params"
23-
"launchpad.net/juju-core/upstart"
24-
"launchpad.net/juju-core/utils"
25-
"launchpad.net/juju-core/utils/apt"
26-
"launchpad.net/juju-core/version"
20+
"github.com/juju/juju/instance"
21+
"github.com/juju/juju/replicaset"
22+
"github.com/juju/juju/state/api/params"
23+
"github.com/juju/juju/upstart"
24+
"github.com/juju/juju/utils"
25+
"github.com/juju/juju/utils/apt"
26+
"github.com/juju/juju/version"
2727
)
2828

2929
const (

‎agent/mongo/mongo_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ import (
1818
jc "github.com/juju/testing/checkers"
1919
gc "launchpad.net/gocheck"
2020

21-
"launchpad.net/juju-core/agent/mongo"
22-
"launchpad.net/juju-core/instance"
23-
"launchpad.net/juju-core/state/api/params"
24-
coretesting "launchpad.net/juju-core/testing"
25-
"launchpad.net/juju-core/upstart"
26-
"launchpad.net/juju-core/utils"
27-
"launchpad.net/juju-core/version"
21+
"github.com/juju/juju/agent/mongo"
22+
"github.com/juju/juju/instance"
23+
"github.com/juju/juju/state/api/params"
24+
coretesting "github.com/juju/juju/testing"
25+
"github.com/juju/juju/upstart"
26+
"github.com/juju/juju/utils"
27+
"github.com/juju/juju/version"
2828
)
2929

3030
func Test(t *stdtesting.T) { gc.TestingT(t) }

‎agent/mongo/upgrade.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"labix.org/v2/mgo"
1414

15-
"launchpad.net/juju-core/upstart"
15+
"github.com/juju/juju/upstart"
1616
)
1717

1818
const mongoSocketTimeout = 10 * time.Second

‎agent/mongo/upgrade_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"labix.org/v2/mgo"
1515
gc "launchpad.net/gocheck"
1616

17-
"launchpad.net/juju-core/agent/mongo"
18-
coretesting "launchpad.net/juju-core/testing"
19-
"launchpad.net/juju-core/upstart"
17+
"github.com/juju/juju/agent/mongo"
18+
coretesting "github.com/juju/juju/testing"
19+
"github.com/juju/juju/upstart"
2020
)
2121

2222
type EnsureAdminSuite struct {

‎agent/package_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package agent_test
66
import (
77
stdtesting "testing"
88

9-
"launchpad.net/juju-core/testing"
9+
"github.com/juju/juju/testing"
1010
)
1111

1212
func Test(t *stdtesting.T) {

‎agent/tools/diskmanager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package tools
66
import (
77
"io"
88

9-
"launchpad.net/juju-core/tools"
10-
"launchpad.net/juju-core/version"
9+
"github.com/juju/juju/tools"
10+
"github.com/juju/juju/version"
1111
)
1212

1313
// DiskManager keeps track of a collections of Juju agent tools in a directory

0 commit comments

Comments
 (0)