diff --git a/Gopkg.lock b/Gopkg.lock index eb2a4a43ac..bbd076e369 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -43,7 +43,7 @@ memo = "940bdaea844d101260e58623a5bae0392cce009ab34d274e89058b780e880309" revision = "836a144573533ea4da4e6929c235fd348aed1c80" [[projects]] - name = "github.com/sdboyer/gps" + name = "github.com/golang/dep/gps" packages = [".","internal","internal/fs","pkgtree"] revision = "da7569e414959d639654919aaf67259c3add73f4" version = "v0.16.3" diff --git a/Gopkg.toml b/Gopkg.toml index a3db92cf25..846ccfebf5 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -16,5 +16,5 @@ version = ">=0.8.0, <1.0.0" [[dependencies]] - name = "github.com/sdboyer/gps" + name = "github.com/golang/dep/gps" version = ">=0.16.0, <1.0.0" diff --git a/analyzer.go b/analyzer.go index ffd338c974..4186b79fff 100644 --- a/analyzer.go +++ b/analyzer.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) type Analyzer struct{} @@ -32,7 +32,7 @@ func (a Analyzer) DeriveManifestAndLock(path string, n gps.ProjectRoot) (gps.Man return nil, nil, err } // TODO: No need to return lock til we decide about preferred versions, see - // https://github.com/sdboyer/gps/wiki/gps-for-Implementors#preferred-versions. + // https://github.com/golang/dep/gps/wiki/gps-for-Implementors#preferred-versions. return m, nil, nil } diff --git a/cmd/dep/ensure.go b/cmd/dep/ensure.go index 6ed07aca0f..4eff95c58d 100644 --- a/cmd/dep/ensure.go +++ b/cmd/dep/ensure.go @@ -17,8 +17,8 @@ import ( "github.com/golang/dep" "github.com/pkg/errors" - "github.com/sdboyer/gps" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps" + "github.com/golang/dep/gps/pkgtree" ) const ensureShortHelp = `Ensure a dependency is safely vendored in the project` diff --git a/cmd/dep/ensure_test.go b/cmd/dep/ensure_test.go index 11e858c430..ae7b611461 100644 --- a/cmd/dep/ensure_test.go +++ b/cmd/dep/ensure_test.go @@ -7,7 +7,7 @@ package main import ( "testing" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) func TestDeduceConstraint(t *testing.T) { diff --git a/cmd/dep/hash_in.go b/cmd/dep/hash_in.go index 45e2da09f1..6b2cce6a34 100644 --- a/cmd/dep/hash_in.go +++ b/cmd/dep/hash_in.go @@ -10,8 +10,8 @@ import ( "github.com/golang/dep" "github.com/pkg/errors" - "github.com/sdboyer/gps" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps" + "github.com/golang/dep/gps/pkgtree" ) func (cmd *hashinCommand) Name() string { return "hash-inputs" } diff --git a/cmd/dep/init.go b/cmd/dep/init.go index 7609aca265..564eeb251b 100644 --- a/cmd/dep/init.go +++ b/cmd/dep/init.go @@ -14,8 +14,8 @@ import ( "github.com/golang/dep" "github.com/pkg/errors" - "github.com/sdboyer/gps" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps" + "github.com/golang/dep/gps/pkgtree" ) const initShortHelp = `Initialize a new project with manifest and lock files` diff --git a/cmd/dep/prune.go b/cmd/dep/prune.go index b53b5301df..053eac1272 100644 --- a/cmd/dep/prune.go +++ b/cmd/dep/prune.go @@ -12,8 +12,8 @@ import ( "os" "github.com/golang/dep" - "github.com/sdboyer/gps" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps" + "github.com/golang/dep/gps/pkgtree" "github.com/pkg/errors" ) diff --git a/cmd/dep/remove.go b/cmd/dep/remove.go index ae7caec56c..b9877aa6c0 100644 --- a/cmd/dep/remove.go +++ b/cmd/dep/remove.go @@ -12,8 +12,8 @@ import ( "github.com/golang/dep" "github.com/pkg/errors" - "github.com/sdboyer/gps" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps" + "github.com/golang/dep/gps/pkgtree" ) const removeShortHelp = `Remove a dependency from the project` diff --git a/cmd/dep/status.go b/cmd/dep/status.go index 0118d675fb..21775702c2 100644 --- a/cmd/dep/status.go +++ b/cmd/dep/status.go @@ -17,8 +17,8 @@ import ( "github.com/golang/dep" "github.com/pkg/errors" - "github.com/sdboyer/gps" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps" + "github.com/golang/dep/gps/pkgtree" ) const statusShortHelp = `Report the status of the project's dependencies` diff --git a/cmd/dep/status_test.go b/cmd/dep/status_test.go index 508eb1b4c4..f660d3ca5e 100644 --- a/cmd/dep/status_test.go +++ b/cmd/dep/status_test.go @@ -7,7 +7,7 @@ package main import ( "testing" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) func TestStatusFormatVersion(t *testing.T) { diff --git a/context.go b/context.go index 5f7efbb90c..b94b397561 100644 --- a/context.go +++ b/context.go @@ -12,7 +12,7 @@ import ( "github.com/Masterminds/vcs" "github.com/pkg/errors" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) // Ctx defines the supporting context of the tool. diff --git a/context_test.go b/context_test.go index 699a5c6804..5ff275b78c 100644 --- a/context_test.go +++ b/context_test.go @@ -13,7 +13,7 @@ import ( "unicode" "github.com/golang/dep/test" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) func TestNewContextNoGOPATH(t *testing.T) { diff --git a/gps/CONTRIBUTING.md b/gps/CONTRIBUTING.md index 0ed6f9e28a..258bdc764a 100644 --- a/gps/CONTRIBUTING.md +++ b/gps/CONTRIBUTING.md @@ -8,15 +8,15 @@ a strong, motivating design behind `gps`, but we are always open to discussion on ways we can improve the library, particularly if it allows `gps` to cover more of the Go package management possibility space. -`gps` has no CLA, but we do have a [Code of Conduct](https://github.com/sdboyer/gps/blob/master/CODE_OF_CONDUCT.md). By +`gps` has no CLA, but we do have a [Code of Conduct](https://github.com/golang/dep/gps/blob/master/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. ## How can I contribute? It may be best to start by getting a handle on what `gps` actually is. Our -wiki has a [general introduction](https://github.com/sdboyer/gps/wiki/Introduction-to-gps), a -[guide for tool implementors](https://github.com/sdboyer/gps/wiki/gps-for-Implementors), and -a [guide for contributors](https://github.com/sdboyer/gps/wiki/gps-for-contributors). +wiki has a [general introduction](https://github.com/golang/dep/gps/wiki/Introduction-to-gps), a +[guide for tool implementors](https://github.com/golang/dep/gps/wiki/gps-for-Implementors), and +a [guide for contributors](https://github.com/golang/dep/gps/wiki/gps-for-contributors). There's also a [discursive essay](https://medium.com/@sdboyer/so-you-want-to-write-a-package-manager-4ae9c17d9527) that lays out the big-picture goals and considerations driving the `gps` design. @@ -29,12 +29,12 @@ appreciated: * **Identifying missed use cases:** the loose `gps` rule of thumb is, "if you can do it in Go, we support it in `gps`." Posting issues about cases we've missed helps us reach that goal. -* **Writing tests:** in the same vein, `gps` has a [large suite](https://github.com/sdboyer/gps/blob/master/CODE_OF_CONDUCT.md) of solving tests, but +* **Writing tests:** in the same vein, `gps` has a [large suite](https://github.com/golang/dep/gps/blob/master/CODE_OF_CONDUCT.md) of solving tests, but they still only scratch the surface. Writing tests is not only helpful, but is also a great way to get a feel for how `gps` works. * **Suggesting enhancements:** `gps` has plenty of missing chunks. Help fill them in! * **Reporting bugs**: `gps` being a library means this isn't always the easiest. - However, you could always compile the [example](https://github.com/sdboyer/gps/blob/master/example.go), run that against some of + However, you could always compile the [example](https://github.com/golang/dep/gps/blob/master/example.go), run that against some of your projects, and report problems you encounter. * **Building experimental tools with `gps`:** probably the best and fastest ways to kick the tires! diff --git a/gps/README.md b/gps/README.md index 0f956b2c1f..14a0494e4c 100644 --- a/gps/README.md +++ b/gps/README.md @@ -5,16 +5,16 @@
Build Status Windows Build Status -Build Status +Build Status Codecov -GoDoc +GoDoc

