Skip to content
This repository has been archived by the owner on Sep 9, 2020. It is now read-only.

Move gps package out of internal #1349

Merged
merged 1 commit into from
Nov 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ratings:
- "**.go"
exclude_paths:
- vendor/
- internal/gps/_testdata
- gps/_testdata
- cmd/dep/testdata
- testdata
- internal/gps/internal/pb
- gps/internal/pb
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
/cmd/dep/graphviz* @darkowlzz

# gps caching
/internal/gps/source_cache* @jmank88
/gps/source_cache* @jmank88
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ BUG FIXES:
IMPROVEMENTS:

* Log as dependencies are pre-fetched during dep init ([#1176](https://github.com/golang/dep/pull/1176)).
* Make the gps package importable ([#1349](https://github.com/golang/dep/pull/1349)).

# v0.3.2

Expand Down
2 changes: 1 addition & 1 deletion analyzer.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"os"
"path/filepath"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/fs"
"github.com/golang/dep/internal/gps"
)

// Analyzer implements gps.ProjectAnalyzer.
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
version: "{build}"

# Source Config

clone_folder: c:\gopath\src\github.com\golang\dep

# Build host
Expand Down
6 changes: 3 additions & 3 deletions cmd/dep/ensure.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"sync"

"github.com/golang/dep"
"github.com/golang/dep/internal/gps"
"github.com/golang/dep/internal/gps/paths"
"github.com/golang/dep/internal/gps/pkgtree"
"github.com/golang/dep/gps"
"github.com/golang/dep/gps/paths"
"github.com/golang/dep/gps/pkgtree"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/dep/ensure_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"testing"

"github.com/golang/dep"
"github.com/golang/dep/internal/gps"
"github.com/golang/dep/internal/gps/pkgtree"
"github.com/golang/dep/gps"
"github.com/golang/dep/gps/pkgtree"
"github.com/golang/dep/internal/test"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/dep/gopath_scanner.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"sync"

"github.com/golang/dep"
"github.com/golang/dep/gps"
"github.com/golang/dep/gps/paths"
"github.com/golang/dep/gps/pkgtree"
fb "github.com/golang/dep/internal/feedback"
"github.com/golang/dep/internal/fs"
"github.com/golang/dep/internal/gps"
"github.com/golang/dep/internal/gps/paths"
"github.com/golang/dep/internal/gps/pkgtree"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/gopath_scanner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"testing"

"github.com/golang/dep"
"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
"github.com/golang/dep/internal/test"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/dep/hash_in.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"flag"

"github.com/golang/dep"
"github.com/golang/dep/internal/gps"
"github.com/golang/dep/internal/gps/pkgtree"
"github.com/golang/dep/gps"
"github.com/golang/dep/gps/pkgtree"
"github.com/pkg/errors"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/dep/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"time"

"github.com/golang/dep"
"github.com/golang/dep/gps"
"github.com/golang/dep/gps/paths"
"github.com/golang/dep/gps/pkgtree"
"github.com/golang/dep/internal/fs"
"github.com/golang/dep/internal/gps"
"github.com/golang/dep/internal/gps/paths"
"github.com/golang/dep/internal/gps/pkgtree"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/golang/dep"
"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
"github.com/golang/dep/internal/test"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/dep/prune.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"strings"

"github.com/golang/dep"
"github.com/golang/dep/gps"
"github.com/golang/dep/gps/pkgtree"
"github.com/golang/dep/internal/fs"
"github.com/golang/dep/internal/gps"
"github.com/golang/dep/internal/gps/pkgtree"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/root_analyzer.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"golang.org/x/sync/errgroup"

"github.com/golang/dep"
"github.com/golang/dep/gps"
fb "github.com/golang/dep/internal/feedback"
"github.com/golang/dep/internal/gps"
"github.com/golang/dep/internal/importers"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/dep/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"text/tabwriter"

"github.com/golang/dep"
"github.com/golang/dep/internal/gps"
"github.com/golang/dep/internal/gps/paths"
"github.com/golang/dep/internal/gps/pkgtree"
"github.com/golang/dep/gps"
"github.com/golang/dep/gps/paths"
"github.com/golang/dep/gps/pkgtree"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strings"

"github.com/golang/dep"
"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

func TestStatusFormatVersion(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion context.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"path/filepath"
"runtime"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/fs"
"github.com/golang/dep/internal/gps"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion docs/FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ Once you have set that up, dep will automatically use that Token to authenticate

The full algorithm is complex, but the most important thing to understand is
that `dep` tries versions in a [certain
order](https://godoc.org/github.com/golang/dep/internal/gps#SortForUpgrade),
order](https://godoc.org/github.com/golang/dep/gps#SortForUpgrade),
checking to see a version is acceptable according to specified constraints.

- All semver versions come first, and sort mostly according to the semver 2.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package cycle
import (
"cycle/one"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package one
import (
"cycle/two"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package two
import (
"cycle"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"disallow/testdata"
"sort"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package m1p
import (
"sort"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package base
import (
"go/parser"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package m1p
import (
"sort"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package m1p
import (
"sort"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package simple
import (
"go/parser"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package simple
import (
"sort"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package simple
import (
"sort"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package simple
import (
"sort"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package simple
import (
"sort"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package m1p
import (
"sort"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"missing/missing"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package m1p
import (
"sort"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package simple
import (
"sort"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package m1p
import (
"sort"

"github.com/golang/dep/internal/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package dotslash

import (
"../github.com/golang/dep/internal/gps"
"../github.com/golang/dep/gps"
)

var (
Expand Down
16 changes: 16 additions & 0 deletions gps/_testdata/src/ren/m1p/a.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright 2017 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package m1p

import (
"sort"

"github.com/golang/dep/gps"
)

var (
_ = sort.Strings
_ = gps.Solve
)
16 changes: 16 additions & 0 deletions gps/_testdata/src/ren/simple/a.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright 2017 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package simple

import (
"sort"

"github.com/golang/dep/gps"
)

var (
_ = sort.Strings
_ = gps.Solve
)
Loading