--- `gps` is the Go Packaging Solver. It is an engine for tackling dependency management problems in Go. It is trivial - [about 35 lines of -code](https://github.com/sdboyer/gps/blob/master/example.go) - to replicate the +code](https://github.com/golang/dep/gps/blob/master/example.go) - to replicate the fetching bits of `go get` using `gps`. `gps` is _not_ Yet Another Go Package Management Tool. Rather, it's a library @@ -34,14 +34,14 @@ discontinued in favor of gps powering the [experimental, eventually-official Go tooling](https://github.com/golang/dep). The wiki has a [general introduction to the `gps` -approach](https://github.com/sdboyer/gps/wiki/Introduction-to-gps), as well +approach](https://github.com/golang/dep/gps/wiki/Introduction-to-gps), as well as guides for folks [implementing -tools](https://github.com/sdboyer/gps/wiki/gps-for-Implementors) or [looking -to contribute](https://github.com/sdboyer/gps/wiki/gps-for-Contributors). +tools](https://github.com/golang/dep/gps/wiki/gps-for-Implementors) or [looking +to contribute](https://github.com/golang/dep/gps/wiki/gps-for-Contributors). ## Wait...a package management _library_?! -Yup. See [the rationale](https://github.com/sdboyer/gps/wiki/Rationale). +Yup. See [the rationale](https://github.com/golang/dep/gps/wiki/Rationale). ## Features @@ -62,18 +62,18 @@ productive. * Go >=1.6, or 1.5 with `GO15VENDOREXPERIMENT = 1` set * Everything under `vendor/` is volatile and controlled solely by the tool * A central cache of repositories is used (cannot be `GOPATH`) -* A [**project**](https://godoc.org/github.com/sdboyer/gps#ProjectRoot) concept: +* A [**project**](https://godoc.org/github.com/golang/dep/gps#ProjectRoot) concept: a tree of packages, all covered by one `vendor` directory * A [**manifest** and - **lock**](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#manifests-and-locks) + **lock**](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#manifests-and-locks) approach to tracking version and constraint information * Upstream sources are one of `git`, `bzr`, `hg` or `svn` repositories * What the available versions are for a given project/repository (all branches, tags, or revs are eligible) * In general, semver tags are preferred to branches, are preferred to plain tags * The actual packages that must be present (determined through import graph static analysis) - * How the import graph is statically analyzed - similar to `go/build`, but with a combinatorial view of build tags ([not yet implemented](https://github.com/sdboyer/gps/issues/99)) + * How the import graph is statically analyzed - similar to `go/build`, but with a combinatorial view of build tags ([not yet implemented](https://github.com/golang/dep/gps/issues/99)) * All packages from the same source (repository) must be the same version -* Package import cycles are not allowed ([not yet implemented](https://github.com/sdboyer/gps/issues/66)) +* Package import cycles are not allowed ([not yet implemented](https://github.com/golang/dep/gps/issues/66)) There are also some current non-choices that we would like to push into the realm of choice: @@ -93,23 +93,23 @@ general library could know _a priori_. * Which of the other package managers to interoperate with * Which types of version constraints to allow the user to specify (e.g., allowing [semver ranges](https://docs.npmjs.com/misc/semver) or not) * Whether or not to strip nested `vendor` directories -* Which packages in the import graph to [ignore](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#ignoring-packages) (if any) -* What constraint [overrides](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#overrides) to apply (if any) -* What [informational output](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#trace-and-tracelogger) to show the end user -* What dependency version constraints are declared by the [root project](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#manifest-data) -* What dependency version constraints are declared by [all dependencies](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#the-projectanalyzer) -* Given a [previous solution](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#lock-data), [which versions to let change, and how](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#tochange-changeall-and-downgrade) - * In the absence of a previous solution, whether or not to use [preferred versions](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#preferred-versions) -* Allowing, or not, the user to [swap in different source locations](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#projectidentifier) for import paths (e.g. forks) +* Which packages in the import graph to [ignore](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#ignoring-packages) (if any) +* What constraint [overrides](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#overrides) to apply (if any) +* What [informational output](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#trace-and-tracelogger) to show the end user +* What dependency version constraints are declared by the [root project](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#manifest-data) +* What dependency version constraints are declared by [all dependencies](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#the-projectanalyzer) +* Given a [previous solution](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#lock-data), [which versions to let change, and how](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#tochange-changeall-and-downgrade) + * In the absence of a previous solution, whether or not to use [preferred versions](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#preferred-versions) +* Allowing, or not, the user to [swap in different source locations](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#projectidentifier) for import paths (e.g. forks) * Specifying additional input/source packages not reachable from the root import graph This list may not be exhaustive - see the -[implementor's guide](https://github.com/sdboyer/gps/wiki/gps-for-Implementors) +[implementor's guide](https://github.com/golang/dep/gps/wiki/gps-for-Implementors) for a proper treatment. ## Contributing Yay, contributing! Please see -[CONTRIBUTING.md](https://github.com/sdboyer/gps/blob/master/CONTRIBUTING.md). +[CONTRIBUTING.md](https://github.com/golang/dep/gps/blob/master/CONTRIBUTING.md). Note that `gps` also abides by a [Code of -Conduct](https://github.com/sdboyer/gps/blob/master/CODE_OF_CONDUCT.md), and is MIT-licensed. +Conduct](https://github.com/golang/dep/gps/blob/master/CODE_OF_CONDUCT.md), and is MIT-licensed. diff --git a/gps/_testdata/src/cycle/a.go b/gps/_testdata/src/cycle/a.go index 75bdaf5e64..904499afd3 100644 --- a/gps/_testdata/src/cycle/a.go +++ b/gps/_testdata/src/cycle/a.go @@ -2,7 +2,7 @@ package cycle import ( "cycle/one" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/cycle/one/a.go b/gps/_testdata/src/cycle/one/a.go index 12c7563dd2..950091c3d7 100644 --- a/gps/_testdata/src/cycle/one/a.go +++ b/gps/_testdata/src/cycle/one/a.go @@ -2,7 +2,7 @@ package one import ( "cycle/two" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/cycle/two/a.go b/gps/_testdata/src/cycle/two/a.go index 392acac285..b18f7ff7d2 100644 --- a/gps/_testdata/src/cycle/two/a.go +++ b/gps/_testdata/src/cycle/two/a.go @@ -2,7 +2,7 @@ package two import ( "cycle" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/disallow/.m1p/a.go b/gps/_testdata/src/disallow/.m1p/a.go index e4e2ced5b1..1e63ccc171 100644 --- a/gps/_testdata/src/disallow/.m1p/a.go +++ b/gps/_testdata/src/disallow/.m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/disallow/a.go b/gps/_testdata/src/disallow/a.go index 59d2f72506..1dfaf15fee 100644 --- a/gps/_testdata/src/disallow/a.go +++ b/gps/_testdata/src/disallow/a.go @@ -4,7 +4,7 @@ import ( "sort" "disallow/testdata" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/doublenest/a.go b/gps/_testdata/src/doublenest/a.go index 04cac6aa27..fe8e6f91db 100644 --- a/gps/_testdata/src/doublenest/a.go +++ b/gps/_testdata/src/doublenest/a.go @@ -3,7 +3,7 @@ package base import ( "go/parser" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/doublenest/namemismatch/m1p/a.go b/gps/_testdata/src/doublenest/namemismatch/m1p/a.go index ec1f9b9831..fc858b4550 100644 --- a/gps/_testdata/src/doublenest/namemismatch/m1p/a.go +++ b/gps/_testdata/src/doublenest/namemismatch/m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/github.com/example/varied/m1p/a.go b/gps/_testdata/src/github.com/example/varied/m1p/a.go index 65fd7cad30..8051356345 100644 --- a/gps/_testdata/src/github.com/example/varied/m1p/a.go +++ b/gps/_testdata/src/github.com/example/varied/m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/github.com/example/varied/simple/simple.go b/gps/_testdata/src/github.com/example/varied/simple/simple.go index c8fbb059b1..00efc0ca67 100644 --- a/gps/_testdata/src/github.com/example/varied/simple/simple.go +++ b/gps/_testdata/src/github.com/example/varied/simple/simple.go @@ -3,7 +3,7 @@ package simple import ( "go/parser" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/igmain/a.go b/gps/_testdata/src/igmain/a.go index 300b730928..b883478000 100644 --- a/gps/_testdata/src/igmain/a.go +++ b/gps/_testdata/src/igmain/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/igmainfirst/z.go b/gps/_testdata/src/igmainfirst/z.go index 300b730928..b883478000 100644 --- a/gps/_testdata/src/igmainfirst/z.go +++ b/gps/_testdata/src/igmainfirst/z.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/igmainlong/a.go b/gps/_testdata/src/igmainlong/a.go index 300b730928..b883478000 100644 --- a/gps/_testdata/src/igmainlong/a.go +++ b/gps/_testdata/src/igmainlong/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/igmaint/a.go b/gps/_testdata/src/igmaint/a.go index 300b730928..b883478000 100644 --- a/gps/_testdata/src/igmaint/a.go +++ b/gps/_testdata/src/igmaint/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/m1p/a.go b/gps/_testdata/src/m1p/a.go index ec1f9b9831..fc858b4550 100644 --- a/gps/_testdata/src/m1p/a.go +++ b/gps/_testdata/src/m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/missing/a.go b/gps/_testdata/src/missing/a.go index 8522bddd65..acdd635c5e 100644 --- a/gps/_testdata/src/missing/a.go +++ b/gps/_testdata/src/missing/a.go @@ -4,7 +4,7 @@ import ( "sort" "missing/missing" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/missing/m1p/a.go b/gps/_testdata/src/missing/m1p/a.go index ec1f9b9831..fc858b4550 100644 --- a/gps/_testdata/src/missing/m1p/a.go +++ b/gps/_testdata/src/missing/m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/nest/a.go b/gps/_testdata/src/nest/a.go index 300b730928..b883478000 100644 --- a/gps/_testdata/src/nest/a.go +++ b/gps/_testdata/src/nest/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/nest/m1p/a.go b/gps/_testdata/src/nest/m1p/a.go index ec1f9b9831..fc858b4550 100644 --- a/gps/_testdata/src/nest/m1p/a.go +++ b/gps/_testdata/src/nest/m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/relimport/dotdotslash/a.go b/gps/_testdata/src/relimport/dotdotslash/a.go index 6468719717..af8b3d048e 100644 --- a/gps/_testdata/src/relimport/dotdotslash/a.go +++ b/gps/_testdata/src/relimport/dotdotslash/a.go @@ -1,7 +1,7 @@ package dotslash import ( - "../github.com/sdboyer/gps" + "../github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/ren/m1p/a.go b/gps/_testdata/src/ren/m1p/a.go index ec1f9b9831..fc858b4550 100644 --- a/gps/_testdata/src/ren/m1p/a.go +++ b/gps/_testdata/src/ren/m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/ren/simple/a.go b/gps/_testdata/src/ren/simple/a.go index 300b730928..b883478000 100644 --- a/gps/_testdata/src/ren/simple/a.go +++ b/gps/_testdata/src/ren/simple/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/simple/a.go b/gps/_testdata/src/simple/a.go index 300b730928..b883478000 100644 --- a/gps/_testdata/src/simple/a.go +++ b/gps/_testdata/src/simple/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/simpleallt/a.go b/gps/_testdata/src/simpleallt/a.go index 300b730928..b883478000 100644 --- a/gps/_testdata/src/simpleallt/a.go +++ b/gps/_testdata/src/simpleallt/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/simplet/a.go b/gps/_testdata/src/simplet/a.go index 300b730928..b883478000 100644 --- a/gps/_testdata/src/simplet/a.go +++ b/gps/_testdata/src/simplet/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/simplext/a.go b/gps/_testdata/src/simplext/a.go index 300b730928..b883478000 100644 --- a/gps/_testdata/src/simplext/a.go +++ b/gps/_testdata/src/simplext/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/skip_/a.go b/gps/_testdata/src/skip_/a.go index ffc88f4cb8..28d258654a 100644 --- a/gps/_testdata/src/skip_/a.go +++ b/gps/_testdata/src/skip_/a.go @@ -3,7 +3,7 @@ package skip import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/twopkgs/a.go b/gps/_testdata/src/twopkgs/a.go index 300b730928..b883478000 100644 --- a/gps/_testdata/src/twopkgs/a.go +++ b/gps/_testdata/src/twopkgs/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/varied/m1p/a.go b/gps/_testdata/src/varied/m1p/a.go index 65fd7cad30..8051356345 100644 --- a/gps/_testdata/src/varied/m1p/a.go +++ b/gps/_testdata/src/varied/m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/_testdata/src/varied/simple/simple.go b/gps/_testdata/src/varied/simple/simple.go index c8fbb059b1..00efc0ca67 100644 --- a/gps/_testdata/src/varied/simple/simple.go +++ b/gps/_testdata/src/varied/simple/simple.go @@ -3,7 +3,7 @@ package simple import ( "go/parser" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/gps/bridge.go b/gps/bridge.go index 8ee24f85f2..390aebbed6 100644 --- a/gps/bridge.go +++ b/gps/bridge.go @@ -6,7 +6,7 @@ import ( "path/filepath" "sync/atomic" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) // sourceBridge is an adapter to SourceManagers that tailor operations for a diff --git a/gps/deduce_test.go b/gps/deduce_test.go index 65670962b7..77898ba604 100644 --- a/gps/deduce_test.go +++ b/gps/deduce_test.go @@ -31,51 +31,51 @@ func mkurl(s string) (u *url.URL) { var pathDeductionFixtures = map[string][]pathDeductionFixture{ "github": []pathDeductionFixture{ { - in: "github.com/sdboyer/gps", - root: "github.com/sdboyer/gps", + in: "github.com/golang/dep/gps", + root: "github.com/golang/dep/gps", mb: maybeSources{ - maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")}, - maybeGitSource{url: mkurl("ssh://git@github.com/sdboyer/gps")}, - maybeGitSource{url: mkurl("git://github.com/sdboyer/gps")}, - maybeGitSource{url: mkurl("http://github.com/sdboyer/gps")}, + maybeGitSource{url: mkurl("https://github.com/golang/dep/gps")}, + maybeGitSource{url: mkurl("ssh://git@github.com/golang/dep/gps")}, + maybeGitSource{url: mkurl("git://github.com/golang/dep/gps")}, + maybeGitSource{url: mkurl("http://github.com/golang/dep/gps")}, }, }, { - in: "github.com/sdboyer/gps/foo", - root: "github.com/sdboyer/gps", + in: "github.com/golang/dep/gps/foo", + root: "github.com/golang/dep/gps", mb: maybeSources{ - maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")}, - maybeGitSource{url: mkurl("ssh://git@github.com/sdboyer/gps")}, - maybeGitSource{url: mkurl("git://github.com/sdboyer/gps")}, - maybeGitSource{url: mkurl("http://github.com/sdboyer/gps")}, + maybeGitSource{url: mkurl("https://github.com/golang/dep/gps")}, + maybeGitSource{url: mkurl("ssh://git@github.com/golang/dep/gps")}, + maybeGitSource{url: mkurl("git://github.com/golang/dep/gps")}, + maybeGitSource{url: mkurl("http://github.com/golang/dep/gps")}, }, }, { // TODO(sdboyer) is this a problem for enforcing uniqueness? do we // need to collapse these extensions? - in: "github.com/sdboyer/gps.git/foo", - root: "github.com/sdboyer/gps.git", + in: "github.com/golang/dep/gps.git/foo", + root: "github.com/golang/dep/gps.git", mb: maybeSources{ - maybeGitSource{url: mkurl("https://github.com/sdboyer/gps.git")}, - maybeGitSource{url: mkurl("ssh://git@github.com/sdboyer/gps.git")}, - maybeGitSource{url: mkurl("git://github.com/sdboyer/gps.git")}, - maybeGitSource{url: mkurl("http://github.com/sdboyer/gps.git")}, + maybeGitSource{url: mkurl("https://github.com/golang/dep/gps.git")}, + maybeGitSource{url: mkurl("ssh://git@github.com/golang/dep/gps.git")}, + maybeGitSource{url: mkurl("git://github.com/golang/dep/gps.git")}, + maybeGitSource{url: mkurl("http://github.com/golang/dep/gps.git")}, }, }, { in: "git@github.com:sdboyer/gps", - root: "github.com/sdboyer/gps", - mb: maybeGitSource{url: mkurl("ssh://git@github.com/sdboyer/gps")}, + root: "github.com/golang/dep/gps", + mb: maybeGitSource{url: mkurl("ssh://git@github.com/golang/dep/gps")}, }, { - in: "https://github.com/sdboyer/gps", - root: "github.com/sdboyer/gps", - mb: maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")}, + in: "https://github.com/golang/dep/gps", + root: "github.com/golang/dep/gps", + mb: maybeGitSource{url: mkurl("https://github.com/golang/dep/gps")}, }, { - in: "https://github.com/sdboyer/gps/foo/bar", - root: "github.com/sdboyer/gps", - mb: maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")}, + in: "https://github.com/golang/dep/gps/foo/bar", + root: "github.com/golang/dep/gps", + mb: maybeGitSource{url: mkurl("https://github.com/golang/dep/gps")}, }, { in: "github.com/sdboyer-/gps/foo", @@ -127,30 +127,30 @@ var pathDeductionFixtures = map[string][]pathDeductionFixture{ in: "gopkg.in/sdboyer/gps.v0", root: "gopkg.in/sdboyer/gps.v0", mb: maybeSources{ - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("https://github.com/sdboyer/gps"), major: 0}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("ssh://git@github.com/sdboyer/gps"), major: 0}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("git://github.com/sdboyer/gps"), major: 0}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("http://github.com/sdboyer/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("https://github.com/golang/dep/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("ssh://git@github.com/golang/dep/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("git://github.com/golang/dep/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("http://github.com/golang/dep/gps"), major: 0}, }, }, { in: "gopkg.in/sdboyer/gps.v0/foo", root: "gopkg.in/sdboyer/gps.v0", mb: maybeSources{ - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("https://github.com/sdboyer/gps"), major: 0}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("ssh://git@github.com/sdboyer/gps"), major: 0}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("git://github.com/sdboyer/gps"), major: 0}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("http://github.com/sdboyer/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("https://github.com/golang/dep/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("ssh://git@github.com/golang/dep/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("git://github.com/golang/dep/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("http://github.com/golang/dep/gps"), major: 0}, }, }, { in: "gopkg.in/sdboyer/gps.v1/foo/bar", root: "gopkg.in/sdboyer/gps.v1", mb: maybeSources{ - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("https://github.com/sdboyer/gps"), major: 1}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("ssh://git@github.com/sdboyer/gps"), major: 1}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("git://github.com/sdboyer/gps"), major: 1}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("http://github.com/sdboyer/gps"), major: 1}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("https://github.com/golang/dep/gps"), major: 1}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("ssh://git@github.com/golang/dep/gps"), major: 1}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("git://github.com/golang/dep/gps"), major: 1}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("http://github.com/golang/dep/gps"), major: 1}, }, }, { diff --git a/gps/example.go b/gps/example.go index 063d93d43b..0ed2816a8d 100644 --- a/gps/example.go +++ b/gps/example.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "github.com/sdboyer/gps" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps" + "github.com/golang/dep/gps/pkgtree" ) // This is probably the simplest possible implementation of gps. It does the diff --git a/gps/glide.yaml b/gps/glide.yaml index 7f9f8799cd..70c4472b90 100644 --- a/gps/glide.yaml +++ b/gps/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/sdboyer/gps +package: github.com/golang/dep/gps owners: - name: Sam Boyer email: tech@samboyer.org diff --git a/gps/hash.go b/gps/hash.go index b2ee8e4663..f979b42c7a 100644 --- a/gps/hash.go +++ b/gps/hash.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) // string headers used to demarcate sections in hash input creation diff --git a/gps/identifier.go b/gps/identifier.go index 7406ce96d2..aac7c212b8 100644 --- a/gps/identifier.go +++ b/gps/identifier.go @@ -20,17 +20,17 @@ import ( // management domain has lots of different path-ish strings floating around: // // actual directories: -// /home/sdboyer/go/src/github.com/sdboyer/gps/example +// /home/sdboyer/go/src/github.com/golang/dep/gps/example // URLs: -// https://github.com/sdboyer/gps +// https://github.com/golang/dep/gps // import paths: -// github.com/sdboyer/gps/example +// github.com/golang/dep/gps/example // portions of import paths that refer to a package: // example // portions that could not possibly refer to anything sane: // github.com/sdboyer // portions that correspond to a repository root: -// github.com/sdboyer/gps +// github.com/golang/dep/gps // // While not a panacea, having ProjectRoot allows gps to clearly indicate via // the type system when a path-ish string must have particular semantics. @@ -49,10 +49,10 @@ type ProjectRoot string // These can be either a full URL, including protocol, or plain import paths. // So, these are all valid data for Source: // -// github.com/sdboyer/gps +// github.com/golang/dep/gps // github.com/fork/gps // git@github.com:sdboyer/gps -// https://github.com/sdboyer/gps +// https://github.com/golang/dep/gps // // With plain import paths, network addresses are derived purely through an // algorithm. By having an explicit network name, it becomes possible to, for diff --git a/gps/lock_test.go b/gps/lock_test.go index b85e0de14b..0b1f3a540b 100644 --- a/gps/lock_test.go +++ b/gps/lock_test.go @@ -8,7 +8,7 @@ import ( func TestLockedProjectSorting(t *testing.T) { // version doesn't matter here lps := []LockedProject{ - NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), nil), + NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), nil), NewLockedProject(mkPI("foo"), NewVersion("nada"), nil), NewLockedProject(mkPI("bar"), NewVersion("zip"), nil), NewLockedProject(mkPI("qux"), NewVersion("zilch"), nil), @@ -27,14 +27,14 @@ func TestLockedProjectSorting(t *testing.T) { func TestLockedProjectsEq(t *testing.T) { lps := []LockedProject{ - NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"gps"}), - NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), nil), - NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"gps", "flugle"}), + NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), []string{"gps"}), + NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), nil), + NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), []string{"gps", "flugle"}), NewLockedProject(mkPI("foo"), NewVersion("nada"), []string{"foo"}), - NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"flugle", "gps"}), - NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0").Is("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}), - NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.11.0"), []string{"gps"}), - NewLockedProject(mkPI("github.com/sdboyer/gps"), Revision("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}), + NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), []string{"flugle", "gps"}), + NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0").Is("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}), + NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.11.0"), []string{"gps"}), + NewLockedProject(mkPI("github.com/golang/dep/gps"), Revision("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}), } fix := map[string]struct { @@ -77,7 +77,7 @@ func TestLockedProjectsEq(t *testing.T) { } func TestLocksAreEq(t *testing.T) { - gpl := NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0").Is("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}) + gpl := NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0").Is("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}) svpl := NewLockedProject(mkPI("github.com/Masterminds/semver"), NewVersion("v2.0.0"), []string{"semver"}) bbbt := NewLockedProject(mkPI("github.com/beeblebrox/browntown"), NewBranch("master").Is("63fc17eb7966a6f4cc0b742bf42731c52c4ac740"), []string{"browntown", "smoochies"}) @@ -119,7 +119,7 @@ func TestLocksAreEq(t *testing.T) { t.Error("checking equality resorted l2") } - l1.p[0] = NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.11.0"), []string{"gps"}) + l1.p[0] = NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.11.0"), []string{"gps"}) if LocksAreEq(l1, l2, false) { t.Error("should fail when individual lp were not eq") } diff --git a/gps/lockdiff_test.go b/gps/lockdiff_test.go index 87a40c394f..6ab108d14e 100644 --- a/gps/lockdiff_test.go +++ b/gps/lockdiff_test.go @@ -42,8 +42,8 @@ func TestStringDiff_Modify(t *testing.T) { } func TestDiffProjects_NoChange(t *testing.T) { - p1 := NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"gps"}) - p2 := NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"gps"}) + p1 := NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), []string{"gps"}) + p2 := NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), []string{"gps"}) diff := DiffProjects(p1, p2) if diff != nil { diff --git a/gps/manager_test.go b/gps/manager_test.go index 40989ea413..bc010c4ae5 100644 --- a/gps/manager_test.go +++ b/gps/manager_test.go @@ -439,7 +439,7 @@ func TestDeduceProjectRoot(t *testing.T) { sm, clean := mkNaiveSM(t) defer clean() - in := "github.com/sdboyer/gps" + in := "github.com/golang/dep/gps" pr, err := sm.DeduceProjectRoot(in) if err != nil { t.Errorf("Problem while detecting root of %q %s", in, err) @@ -518,7 +518,7 @@ func TestMultiFetchThreadsafe(t *testing.T) { } projects := []ProjectIdentifier{ - mkPI("github.com/sdboyer/gps"), + mkPI("github.com/golang/dep/gps"), mkPI("github.com/sdboyer/gpkt"), ProjectIdentifier{ ProjectRoot: ProjectRoot("github.com/sdboyer/gpkt"), @@ -613,7 +613,7 @@ func TestMultiFetchThreadsafe(t *testing.T) { } // Ensure that we don't see concurrent map writes when calling ListVersions. -// Regression test for https://github.com/sdboyer/gps/issues/156. +// Regression test for https://github.com/golang/dep/gps/issues/156. // // Ideally this would be caught by TestMultiFetchThreadsafe, but perhaps the // high degree of parallelism pretty much eliminates that as a realistic @@ -628,7 +628,7 @@ func TestListVersionsRacey(t *testing.T) { defer clean() wg := &sync.WaitGroup{} - id := mkPI("github.com/sdboyer/gps") + id := mkPI("github.com/golang/dep/gps") for i := 0; i < 20; i++ { wg.Add(1) go func() { diff --git a/gps/manifest.go b/gps/manifest.go index bfcff97c21..6ee9f682c3 100644 --- a/gps/manifest.go +++ b/gps/manifest.go @@ -12,7 +12,7 @@ package gps // // This does entail that manifests can express constraints on projects they do // not themselves import. This is by design, but its implications are complex. -// See the gps docs for more information: https://github.com/sdboyer/gps/wiki +// See the gps docs for more information: https://github.com/golang/dep/gps/wiki type Manifest interface { // Returns a list of project-level constraints. DependencyConstraints() ProjectConstraints diff --git a/gps/pkgtree/pkgtree_test.go b/gps/pkgtree/pkgtree_test.go index 7196ed160a..466c50220e 100644 --- a/gps/pkgtree/pkgtree_test.go +++ b/gps/pkgtree/pkgtree_test.go @@ -13,8 +13,8 @@ import ( "strings" "testing" - "github.com/sdboyer/gps/internal" - "github.com/sdboyer/gps/internal/fs" + "github.com/golang/dep/gps/internal" + "github.com/golang/dep/gps/internal/fs" ) // Stores a reference to original IsStdLib, so we could restore overridden version. @@ -521,7 +521,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, }, @@ -541,7 +541,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, }, @@ -603,7 +603,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, TestImports: []string{ @@ -627,7 +627,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, TestImports: []string{ @@ -651,7 +651,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, TestImports: []string{ @@ -676,7 +676,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "os", "sort", }, @@ -697,7 +697,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, }, @@ -708,7 +708,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "os", "sort", }, @@ -756,7 +756,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "os", "sort", }, @@ -768,7 +768,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, }, @@ -788,7 +788,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "base", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "go/parser", }, }, @@ -810,7 +810,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "os", "sort", }, @@ -831,7 +831,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "base", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "go/parser", }, }, @@ -853,7 +853,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "os", "sort", }, @@ -874,7 +874,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", "unicode", }, @@ -895,7 +895,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", "unicode", }, @@ -916,7 +916,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", "unicode", }, @@ -937,7 +937,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", "unicode", }, @@ -984,7 +984,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "missing/missing", "sort", }, @@ -996,7 +996,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "os", "sort", }, @@ -1021,7 +1021,7 @@ func TestListPackages(t *testing.T) { Name: "cycle", Imports: []string{ "cycle/one", - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", }, }, }, @@ -1032,7 +1032,7 @@ func TestListPackages(t *testing.T) { Name: "one", Imports: []string{ "cycle/two", - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", }, }, }, @@ -1043,7 +1043,7 @@ func TestListPackages(t *testing.T) { Name: "two", Imports: []string{ "cycle", - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", }, }, }, @@ -1064,7 +1064,7 @@ func TestListPackages(t *testing.T) { Name: "disallow", Imports: []string{ "disallow/testdata", - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, }, @@ -1077,7 +1077,7 @@ func TestListPackages(t *testing.T) { //CommentPath: "", //Name: "m1p", //Imports: []string{ - //"github.com/sdboyer/gps", + //"github.com/golang/dep/gps", //"os", //"sort", //}, @@ -1146,7 +1146,7 @@ func TestListPackages(t *testing.T) { Dir: j("relimport/dotdotslash"), ImportPath: "relimport/dotdotslash", LocalImports: []string{ - "../github.com/sdboyer/gps", + "../github.com/golang/dep/gps", }, }, }, @@ -1165,7 +1165,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "skip", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, }, @@ -1211,7 +1211,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "go/parser", "varied/simple/another", }, @@ -1248,7 +1248,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "os", "sort", }, @@ -1384,7 +1384,7 @@ func TestListPackagesNoPerms(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, }, @@ -1478,12 +1478,12 @@ func TestToReachMap(t *testing.T) { // maps of each internal package, and their expected external and internal // imports in the maximal case. allex := map[string][]string{ - b(""): {"encoding/binary", "github.com/Masterminds/semver", "github.com/sdboyer/gps", "go/parser", "hash", "net/http", "os", "sort"}, - b("m1p"): {"github.com/sdboyer/gps", "os", "sort"}, + b(""): {"encoding/binary", "github.com/Masterminds/semver", "github.com/golang/dep/gps", "go/parser", "hash", "net/http", "os", "sort"}, + b("m1p"): {"github.com/golang/dep/gps", "os", "sort"}, b("namemismatch"): {"github.com/Masterminds/semver", "os"}, - b("otherpath"): {"github.com/sdboyer/gps", "os", "sort"}, - b("simple"): {"encoding/binary", "github.com/sdboyer/gps", "go/parser", "hash", "os", "sort"}, - b("simple/another"): {"encoding/binary", "github.com/sdboyer/gps", "hash", "os", "sort"}, + b("otherpath"): {"github.com/golang/dep/gps", "os", "sort"}, + b("simple"): {"encoding/binary", "github.com/golang/dep/gps", "go/parser", "hash", "os", "sort"}, + b("simple/another"): {"encoding/binary", "github.com/golang/dep/gps", "hash", "os", "sort"}, } allin := map[string][]string{ @@ -1625,7 +1625,7 @@ func TestToReachMap(t *testing.T) { b("")+" encoding/binary", b("simple")+" encoding/binary", b("simple/another")+" encoding/binary", - b("otherpath")+" github.com/sdboyer/gps os sort", + b("otherpath")+" github.com/golang/dep/gps os sort", ) // almost the same as previous, but varied just goes away completely @@ -1635,7 +1635,7 @@ func TestToReachMap(t *testing.T) { b(""), b("simple")+" encoding/binary", b("simple/another")+" encoding/binary", - bl("otherpath", "m1p")+" github.com/sdboyer/gps os sort", + bl("otherpath", "m1p")+" github.com/golang/dep/gps os sort", ) validate() @@ -1666,7 +1666,7 @@ func TestToReachMap(t *testing.T) { } except( // root pkg loses on everything in varied/simple/another and varied/m1p - bl("", "simple", "simple/another", "m1p", "otherpath")+" hash encoding/binary go/parser github.com/sdboyer/gps sort", + bl("", "simple", "simple/another", "m1p", "otherpath")+" hash encoding/binary go/parser github.com/golang/dep/gps sort", b("otherpath"), b("simple"), ) @@ -1677,7 +1677,7 @@ func TestToReachMap(t *testing.T) { ignore[b("namemismatch")] = true except( // root pkg loses on everything in varied/simple/another and varied/m1p - bl("", "simple", "simple/another", "m1p", "otherpath", "namemismatch")+" hash encoding/binary go/parser github.com/sdboyer/gps sort os github.com/Masterminds/semver", + bl("", "simple", "simple/another", "m1p", "otherpath", "namemismatch")+" hash encoding/binary go/parser github.com/golang/dep/gps sort os github.com/Masterminds/semver", b("otherpath"), b("simple"), b("namemismatch"), @@ -1711,7 +1711,7 @@ func TestFlattenReachMap(t *testing.T) { all := []string{ "encoding/binary", "github.com/Masterminds/semver", - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "go/parser", "hash", "net/http", @@ -1797,7 +1797,7 @@ func TestFlattenReachMap(t *testing.T) { ignore = map[string]bool{ "github.com/example/varied/simple": true, } - // we get github.com/sdboyer/gps from m1p, too, so it should still be there + // we get github.com/golang/dep/gps from m1p, too, so it should still be there except("go/parser") validate() @@ -1832,17 +1832,17 @@ func TestFlattenReachMap(t *testing.T) { "github.com/example/varied/simple": true, "github.com/example/varied/m1p": true, } - except("sort", "github.com/sdboyer/gps", "go/parser") + except("sort", "github.com/golang/dep/gps", "go/parser") validate() // finally, directly ignore some external packages name = "ignore external" ignore = map[string]bool{ - "github.com/sdboyer/gps": true, + "github.com/golang/dep/gps": true, "go/parser": true, "sort": true, } - except("sort", "github.com/sdboyer/gps", "go/parser") + except("sort", "github.com/golang/dep/gps", "go/parser") validate() // The only thing varied *doesn't* cover is disallowed path patterns @@ -1856,7 +1856,7 @@ func TestFlattenReachMap(t *testing.T) { t.Errorf("Should not have any error packages from ToReachMap, got %s", em) } result := rm.Flatten(true) - expect = []string{"github.com/sdboyer/gps", "hash", "sort"} + expect = []string{"github.com/golang/dep/gps", "hash", "sort"} if !reflect.DeepEqual(expect, result) { t.Errorf("Wrong imports in %q case:\n\t(GOT): %s\n\t(WNT): %s", name, result, expect) } diff --git a/gps/pkgtree/reachmap.go b/gps/pkgtree/reachmap.go index 5d1f155907..2d50032b54 100644 --- a/gps/pkgtree/reachmap.go +++ b/gps/pkgtree/reachmap.go @@ -4,7 +4,7 @@ import ( "sort" "strings" - "github.com/sdboyer/gps/internal" + "github.com/golang/dep/gps/internal" ) // ReachMap maps a set of import paths (keys) to the sets of transitively diff --git a/gps/rootdata.go b/gps/rootdata.go index 9548ebad90..6b3fe189e3 100644 --- a/gps/rootdata.go +++ b/gps/rootdata.go @@ -4,8 +4,8 @@ import ( "sort" "github.com/armon/go-radix" - "github.com/sdboyer/gps/internal" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/internal" + "github.com/golang/dep/gps/pkgtree" ) // rootdata holds static data and constraining rules from the root project for diff --git a/gps/selection_test.go b/gps/selection_test.go index 6fb727827c..18d33276a2 100644 --- a/gps/selection_test.go +++ b/gps/selection_test.go @@ -5,7 +5,7 @@ import ( "testing" ) -// Regression test for https://github.com/sdboyer/gps/issues/174 +// Regression test for https://github.com/golang/dep/gps/issues/174 func TestUnselectedRemoval(t *testing.T) { // We don't need a comparison function for this test bmi1 := bimodalIdentifier{ diff --git a/gps/solve_basic_test.go b/gps/solve_basic_test.go index a04d258943..a3c806e707 100644 --- a/gps/solve_basic_test.go +++ b/gps/solve_basic_test.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/Masterminds/semver" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) var regfrom = regexp.MustCompile(`^(\w*) from (\w*) ([0-9\.\*]*)`) diff --git a/gps/solve_bimodal_test.go b/gps/solve_bimodal_test.go index 5b5927d452..c4a5e43110 100644 --- a/gps/solve_bimodal_test.go +++ b/gps/solve_bimodal_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) // dsp - "depspec with packages" diff --git a/gps/solve_test.go b/gps/solve_test.go index a7a7d2371e..367e1baf05 100644 --- a/gps/solve_test.go +++ b/gps/solve_test.go @@ -14,8 +14,8 @@ import ( "testing" "unicode" - "github.com/sdboyer/gps/internal" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/internal" + "github.com/golang/dep/gps/pkgtree" ) var fixtorun string diff --git a/gps/solver.go b/gps/solver.go index 3f6cd05d55..3e6c0c2896 100644 --- a/gps/solver.go +++ b/gps/solver.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/armon/go-radix" - "github.com/sdboyer/gps/internal" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/internal" + "github.com/golang/dep/gps/pkgtree" ) var ( diff --git a/gps/source.go b/gps/source.go index 4031e5994b..dc238cdcff 100644 --- a/gps/source.go +++ b/gps/source.go @@ -6,7 +6,7 @@ import ( "fmt" "sync" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) // sourceState represent the states that a source can be in, depending on how @@ -149,7 +149,7 @@ func (sc *sourceCoordinator) setUpSourceGateway(ctx context.Context, normalizedN srcGate = newSourceGateway(pd.mb, sc.supervisor, sc.cachedir) // The normalized name is usually different from the source URL- e.g. - // github.com/sdboyer/gps vs. https://github.com/sdboyer/gps. But it's + // github.com/golang/dep/gps vs. https://github.com/golang/dep/gps. But it's // possible to arrive here with a full URL as the normalized name - and // both paths *must* lead to the same sourceGateway instance in order to // ensure disk access is correctly managed. diff --git a/gps/source_cache.go b/gps/source_cache.go index 68e7d7b662..bc6104cdaf 100644 --- a/gps/source_cache.go +++ b/gps/source_cache.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) // singleSourceCache provides a method set for storing and retrieving data about diff --git a/gps/source_manager.go b/gps/source_manager.go index d19f10a3db..9c4a5f7852 100644 --- a/gps/source_manager.go +++ b/gps/source_manager.go @@ -13,7 +13,7 @@ import ( "time" "github.com/sdboyer/constext" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) // Used to compute a friendly filepath from a URL-shaped input. diff --git a/gps/source_test.go b/gps/source_test.go index 6aae7a3787..38d3c097ec 100644 --- a/gps/source_test.go +++ b/gps/source_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) // Executed in parallel by TestSlowVcs diff --git a/gps/trace.go b/gps/trace.go index c12100d928..f428558972 100644 --- a/gps/trace.go +++ b/gps/trace.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) const ( diff --git a/gps/vcs_source.go b/gps/vcs_source.go index 781a5cc2d5..a5510998f9 100644 --- a/gps/vcs_source.go +++ b/gps/vcs_source.go @@ -11,8 +11,8 @@ import ( "time" "github.com/Masterminds/semver" - "github.com/sdboyer/gps/internal/fs" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/internal/fs" + "github.com/golang/dep/gps/pkgtree" ) type baseVCSSource struct { diff --git a/gps/version_unifier_test.go b/gps/version_unifier_test.go index b5893de5b4..baf852b6dd 100644 --- a/gps/version_unifier_test.go +++ b/gps/version_unifier_test.go @@ -3,7 +3,7 @@ package gps import ( "testing" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) type lvFixBridge []Version diff --git a/lock.go b/lock.go index aaa561daab..0c1becb846 100644 --- a/lock.go +++ b/lock.go @@ -12,7 +12,7 @@ import ( "bytes" "github.com/pelletier/go-toml" "github.com/pkg/errors" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) const LockName = "Gopkg.lock" diff --git a/lock_test.go b/lock_test.go index ba61372666..f51bbcfb34 100644 --- a/lock_test.go +++ b/lock_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/golang/dep/test" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) func TestReadLock(t *testing.T) { @@ -31,7 +31,7 @@ func TestReadLock(t *testing.T) { Memo: b, P: []gps.LockedProject{ gps.NewLockedProject( - gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/sdboyer/gps")}, + gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/golang/dep/gps")}, gps.NewBranch("master").Is(gps.Revision("d05d5aca9f895d19e9265839bffeadd74a2d2ecb")), []string{"."}, ), @@ -55,7 +55,7 @@ func TestReadLock(t *testing.T) { Memo: b, P: []gps.LockedProject{ gps.NewLockedProject( - gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/sdboyer/gps")}, + gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/golang/dep/gps")}, gps.NewVersion("0.12.2").Is(gps.Revision("d05d5aca9f895d19e9265839bffeadd74a2d2ecb")), []string{"."}, ), @@ -78,7 +78,7 @@ func TestWriteLock(t *testing.T) { Memo: memo, P: []gps.LockedProject{ gps.NewLockedProject( - gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/sdboyer/gps")}, + gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/golang/dep/gps")}, gps.NewBranch("master").Is(gps.Revision("d05d5aca9f895d19e9265839bffeadd74a2d2ecb")), []string{"."}, ), @@ -107,7 +107,7 @@ func TestWriteLock(t *testing.T) { Memo: memo, P: []gps.LockedProject{ gps.NewLockedProject( - gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/sdboyer/gps")}, + gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/golang/dep/gps")}, gps.NewVersion("0.12.2").Is(gps.Revision("d05d5aca9f895d19e9265839bffeadd74a2d2ecb")), []string{"."}, ), diff --git a/manifest.go b/manifest.go index db35aa5bd6..d7b44edebe 100644 --- a/manifest.go +++ b/manifest.go @@ -12,7 +12,7 @@ import ( "github.com/pelletier/go-toml" "github.com/pkg/errors" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) const ManifestName = "Gopkg.toml" diff --git a/manifest_test.go b/manifest_test.go index 2720031658..82eb5cb309 100644 --- a/manifest_test.go +++ b/manifest_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/golang/dep/test" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) func TestReadManifest(t *testing.T) { @@ -27,7 +27,7 @@ func TestReadManifest(t *testing.T) { c, _ := gps.NewSemverConstraint(">=0.12.0, <1.0.0") want := Manifest{ Dependencies: map[gps.ProjectRoot]gps.ProjectProperties{ - gps.ProjectRoot("github.com/sdboyer/gps"): { + gps.ProjectRoot("github.com/golang/dep/gps"): { Constraint: c, }, gps.ProjectRoot("github.com/babble/brook"): { @@ -35,8 +35,8 @@ func TestReadManifest(t *testing.T) { }, }, Ovr: map[gps.ProjectRoot]gps.ProjectProperties{ - gps.ProjectRoot("github.com/sdboyer/gps"): { - Source: "https://github.com/sdboyer/gps", + gps.ProjectRoot("github.com/golang/dep/gps"): { + Source: "https://github.com/golang/dep/gps", Constraint: gps.NewBranch("master"), }, }, @@ -63,7 +63,7 @@ func TestWriteManifest(t *testing.T) { c, _ := gps.NewSemverConstraint("^v0.12.0") m := &Manifest{ Dependencies: map[gps.ProjectRoot]gps.ProjectProperties{ - gps.ProjectRoot("github.com/sdboyer/gps"): { + gps.ProjectRoot("github.com/golang/dep/gps"): { Constraint: c, }, gps.ProjectRoot("github.com/babble/brook"): { @@ -71,8 +71,8 @@ func TestWriteManifest(t *testing.T) { }, }, Ovr: map[gps.ProjectRoot]gps.ProjectProperties{ - gps.ProjectRoot("github.com/sdboyer/gps"): { - Source: "https://github.com/sdboyer/gps", + gps.ProjectRoot("github.com/golang/dep/gps"): { + Source: "https://github.com/golang/dep/gps", Constraint: gps.NewBranch("master"), }, }, diff --git a/project.go b/project.go index eaea2ea534..4332c4a694 100644 --- a/project.go +++ b/project.go @@ -10,7 +10,7 @@ import ( "path/filepath" "github.com/pkg/errors" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var errProjectNotFound = fmt.Errorf("could not find project %s, use dep init to initiate a manifest", ManifestName) diff --git a/project_test.go b/project_test.go index 29ed86f840..9e0bd0bea9 100644 --- a/project_test.go +++ b/project_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/golang/dep/test" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) func TestFindRoot(t *testing.T) { diff --git a/test_project_context_test.go b/test_project_context_test.go index d1cda66e67..55d2ac79be 100644 --- a/test_project_context_test.go +++ b/test_project_context_test.go @@ -9,7 +9,7 @@ import ( "github.com/golang/dep/test" "github.com/pkg/errors" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) // TestProjectContext groups together test project files and helps test them diff --git a/testdata/analyzer/Gopkg.toml b/testdata/analyzer/Gopkg.toml index c24d239d9a..4f7539e628 100644 --- a/testdata/analyzer/Gopkg.toml +++ b/testdata/analyzer/Gopkg.toml @@ -1,8 +1,8 @@ [[dependencies]] - name = "github.com/pkg/errors" - version = ">=0.8.0, <1.0.0" + name = "github.com/golang/dep/gps" + version = ">=0.12.0, <1.0.0" [[dependencies]] - name = "github.com/sdboyer/gps" - version = ">=0.12.0, <1.0.0" + name = "github.com/pkg/errors" + version = ">=0.8.0, <1.0.0" diff --git a/testdata/lock/error0.toml b/testdata/lock/error0.toml index 2e5bc427ed..d3b2b4031c 100644 --- a/testdata/lock/error0.toml +++ b/testdata/lock/error0.toml @@ -1,7 +1,7 @@ memo = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e" [[projects]] - name = "github.com/sdboyer/gps" + name = "github.com/golang/dep/gps" branch = "master" version = "v0.12.0" revision = "d05d5aca9f895d19e9265839bffeadd74a2d2ecb" diff --git a/testdata/lock/error1.toml b/testdata/lock/error1.toml index fb20e9b39d..0a61b3945a 100644 --- a/testdata/lock/error1.toml +++ b/testdata/lock/error1.toml @@ -1,7 +1,7 @@ memo = "000aaa2a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e" [[projects]] - name = "github.com/sdboyer/gps" + name = "github.com/golang/dep/gps" branch = "master" revision = "d05d5aca9f895d19e9265839bffeadd74a2d2ecb" packages = ["."] diff --git a/testdata/lock/error2.toml b/testdata/lock/error2.toml index 7a38e96044..42d40eada0 100644 --- a/testdata/lock/error2.toml +++ b/testdata/lock/error2.toml @@ -1,5 +1,5 @@ memo = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e" [[projects]] - name = "github.com/sdboyer/gps" + name = "github.com/golang/dep/gps" packages = ["."] \ No newline at end of file diff --git a/testdata/lock/golden0.toml b/testdata/lock/golden0.toml index 6e0cc983a3..e709614185 100644 --- a/testdata/lock/golden0.toml +++ b/testdata/lock/golden0.toml @@ -2,6 +2,6 @@ memo = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e" [[projects]] branch = "master" - name = "github.com/sdboyer/gps" + name = "github.com/golang/dep/gps" packages = ["."] revision = "d05d5aca9f895d19e9265839bffeadd74a2d2ecb" diff --git a/testdata/lock/golden1.toml b/testdata/lock/golden1.toml index 120ba3800a..9ce96aa8cd 100644 --- a/testdata/lock/golden1.toml +++ b/testdata/lock/golden1.toml @@ -1,7 +1,7 @@ memo = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e" [[projects]] - name = "github.com/sdboyer/gps" + name = "github.com/golang/dep/gps" packages = ["."] revision = "d05d5aca9f895d19e9265839bffeadd74a2d2ecb" version = "0.12.2" diff --git a/testdata/manifest/error1.toml b/testdata/manifest/error1.toml index 27fd881365..2cc85138a8 100644 --- a/testdata/manifest/error1.toml +++ b/testdata/manifest/error1.toml @@ -1,15 +1,15 @@ ignored = ["github.com/foo/bar"] [[dependencies]] - name = "github.com/sdboyer/gps" + name = "github.com/golang/dep/gps" branch = "master" revision = "d05d5aca9f895d19e9265839bffeadd74a2d2ecb" version = "^v0.12.0" - source = "https://github.com/sdboyer/gps" + source = "https://github.com/golang/dep/gps" [[overrides]] - name = "github.com/sdboyer/gps" + name = "github.com/golang/dep/gps" branch = "master" revision = "d05d5aca9f895d19e9265839bffeadd74a2d2ecb" version = "^v0.12.0" - source = "https://github.com/sdboyer/gps" + source = "https://github.com/golang/dep/gps" diff --git a/testdata/manifest/error2.toml b/testdata/manifest/error2.toml index 35fe7a9476..9a0f052f06 100644 --- a/testdata/manifest/error2.toml +++ b/testdata/manifest/error2.toml @@ -1,9 +1,9 @@ ignored = ["github.com/foo/bar"] [[dependencies]] - name = "github.com/sdboyer/gps" + name = "github.com/golang/dep/gps" branch = "master" [[dependencies]] - name = "github.com/sdboyer/gps" + name = "github.com/golang/dep/gps" branch = "master" diff --git a/testdata/manifest/golden.toml b/testdata/manifest/golden.toml index 7119904a24..4c45e4a91d 100644 --- a/testdata/manifest/golden.toml +++ b/testdata/manifest/golden.toml @@ -5,10 +5,10 @@ ignored = ["github.com/foo/bar"] revision = "d05d5aca9f895d19e9265839bffeadd74a2d2ecb" [[dependencies]] - name = "github.com/sdboyer/gps" + name = "github.com/golang/dep/gps" version = ">=0.12.0, <1.0.0" [[overrides]] branch = "master" - name = "github.com/sdboyer/gps" - source = "https://github.com/sdboyer/gps" + name = "github.com/golang/dep/gps" + source = "https://github.com/golang/dep/gps" diff --git a/txn_writer.go b/txn_writer.go index 6321504d98..e3b151720e 100644 --- a/txn_writer.go +++ b/txn_writer.go @@ -16,7 +16,7 @@ import ( "github.com/pelletier/go-toml" "github.com/pkg/errors" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) // SafeWriter transactionalizes writes of manifest, lock, and vendor dir, both diff --git a/vendor/github.com/sdboyer/constext/README.md b/vendor/github.com/sdboyer/constext/README.md index e267fd5478..0a42f92a1d 100644 --- a/vendor/github.com/sdboyer/constext/README.md +++ b/vendor/github.com/sdboyer/constext/README.md @@ -41,7 +41,7 @@ little more. For example: in [dep](https://github.com/golang/dep), the subsystem that manages interaction with source repositories is called a -[`SourceManager`](https://godoc.org/github.com/sdboyer/gps#SourceManager). It +[`SourceManager`](https://godoc.org/github.com/golang/dep/gps#SourceManager). It is a long-lived object; generally, only one is created over the course of any single `dep` invocation. The `SourceManager` has a number of methods on it that may initiate network and/or disk interaction. As such, these methods need to diff --git a/vendor/github.com/sdboyer/gps/CONTRIBUTING.md b/vendor/github.com/sdboyer/gps/CONTRIBUTING.md index 0ed6f9e28a..258bdc764a 100644 --- a/vendor/github.com/sdboyer/gps/CONTRIBUTING.md +++ b/vendor/github.com/sdboyer/gps/CONTRIBUTING.md @@ -8,15 +8,15 @@ a strong, motivating design behind `gps`, but we are always open to discussion on ways we can improve the library, particularly if it allows `gps` to cover more of the Go package management possibility space. -`gps` has no CLA, but we do have a [Code of Conduct](https://github.com/sdboyer/gps/blob/master/CODE_OF_CONDUCT.md). By +`gps` has no CLA, but we do have a [Code of Conduct](https://github.com/golang/dep/gps/blob/master/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. ## How can I contribute? It may be best to start by getting a handle on what `gps` actually is. Our -wiki has a [general introduction](https://github.com/sdboyer/gps/wiki/Introduction-to-gps), a -[guide for tool implementors](https://github.com/sdboyer/gps/wiki/gps-for-Implementors), and -a [guide for contributors](https://github.com/sdboyer/gps/wiki/gps-for-contributors). +wiki has a [general introduction](https://github.com/golang/dep/gps/wiki/Introduction-to-gps), a +[guide for tool implementors](https://github.com/golang/dep/gps/wiki/gps-for-Implementors), and +a [guide for contributors](https://github.com/golang/dep/gps/wiki/gps-for-contributors). There's also a [discursive essay](https://medium.com/@sdboyer/so-you-want-to-write-a-package-manager-4ae9c17d9527) that lays out the big-picture goals and considerations driving the `gps` design. @@ -29,12 +29,12 @@ appreciated: * **Identifying missed use cases:** the loose `gps` rule of thumb is, "if you can do it in Go, we support it in `gps`." Posting issues about cases we've missed helps us reach that goal. -* **Writing tests:** in the same vein, `gps` has a [large suite](https://github.com/sdboyer/gps/blob/master/CODE_OF_CONDUCT.md) of solving tests, but +* **Writing tests:** in the same vein, `gps` has a [large suite](https://github.com/golang/dep/gps/blob/master/CODE_OF_CONDUCT.md) of solving tests, but they still only scratch the surface. Writing tests is not only helpful, but is also a great way to get a feel for how `gps` works. * **Suggesting enhancements:** `gps` has plenty of missing chunks. Help fill them in! * **Reporting bugs**: `gps` being a library means this isn't always the easiest. - However, you could always compile the [example](https://github.com/sdboyer/gps/blob/master/example.go), run that against some of + However, you could always compile the [example](https://github.com/golang/dep/gps/blob/master/example.go), run that against some of your projects, and report problems you encounter. * **Building experimental tools with `gps`:** probably the best and fastest ways to kick the tires! diff --git a/vendor/github.com/sdboyer/gps/README.md b/vendor/github.com/sdboyer/gps/README.md index 0f956b2c1f..14a0494e4c 100644 --- a/vendor/github.com/sdboyer/gps/README.md +++ b/vendor/github.com/sdboyer/gps/README.md @@ -5,16 +5,16 @@
Build Status Windows Build Status -Build Status +Build Status Codecov -GoDoc +GoDoc

--- `gps` is the Go Packaging Solver. It is an engine for tackling dependency management problems in Go. It is trivial - [about 35 lines of -code](https://github.com/sdboyer/gps/blob/master/example.go) - to replicate the +code](https://github.com/golang/dep/gps/blob/master/example.go) - to replicate the fetching bits of `go get` using `gps`. `gps` is _not_ Yet Another Go Package Management Tool. Rather, it's a library @@ -34,14 +34,14 @@ discontinued in favor of gps powering the [experimental, eventually-official Go tooling](https://github.com/golang/dep). The wiki has a [general introduction to the `gps` -approach](https://github.com/sdboyer/gps/wiki/Introduction-to-gps), as well +approach](https://github.com/golang/dep/gps/wiki/Introduction-to-gps), as well as guides for folks [implementing -tools](https://github.com/sdboyer/gps/wiki/gps-for-Implementors) or [looking -to contribute](https://github.com/sdboyer/gps/wiki/gps-for-Contributors). +tools](https://github.com/golang/dep/gps/wiki/gps-for-Implementors) or [looking +to contribute](https://github.com/golang/dep/gps/wiki/gps-for-Contributors). ## Wait...a package management _library_?! -Yup. See [the rationale](https://github.com/sdboyer/gps/wiki/Rationale). +Yup. See [the rationale](https://github.com/golang/dep/gps/wiki/Rationale). ## Features @@ -62,18 +62,18 @@ productive. * Go >=1.6, or 1.5 with `GO15VENDOREXPERIMENT = 1` set * Everything under `vendor/` is volatile and controlled solely by the tool * A central cache of repositories is used (cannot be `GOPATH`) -* A [**project**](https://godoc.org/github.com/sdboyer/gps#ProjectRoot) concept: +* A [**project**](https://godoc.org/github.com/golang/dep/gps#ProjectRoot) concept: a tree of packages, all covered by one `vendor` directory * A [**manifest** and - **lock**](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#manifests-and-locks) + **lock**](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#manifests-and-locks) approach to tracking version and constraint information * Upstream sources are one of `git`, `bzr`, `hg` or `svn` repositories * What the available versions are for a given project/repository (all branches, tags, or revs are eligible) * In general, semver tags are preferred to branches, are preferred to plain tags * The actual packages that must be present (determined through import graph static analysis) - * How the import graph is statically analyzed - similar to `go/build`, but with a combinatorial view of build tags ([not yet implemented](https://github.com/sdboyer/gps/issues/99)) + * How the import graph is statically analyzed - similar to `go/build`, but with a combinatorial view of build tags ([not yet implemented](https://github.com/golang/dep/gps/issues/99)) * All packages from the same source (repository) must be the same version -* Package import cycles are not allowed ([not yet implemented](https://github.com/sdboyer/gps/issues/66)) +* Package import cycles are not allowed ([not yet implemented](https://github.com/golang/dep/gps/issues/66)) There are also some current non-choices that we would like to push into the realm of choice: @@ -93,23 +93,23 @@ general library could know _a priori_. * Which of the other package managers to interoperate with * Which types of version constraints to allow the user to specify (e.g., allowing [semver ranges](https://docs.npmjs.com/misc/semver) or not) * Whether or not to strip nested `vendor` directories -* Which packages in the import graph to [ignore](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#ignoring-packages) (if any) -* What constraint [overrides](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#overrides) to apply (if any) -* What [informational output](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#trace-and-tracelogger) to show the end user -* What dependency version constraints are declared by the [root project](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#manifest-data) -* What dependency version constraints are declared by [all dependencies](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#the-projectanalyzer) -* Given a [previous solution](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#lock-data), [which versions to let change, and how](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#tochange-changeall-and-downgrade) - * In the absence of a previous solution, whether or not to use [preferred versions](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#preferred-versions) -* Allowing, or not, the user to [swap in different source locations](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#projectidentifier) for import paths (e.g. forks) +* Which packages in the import graph to [ignore](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#ignoring-packages) (if any) +* What constraint [overrides](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#overrides) to apply (if any) +* What [informational output](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#trace-and-tracelogger) to show the end user +* What dependency version constraints are declared by the [root project](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#manifest-data) +* What dependency version constraints are declared by [all dependencies](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#the-projectanalyzer) +* Given a [previous solution](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#lock-data), [which versions to let change, and how](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#tochange-changeall-and-downgrade) + * In the absence of a previous solution, whether or not to use [preferred versions](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#preferred-versions) +* Allowing, or not, the user to [swap in different source locations](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#projectidentifier) for import paths (e.g. forks) * Specifying additional input/source packages not reachable from the root import graph This list may not be exhaustive - see the -[implementor's guide](https://github.com/sdboyer/gps/wiki/gps-for-Implementors) +[implementor's guide](https://github.com/golang/dep/gps/wiki/gps-for-Implementors) for a proper treatment. ## Contributing Yay, contributing! Please see -[CONTRIBUTING.md](https://github.com/sdboyer/gps/blob/master/CONTRIBUTING.md). +[CONTRIBUTING.md](https://github.com/golang/dep/gps/blob/master/CONTRIBUTING.md). Note that `gps` also abides by a [Code of -Conduct](https://github.com/sdboyer/gps/blob/master/CODE_OF_CONDUCT.md), and is MIT-licensed. +Conduct](https://github.com/golang/dep/gps/blob/master/CODE_OF_CONDUCT.md), and is MIT-licensed. diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/cycle/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/cycle/a.go index 75bdaf5e64..904499afd3 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/cycle/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/cycle/a.go @@ -2,7 +2,7 @@ package cycle import ( "cycle/one" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/cycle/one/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/cycle/one/a.go index 12c7563dd2..950091c3d7 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/cycle/one/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/cycle/one/a.go @@ -2,7 +2,7 @@ package one import ( "cycle/two" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/cycle/two/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/cycle/two/a.go index 392acac285..b18f7ff7d2 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/cycle/two/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/cycle/two/a.go @@ -2,7 +2,7 @@ package two import ( "cycle" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/disallow/.m1p/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/disallow/.m1p/a.go index e4e2ced5b1..1e63ccc171 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/disallow/.m1p/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/disallow/.m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/disallow/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/disallow/a.go index 59d2f72506..1dfaf15fee 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/disallow/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/disallow/a.go @@ -4,7 +4,7 @@ import ( "sort" "disallow/testdata" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/doublenest/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/doublenest/a.go index 04cac6aa27..fe8e6f91db 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/doublenest/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/doublenest/a.go @@ -3,7 +3,7 @@ package base import ( "go/parser" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/doublenest/namemismatch/m1p/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/doublenest/namemismatch/m1p/a.go index ec1f9b9831..fc858b4550 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/doublenest/namemismatch/m1p/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/doublenest/namemismatch/m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/github.com/example/varied/m1p/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/github.com/example/varied/m1p/a.go index 65fd7cad30..8051356345 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/github.com/example/varied/m1p/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/github.com/example/varied/m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/github.com/example/varied/simple/simple.go b/vendor/github.com/sdboyer/gps/_testdata/src/github.com/example/varied/simple/simple.go index c8fbb059b1..00efc0ca67 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/github.com/example/varied/simple/simple.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/github.com/example/varied/simple/simple.go @@ -3,7 +3,7 @@ package simple import ( "go/parser" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/igmain/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/igmain/a.go index 300b730928..b883478000 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/igmain/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/igmain/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/igmainfirst/z.go b/vendor/github.com/sdboyer/gps/_testdata/src/igmainfirst/z.go index 300b730928..b883478000 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/igmainfirst/z.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/igmainfirst/z.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/igmainlong/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/igmainlong/a.go index 300b730928..b883478000 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/igmainlong/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/igmainlong/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/igmaint/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/igmaint/a.go index 300b730928..b883478000 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/igmaint/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/igmaint/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/m1p/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/m1p/a.go index ec1f9b9831..fc858b4550 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/m1p/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/missing/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/missing/a.go index 8522bddd65..acdd635c5e 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/missing/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/missing/a.go @@ -4,7 +4,7 @@ import ( "sort" "missing/missing" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/missing/m1p/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/missing/m1p/a.go index ec1f9b9831..fc858b4550 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/missing/m1p/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/missing/m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/nest/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/nest/a.go index 300b730928..b883478000 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/nest/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/nest/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/nest/m1p/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/nest/m1p/a.go index ec1f9b9831..fc858b4550 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/nest/m1p/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/nest/m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/relimport/dotdotslash/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/relimport/dotdotslash/a.go index 6468719717..af8b3d048e 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/relimport/dotdotslash/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/relimport/dotdotslash/a.go @@ -1,7 +1,7 @@ package dotslash import ( - "../github.com/sdboyer/gps" + "../github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/ren/m1p/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/ren/m1p/a.go index ec1f9b9831..fc858b4550 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/ren/m1p/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/ren/m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/ren/simple/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/ren/simple/a.go index 300b730928..b883478000 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/ren/simple/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/ren/simple/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/simple/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/simple/a.go index 300b730928..b883478000 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/simple/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/simple/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/simpleallt/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/simpleallt/a.go index 300b730928..b883478000 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/simpleallt/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/simpleallt/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/simplet/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/simplet/a.go index 300b730928..b883478000 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/simplet/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/simplet/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/simplext/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/simplext/a.go index 300b730928..b883478000 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/simplext/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/simplext/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/skip_/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/skip_/a.go index ffc88f4cb8..28d258654a 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/skip_/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/skip_/a.go @@ -3,7 +3,7 @@ package skip import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/twopkgs/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/twopkgs/a.go index 300b730928..b883478000 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/twopkgs/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/twopkgs/a.go @@ -3,7 +3,7 @@ package simple import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/varied/m1p/a.go b/vendor/github.com/sdboyer/gps/_testdata/src/varied/m1p/a.go index 65fd7cad30..8051356345 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/varied/m1p/a.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/varied/m1p/a.go @@ -3,7 +3,7 @@ package m1p import ( "sort" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/_testdata/src/varied/simple/simple.go b/vendor/github.com/sdboyer/gps/_testdata/src/varied/simple/simple.go index c8fbb059b1..00efc0ca67 100644 --- a/vendor/github.com/sdboyer/gps/_testdata/src/varied/simple/simple.go +++ b/vendor/github.com/sdboyer/gps/_testdata/src/varied/simple/simple.go @@ -3,7 +3,7 @@ package simple import ( "go/parser" - "github.com/sdboyer/gps" + "github.com/golang/dep/gps" ) var ( diff --git a/vendor/github.com/sdboyer/gps/bridge.go b/vendor/github.com/sdboyer/gps/bridge.go index 8ee24f85f2..390aebbed6 100644 --- a/vendor/github.com/sdboyer/gps/bridge.go +++ b/vendor/github.com/sdboyer/gps/bridge.go @@ -6,7 +6,7 @@ import ( "path/filepath" "sync/atomic" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) // sourceBridge is an adapter to SourceManagers that tailor operations for a diff --git a/vendor/github.com/sdboyer/gps/deduce_test.go b/vendor/github.com/sdboyer/gps/deduce_test.go index 65670962b7..77898ba604 100644 --- a/vendor/github.com/sdboyer/gps/deduce_test.go +++ b/vendor/github.com/sdboyer/gps/deduce_test.go @@ -31,51 +31,51 @@ func mkurl(s string) (u *url.URL) { var pathDeductionFixtures = map[string][]pathDeductionFixture{ "github": []pathDeductionFixture{ { - in: "github.com/sdboyer/gps", - root: "github.com/sdboyer/gps", + in: "github.com/golang/dep/gps", + root: "github.com/golang/dep/gps", mb: maybeSources{ - maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")}, - maybeGitSource{url: mkurl("ssh://git@github.com/sdboyer/gps")}, - maybeGitSource{url: mkurl("git://github.com/sdboyer/gps")}, - maybeGitSource{url: mkurl("http://github.com/sdboyer/gps")}, + maybeGitSource{url: mkurl("https://github.com/golang/dep/gps")}, + maybeGitSource{url: mkurl("ssh://git@github.com/golang/dep/gps")}, + maybeGitSource{url: mkurl("git://github.com/golang/dep/gps")}, + maybeGitSource{url: mkurl("http://github.com/golang/dep/gps")}, }, }, { - in: "github.com/sdboyer/gps/foo", - root: "github.com/sdboyer/gps", + in: "github.com/golang/dep/gps/foo", + root: "github.com/golang/dep/gps", mb: maybeSources{ - maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")}, - maybeGitSource{url: mkurl("ssh://git@github.com/sdboyer/gps")}, - maybeGitSource{url: mkurl("git://github.com/sdboyer/gps")}, - maybeGitSource{url: mkurl("http://github.com/sdboyer/gps")}, + maybeGitSource{url: mkurl("https://github.com/golang/dep/gps")}, + maybeGitSource{url: mkurl("ssh://git@github.com/golang/dep/gps")}, + maybeGitSource{url: mkurl("git://github.com/golang/dep/gps")}, + maybeGitSource{url: mkurl("http://github.com/golang/dep/gps")}, }, }, { // TODO(sdboyer) is this a problem for enforcing uniqueness? do we // need to collapse these extensions? - in: "github.com/sdboyer/gps.git/foo", - root: "github.com/sdboyer/gps.git", + in: "github.com/golang/dep/gps.git/foo", + root: "github.com/golang/dep/gps.git", mb: maybeSources{ - maybeGitSource{url: mkurl("https://github.com/sdboyer/gps.git")}, - maybeGitSource{url: mkurl("ssh://git@github.com/sdboyer/gps.git")}, - maybeGitSource{url: mkurl("git://github.com/sdboyer/gps.git")}, - maybeGitSource{url: mkurl("http://github.com/sdboyer/gps.git")}, + maybeGitSource{url: mkurl("https://github.com/golang/dep/gps.git")}, + maybeGitSource{url: mkurl("ssh://git@github.com/golang/dep/gps.git")}, + maybeGitSource{url: mkurl("git://github.com/golang/dep/gps.git")}, + maybeGitSource{url: mkurl("http://github.com/golang/dep/gps.git")}, }, }, { in: "git@github.com:sdboyer/gps", - root: "github.com/sdboyer/gps", - mb: maybeGitSource{url: mkurl("ssh://git@github.com/sdboyer/gps")}, + root: "github.com/golang/dep/gps", + mb: maybeGitSource{url: mkurl("ssh://git@github.com/golang/dep/gps")}, }, { - in: "https://github.com/sdboyer/gps", - root: "github.com/sdboyer/gps", - mb: maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")}, + in: "https://github.com/golang/dep/gps", + root: "github.com/golang/dep/gps", + mb: maybeGitSource{url: mkurl("https://github.com/golang/dep/gps")}, }, { - in: "https://github.com/sdboyer/gps/foo/bar", - root: "github.com/sdboyer/gps", - mb: maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")}, + in: "https://github.com/golang/dep/gps/foo/bar", + root: "github.com/golang/dep/gps", + mb: maybeGitSource{url: mkurl("https://github.com/golang/dep/gps")}, }, { in: "github.com/sdboyer-/gps/foo", @@ -127,30 +127,30 @@ var pathDeductionFixtures = map[string][]pathDeductionFixture{ in: "gopkg.in/sdboyer/gps.v0", root: "gopkg.in/sdboyer/gps.v0", mb: maybeSources{ - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("https://github.com/sdboyer/gps"), major: 0}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("ssh://git@github.com/sdboyer/gps"), major: 0}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("git://github.com/sdboyer/gps"), major: 0}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("http://github.com/sdboyer/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("https://github.com/golang/dep/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("ssh://git@github.com/golang/dep/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("git://github.com/golang/dep/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("http://github.com/golang/dep/gps"), major: 0}, }, }, { in: "gopkg.in/sdboyer/gps.v0/foo", root: "gopkg.in/sdboyer/gps.v0", mb: maybeSources{ - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("https://github.com/sdboyer/gps"), major: 0}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("ssh://git@github.com/sdboyer/gps"), major: 0}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("git://github.com/sdboyer/gps"), major: 0}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("http://github.com/sdboyer/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("https://github.com/golang/dep/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("ssh://git@github.com/golang/dep/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("git://github.com/golang/dep/gps"), major: 0}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("http://github.com/golang/dep/gps"), major: 0}, }, }, { in: "gopkg.in/sdboyer/gps.v1/foo/bar", root: "gopkg.in/sdboyer/gps.v1", mb: maybeSources{ - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("https://github.com/sdboyer/gps"), major: 1}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("ssh://git@github.com/sdboyer/gps"), major: 1}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("git://github.com/sdboyer/gps"), major: 1}, - maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("http://github.com/sdboyer/gps"), major: 1}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("https://github.com/golang/dep/gps"), major: 1}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("ssh://git@github.com/golang/dep/gps"), major: 1}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("git://github.com/golang/dep/gps"), major: 1}, + maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("http://github.com/golang/dep/gps"), major: 1}, }, }, { diff --git a/vendor/github.com/sdboyer/gps/example.go b/vendor/github.com/sdboyer/gps/example.go index 063d93d43b..0ed2816a8d 100644 --- a/vendor/github.com/sdboyer/gps/example.go +++ b/vendor/github.com/sdboyer/gps/example.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "github.com/sdboyer/gps" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps" + "github.com/golang/dep/gps/pkgtree" ) // This is probably the simplest possible implementation of gps. It does the diff --git a/vendor/github.com/sdboyer/gps/glide.yaml b/vendor/github.com/sdboyer/gps/glide.yaml index 7f9f8799cd..70c4472b90 100644 --- a/vendor/github.com/sdboyer/gps/glide.yaml +++ b/vendor/github.com/sdboyer/gps/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/sdboyer/gps +package: github.com/golang/dep/gps owners: - name: Sam Boyer email: tech@samboyer.org diff --git a/vendor/github.com/sdboyer/gps/hash.go b/vendor/github.com/sdboyer/gps/hash.go index b2ee8e4663..f979b42c7a 100644 --- a/vendor/github.com/sdboyer/gps/hash.go +++ b/vendor/github.com/sdboyer/gps/hash.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) // string headers used to demarcate sections in hash input creation diff --git a/vendor/github.com/sdboyer/gps/identifier.go b/vendor/github.com/sdboyer/gps/identifier.go index 7406ce96d2..aac7c212b8 100644 --- a/vendor/github.com/sdboyer/gps/identifier.go +++ b/vendor/github.com/sdboyer/gps/identifier.go @@ -20,17 +20,17 @@ import ( // management domain has lots of different path-ish strings floating around: // // actual directories: -// /home/sdboyer/go/src/github.com/sdboyer/gps/example +// /home/sdboyer/go/src/github.com/golang/dep/gps/example // URLs: -// https://github.com/sdboyer/gps +// https://github.com/golang/dep/gps // import paths: -// github.com/sdboyer/gps/example +// github.com/golang/dep/gps/example // portions of import paths that refer to a package: // example // portions that could not possibly refer to anything sane: // github.com/sdboyer // portions that correspond to a repository root: -// github.com/sdboyer/gps +// github.com/golang/dep/gps // // While not a panacea, having ProjectRoot allows gps to clearly indicate via // the type system when a path-ish string must have particular semantics. @@ -49,10 +49,10 @@ type ProjectRoot string // These can be either a full URL, including protocol, or plain import paths. // So, these are all valid data for Source: // -// github.com/sdboyer/gps +// github.com/golang/dep/gps // github.com/fork/gps // git@github.com:sdboyer/gps -// https://github.com/sdboyer/gps +// https://github.com/golang/dep/gps // // With plain import paths, network addresses are derived purely through an // algorithm. By having an explicit network name, it becomes possible to, for diff --git a/vendor/github.com/sdboyer/gps/lock_test.go b/vendor/github.com/sdboyer/gps/lock_test.go index b85e0de14b..0b1f3a540b 100644 --- a/vendor/github.com/sdboyer/gps/lock_test.go +++ b/vendor/github.com/sdboyer/gps/lock_test.go @@ -8,7 +8,7 @@ import ( func TestLockedProjectSorting(t *testing.T) { // version doesn't matter here lps := []LockedProject{ - NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), nil), + NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), nil), NewLockedProject(mkPI("foo"), NewVersion("nada"), nil), NewLockedProject(mkPI("bar"), NewVersion("zip"), nil), NewLockedProject(mkPI("qux"), NewVersion("zilch"), nil), @@ -27,14 +27,14 @@ func TestLockedProjectSorting(t *testing.T) { func TestLockedProjectsEq(t *testing.T) { lps := []LockedProject{ - NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"gps"}), - NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), nil), - NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"gps", "flugle"}), + NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), []string{"gps"}), + NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), nil), + NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), []string{"gps", "flugle"}), NewLockedProject(mkPI("foo"), NewVersion("nada"), []string{"foo"}), - NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"flugle", "gps"}), - NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0").Is("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}), - NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.11.0"), []string{"gps"}), - NewLockedProject(mkPI("github.com/sdboyer/gps"), Revision("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}), + NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), []string{"flugle", "gps"}), + NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0").Is("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}), + NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.11.0"), []string{"gps"}), + NewLockedProject(mkPI("github.com/golang/dep/gps"), Revision("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}), } fix := map[string]struct { @@ -77,7 +77,7 @@ func TestLockedProjectsEq(t *testing.T) { } func TestLocksAreEq(t *testing.T) { - gpl := NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0").Is("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}) + gpl := NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0").Is("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}) svpl := NewLockedProject(mkPI("github.com/Masterminds/semver"), NewVersion("v2.0.0"), []string{"semver"}) bbbt := NewLockedProject(mkPI("github.com/beeblebrox/browntown"), NewBranch("master").Is("63fc17eb7966a6f4cc0b742bf42731c52c4ac740"), []string{"browntown", "smoochies"}) @@ -119,7 +119,7 @@ func TestLocksAreEq(t *testing.T) { t.Error("checking equality resorted l2") } - l1.p[0] = NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.11.0"), []string{"gps"}) + l1.p[0] = NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.11.0"), []string{"gps"}) if LocksAreEq(l1, l2, false) { t.Error("should fail when individual lp were not eq") } diff --git a/vendor/github.com/sdboyer/gps/lockdiff_test.go b/vendor/github.com/sdboyer/gps/lockdiff_test.go index 87a40c394f..6ab108d14e 100644 --- a/vendor/github.com/sdboyer/gps/lockdiff_test.go +++ b/vendor/github.com/sdboyer/gps/lockdiff_test.go @@ -42,8 +42,8 @@ func TestStringDiff_Modify(t *testing.T) { } func TestDiffProjects_NoChange(t *testing.T) { - p1 := NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"gps"}) - p2 := NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"gps"}) + p1 := NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), []string{"gps"}) + p2 := NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), []string{"gps"}) diff := DiffProjects(p1, p2) if diff != nil { diff --git a/vendor/github.com/sdboyer/gps/manager_test.go b/vendor/github.com/sdboyer/gps/manager_test.go index 40989ea413..bc010c4ae5 100644 --- a/vendor/github.com/sdboyer/gps/manager_test.go +++ b/vendor/github.com/sdboyer/gps/manager_test.go @@ -439,7 +439,7 @@ func TestDeduceProjectRoot(t *testing.T) { sm, clean := mkNaiveSM(t) defer clean() - in := "github.com/sdboyer/gps" + in := "github.com/golang/dep/gps" pr, err := sm.DeduceProjectRoot(in) if err != nil { t.Errorf("Problem while detecting root of %q %s", in, err) @@ -518,7 +518,7 @@ func TestMultiFetchThreadsafe(t *testing.T) { } projects := []ProjectIdentifier{ - mkPI("github.com/sdboyer/gps"), + mkPI("github.com/golang/dep/gps"), mkPI("github.com/sdboyer/gpkt"), ProjectIdentifier{ ProjectRoot: ProjectRoot("github.com/sdboyer/gpkt"), @@ -613,7 +613,7 @@ func TestMultiFetchThreadsafe(t *testing.T) { } // Ensure that we don't see concurrent map writes when calling ListVersions. -// Regression test for https://github.com/sdboyer/gps/issues/156. +// Regression test for https://github.com/golang/dep/gps/issues/156. // // Ideally this would be caught by TestMultiFetchThreadsafe, but perhaps the // high degree of parallelism pretty much eliminates that as a realistic @@ -628,7 +628,7 @@ func TestListVersionsRacey(t *testing.T) { defer clean() wg := &sync.WaitGroup{} - id := mkPI("github.com/sdboyer/gps") + id := mkPI("github.com/golang/dep/gps") for i := 0; i < 20; i++ { wg.Add(1) go func() { diff --git a/vendor/github.com/sdboyer/gps/manifest.go b/vendor/github.com/sdboyer/gps/manifest.go index bfcff97c21..6ee9f682c3 100644 --- a/vendor/github.com/sdboyer/gps/manifest.go +++ b/vendor/github.com/sdboyer/gps/manifest.go @@ -12,7 +12,7 @@ package gps // // This does entail that manifests can express constraints on projects they do // not themselves import. This is by design, but its implications are complex. -// See the gps docs for more information: https://github.com/sdboyer/gps/wiki +// See the gps docs for more information: https://github.com/golang/dep/gps/wiki type Manifest interface { // Returns a list of project-level constraints. DependencyConstraints() ProjectConstraints diff --git a/vendor/github.com/sdboyer/gps/pkgtree/pkgtree_test.go b/vendor/github.com/sdboyer/gps/pkgtree/pkgtree_test.go index 7196ed160a..466c50220e 100644 --- a/vendor/github.com/sdboyer/gps/pkgtree/pkgtree_test.go +++ b/vendor/github.com/sdboyer/gps/pkgtree/pkgtree_test.go @@ -13,8 +13,8 @@ import ( "strings" "testing" - "github.com/sdboyer/gps/internal" - "github.com/sdboyer/gps/internal/fs" + "github.com/golang/dep/gps/internal" + "github.com/golang/dep/gps/internal/fs" ) // Stores a reference to original IsStdLib, so we could restore overridden version. @@ -521,7 +521,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, }, @@ -541,7 +541,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, }, @@ -603,7 +603,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, TestImports: []string{ @@ -627,7 +627,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, TestImports: []string{ @@ -651,7 +651,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, TestImports: []string{ @@ -676,7 +676,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "os", "sort", }, @@ -697,7 +697,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, }, @@ -708,7 +708,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "os", "sort", }, @@ -756,7 +756,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "os", "sort", }, @@ -768,7 +768,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, }, @@ -788,7 +788,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "base", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "go/parser", }, }, @@ -810,7 +810,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "os", "sort", }, @@ -831,7 +831,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "base", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "go/parser", }, }, @@ -853,7 +853,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "os", "sort", }, @@ -874,7 +874,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", "unicode", }, @@ -895,7 +895,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", "unicode", }, @@ -916,7 +916,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", "unicode", }, @@ -937,7 +937,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", "unicode", }, @@ -984,7 +984,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "missing/missing", "sort", }, @@ -996,7 +996,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "os", "sort", }, @@ -1021,7 +1021,7 @@ func TestListPackages(t *testing.T) { Name: "cycle", Imports: []string{ "cycle/one", - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", }, }, }, @@ -1032,7 +1032,7 @@ func TestListPackages(t *testing.T) { Name: "one", Imports: []string{ "cycle/two", - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", }, }, }, @@ -1043,7 +1043,7 @@ func TestListPackages(t *testing.T) { Name: "two", Imports: []string{ "cycle", - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", }, }, }, @@ -1064,7 +1064,7 @@ func TestListPackages(t *testing.T) { Name: "disallow", Imports: []string{ "disallow/testdata", - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, }, @@ -1077,7 +1077,7 @@ func TestListPackages(t *testing.T) { //CommentPath: "", //Name: "m1p", //Imports: []string{ - //"github.com/sdboyer/gps", + //"github.com/golang/dep/gps", //"os", //"sort", //}, @@ -1146,7 +1146,7 @@ func TestListPackages(t *testing.T) { Dir: j("relimport/dotdotslash"), ImportPath: "relimport/dotdotslash", LocalImports: []string{ - "../github.com/sdboyer/gps", + "../github.com/golang/dep/gps", }, }, }, @@ -1165,7 +1165,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "skip", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, }, @@ -1211,7 +1211,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "go/parser", "varied/simple/another", }, @@ -1248,7 +1248,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "os", "sort", }, @@ -1384,7 +1384,7 @@ func TestListPackagesNoPerms(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "sort", }, }, @@ -1478,12 +1478,12 @@ func TestToReachMap(t *testing.T) { // maps of each internal package, and their expected external and internal // imports in the maximal case. allex := map[string][]string{ - b(""): {"encoding/binary", "github.com/Masterminds/semver", "github.com/sdboyer/gps", "go/parser", "hash", "net/http", "os", "sort"}, - b("m1p"): {"github.com/sdboyer/gps", "os", "sort"}, + b(""): {"encoding/binary", "github.com/Masterminds/semver", "github.com/golang/dep/gps", "go/parser", "hash", "net/http", "os", "sort"}, + b("m1p"): {"github.com/golang/dep/gps", "os", "sort"}, b("namemismatch"): {"github.com/Masterminds/semver", "os"}, - b("otherpath"): {"github.com/sdboyer/gps", "os", "sort"}, - b("simple"): {"encoding/binary", "github.com/sdboyer/gps", "go/parser", "hash", "os", "sort"}, - b("simple/another"): {"encoding/binary", "github.com/sdboyer/gps", "hash", "os", "sort"}, + b("otherpath"): {"github.com/golang/dep/gps", "os", "sort"}, + b("simple"): {"encoding/binary", "github.com/golang/dep/gps", "go/parser", "hash", "os", "sort"}, + b("simple/another"): {"encoding/binary", "github.com/golang/dep/gps", "hash", "os", "sort"}, } allin := map[string][]string{ @@ -1625,7 +1625,7 @@ func TestToReachMap(t *testing.T) { b("")+" encoding/binary", b("simple")+" encoding/binary", b("simple/another")+" encoding/binary", - b("otherpath")+" github.com/sdboyer/gps os sort", + b("otherpath")+" github.com/golang/dep/gps os sort", ) // almost the same as previous, but varied just goes away completely @@ -1635,7 +1635,7 @@ func TestToReachMap(t *testing.T) { b(""), b("simple")+" encoding/binary", b("simple/another")+" encoding/binary", - bl("otherpath", "m1p")+" github.com/sdboyer/gps os sort", + bl("otherpath", "m1p")+" github.com/golang/dep/gps os sort", ) validate() @@ -1666,7 +1666,7 @@ func TestToReachMap(t *testing.T) { } except( // root pkg loses on everything in varied/simple/another and varied/m1p - bl("", "simple", "simple/another", "m1p", "otherpath")+" hash encoding/binary go/parser github.com/sdboyer/gps sort", + bl("", "simple", "simple/another", "m1p", "otherpath")+" hash encoding/binary go/parser github.com/golang/dep/gps sort", b("otherpath"), b("simple"), ) @@ -1677,7 +1677,7 @@ func TestToReachMap(t *testing.T) { ignore[b("namemismatch")] = true except( // root pkg loses on everything in varied/simple/another and varied/m1p - bl("", "simple", "simple/another", "m1p", "otherpath", "namemismatch")+" hash encoding/binary go/parser github.com/sdboyer/gps sort os github.com/Masterminds/semver", + bl("", "simple", "simple/another", "m1p", "otherpath", "namemismatch")+" hash encoding/binary go/parser github.com/golang/dep/gps sort os github.com/Masterminds/semver", b("otherpath"), b("simple"), b("namemismatch"), @@ -1711,7 +1711,7 @@ func TestFlattenReachMap(t *testing.T) { all := []string{ "encoding/binary", "github.com/Masterminds/semver", - "github.com/sdboyer/gps", + "github.com/golang/dep/gps", "go/parser", "hash", "net/http", @@ -1797,7 +1797,7 @@ func TestFlattenReachMap(t *testing.T) { ignore = map[string]bool{ "github.com/example/varied/simple": true, } - // we get github.com/sdboyer/gps from m1p, too, so it should still be there + // we get github.com/golang/dep/gps from m1p, too, so it should still be there except("go/parser") validate() @@ -1832,17 +1832,17 @@ func TestFlattenReachMap(t *testing.T) { "github.com/example/varied/simple": true, "github.com/example/varied/m1p": true, } - except("sort", "github.com/sdboyer/gps", "go/parser") + except("sort", "github.com/golang/dep/gps", "go/parser") validate() // finally, directly ignore some external packages name = "ignore external" ignore = map[string]bool{ - "github.com/sdboyer/gps": true, + "github.com/golang/dep/gps": true, "go/parser": true, "sort": true, } - except("sort", "github.com/sdboyer/gps", "go/parser") + except("sort", "github.com/golang/dep/gps", "go/parser") validate() // The only thing varied *doesn't* cover is disallowed path patterns @@ -1856,7 +1856,7 @@ func TestFlattenReachMap(t *testing.T) { t.Errorf("Should not have any error packages from ToReachMap, got %s", em) } result := rm.Flatten(true) - expect = []string{"github.com/sdboyer/gps", "hash", "sort"} + expect = []string{"github.com/golang/dep/gps", "hash", "sort"} if !reflect.DeepEqual(expect, result) { t.Errorf("Wrong imports in %q case:\n\t(GOT): %s\n\t(WNT): %s", name, result, expect) } diff --git a/vendor/github.com/sdboyer/gps/pkgtree/reachmap.go b/vendor/github.com/sdboyer/gps/pkgtree/reachmap.go index 5d1f155907..2d50032b54 100644 --- a/vendor/github.com/sdboyer/gps/pkgtree/reachmap.go +++ b/vendor/github.com/sdboyer/gps/pkgtree/reachmap.go @@ -4,7 +4,7 @@ import ( "sort" "strings" - "github.com/sdboyer/gps/internal" + "github.com/golang/dep/gps/internal" ) // ReachMap maps a set of import paths (keys) to the sets of transitively diff --git a/vendor/github.com/sdboyer/gps/rootdata.go b/vendor/github.com/sdboyer/gps/rootdata.go index 9548ebad90..6b3fe189e3 100644 --- a/vendor/github.com/sdboyer/gps/rootdata.go +++ b/vendor/github.com/sdboyer/gps/rootdata.go @@ -4,8 +4,8 @@ import ( "sort" "github.com/armon/go-radix" - "github.com/sdboyer/gps/internal" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/internal" + "github.com/golang/dep/gps/pkgtree" ) // rootdata holds static data and constraining rules from the root project for diff --git a/vendor/github.com/sdboyer/gps/selection_test.go b/vendor/github.com/sdboyer/gps/selection_test.go index 6fb727827c..18d33276a2 100644 --- a/vendor/github.com/sdboyer/gps/selection_test.go +++ b/vendor/github.com/sdboyer/gps/selection_test.go @@ -5,7 +5,7 @@ import ( "testing" ) -// Regression test for https://github.com/sdboyer/gps/issues/174 +// Regression test for https://github.com/golang/dep/gps/issues/174 func TestUnselectedRemoval(t *testing.T) { // We don't need a comparison function for this test bmi1 := bimodalIdentifier{ diff --git a/vendor/github.com/sdboyer/gps/solve_basic_test.go b/vendor/github.com/sdboyer/gps/solve_basic_test.go index a04d258943..a3c806e707 100644 --- a/vendor/github.com/sdboyer/gps/solve_basic_test.go +++ b/vendor/github.com/sdboyer/gps/solve_basic_test.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/Masterminds/semver" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) var regfrom = regexp.MustCompile(`^(\w*) from (\w*) ([0-9\.\*]*)`) diff --git a/vendor/github.com/sdboyer/gps/solve_bimodal_test.go b/vendor/github.com/sdboyer/gps/solve_bimodal_test.go index 5b5927d452..c4a5e43110 100644 --- a/vendor/github.com/sdboyer/gps/solve_bimodal_test.go +++ b/vendor/github.com/sdboyer/gps/solve_bimodal_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) // dsp - "depspec with packages" diff --git a/vendor/github.com/sdboyer/gps/solve_test.go b/vendor/github.com/sdboyer/gps/solve_test.go index a7a7d2371e..367e1baf05 100644 --- a/vendor/github.com/sdboyer/gps/solve_test.go +++ b/vendor/github.com/sdboyer/gps/solve_test.go @@ -14,8 +14,8 @@ import ( "testing" "unicode" - "github.com/sdboyer/gps/internal" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/internal" + "github.com/golang/dep/gps/pkgtree" ) var fixtorun string diff --git a/vendor/github.com/sdboyer/gps/solver.go b/vendor/github.com/sdboyer/gps/solver.go index 3f6cd05d55..3e6c0c2896 100644 --- a/vendor/github.com/sdboyer/gps/solver.go +++ b/vendor/github.com/sdboyer/gps/solver.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/armon/go-radix" - "github.com/sdboyer/gps/internal" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/internal" + "github.com/golang/dep/gps/pkgtree" ) var ( diff --git a/vendor/github.com/sdboyer/gps/source.go b/vendor/github.com/sdboyer/gps/source.go index 4031e5994b..dc238cdcff 100644 --- a/vendor/github.com/sdboyer/gps/source.go +++ b/vendor/github.com/sdboyer/gps/source.go @@ -6,7 +6,7 @@ import ( "fmt" "sync" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) // sourceState represent the states that a source can be in, depending on how @@ -149,7 +149,7 @@ func (sc *sourceCoordinator) setUpSourceGateway(ctx context.Context, normalizedN srcGate = newSourceGateway(pd.mb, sc.supervisor, sc.cachedir) // The normalized name is usually different from the source URL- e.g. - // github.com/sdboyer/gps vs. https://github.com/sdboyer/gps. But it's + // github.com/golang/dep/gps vs. https://github.com/golang/dep/gps. But it's // possible to arrive here with a full URL as the normalized name - and // both paths *must* lead to the same sourceGateway instance in order to // ensure disk access is correctly managed. diff --git a/vendor/github.com/sdboyer/gps/source_cache.go b/vendor/github.com/sdboyer/gps/source_cache.go index 68e7d7b662..bc6104cdaf 100644 --- a/vendor/github.com/sdboyer/gps/source_cache.go +++ b/vendor/github.com/sdboyer/gps/source_cache.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) // singleSourceCache provides a method set for storing and retrieving data about diff --git a/vendor/github.com/sdboyer/gps/source_manager.go b/vendor/github.com/sdboyer/gps/source_manager.go index d19f10a3db..9c4a5f7852 100644 --- a/vendor/github.com/sdboyer/gps/source_manager.go +++ b/vendor/github.com/sdboyer/gps/source_manager.go @@ -13,7 +13,7 @@ import ( "time" "github.com/sdboyer/constext" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) // Used to compute a friendly filepath from a URL-shaped input. diff --git a/vendor/github.com/sdboyer/gps/source_test.go b/vendor/github.com/sdboyer/gps/source_test.go index 6aae7a3787..38d3c097ec 100644 --- a/vendor/github.com/sdboyer/gps/source_test.go +++ b/vendor/github.com/sdboyer/gps/source_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) // Executed in parallel by TestSlowVcs diff --git a/vendor/github.com/sdboyer/gps/trace.go b/vendor/github.com/sdboyer/gps/trace.go index c12100d928..f428558972 100644 --- a/vendor/github.com/sdboyer/gps/trace.go +++ b/vendor/github.com/sdboyer/gps/trace.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) const ( diff --git a/vendor/github.com/sdboyer/gps/vcs_source.go b/vendor/github.com/sdboyer/gps/vcs_source.go index 781a5cc2d5..a5510998f9 100644 --- a/vendor/github.com/sdboyer/gps/vcs_source.go +++ b/vendor/github.com/sdboyer/gps/vcs_source.go @@ -11,8 +11,8 @@ import ( "time" "github.com/Masterminds/semver" - "github.com/sdboyer/gps/internal/fs" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/internal/fs" + "github.com/golang/dep/gps/pkgtree" ) type baseVCSSource struct { diff --git a/vendor/github.com/sdboyer/gps/version_unifier_test.go b/vendor/github.com/sdboyer/gps/version_unifier_test.go index b5893de5b4..baf852b6dd 100644 --- a/vendor/github.com/sdboyer/gps/version_unifier_test.go +++ b/vendor/github.com/sdboyer/gps/version_unifier_test.go @@ -3,7 +3,7 @@ package gps import ( "testing" - "github.com/sdboyer/gps/pkgtree" + "github.com/golang/dep/gps/pkgtree" ) type lvFixBridge []Version