Skip to content

Commit

Permalink
vendor: replace glide with dep
Browse files Browse the repository at this point in the history
  • Loading branch information
aeneasr authored and arekkas committed Oct 25, 2017
1 parent 65743b4 commit ec43e3a
Show file tree
Hide file tree
Showing 8 changed files with 231 additions and 117 deletions.
13 changes: 10 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@ go_import_path: github.com/ory/fosite
go:
- 1.9

env:
- DEP_VERSION="0.3.2"

before_install:
- curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o $GOPATH/bin/dep
- chmod +x $GOPATH/bin/dep

install:
- go get github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/pierrre/gotestcover github.com/Masterminds/glide github.com/ory/go-acc github.com/bradfitz/goimports
- glide install
- dep ensure
- go get github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/pierrre/gotestcover github.com/ory/go-acc github.com/bradfitz/goimports

script:
- ./scripts/test-format.sh
- go-acc -o coverage.txt $(glide novendor)
- go-acc -o coverage.txt ./...
- goveralls -coverprofile="coverage.txt"
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ To make a pull request, you will need a GitHub account; if you are unclear on th

1. Create a feature branch off of `master` so that changes do not get mixed up.
1. [Rebase](https://git-scm.com/book/en/Git-Branching-Rebasing) your local changes against the `master` branch.
1. Run the full project test suite with the `go test $(glide novendor)` (or equivalent) command and confirm that it passes.
1. Run the full project test suite with the `go test ./...` (or equivalent) command and confirm that it passes.
1. Run `gofmt -s` (if the project is written in Go).
1. Accept the Developer's Certificate of Origin on all commits (see above).
1. Ensure that each commit has a subsystem prefix (ex: `controller: `).
Expand Down
135 changes: 135 additions & 0 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 74 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@

# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"


[[constraint]]
name = "github.com/asaskevich/govalidator"
version = "7.0.0"

[[constraint]]
name = "github.com/dgrijalva/jwt-go"
version = "3.1.0"

[[constraint]]
name = "github.com/golang/mock"
version = "1.0.0"

[[constraint]]
name = "github.com/gorilla/mux"
version = "1.5.0"

[[constraint]]
branch = "master"
name = "github.com/gtank/cryptopasta"

[[constraint]]
branch = "master"
name = "github.com/mohae/deepcopy"

[[constraint]]
name = "github.com/oleiade/reflections"
version = "1.0.0"

[[constraint]]
name = "github.com/parnurzeal/gorequest"
version = "0.2.15"

[[constraint]]
name = "github.com/pborman/uuid"
version = "1.1.0"

[[constraint]]
name = "github.com/pkg/errors"
version = "0.8.0"

[[constraint]]
name = "github.com/stretchr/testify"
version = "1.1.4"

[[constraint]]
branch = "master"
name = "golang.org/x/crypto"

[[constraint]]
branch = "master"
name = "golang.org/x/oauth2"
6 changes: 6 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ bumps (`0.1.0` -> `0.2.0`).

<!-- END doctoc generated TOC please keep comment here to allow auto update -->

## 0.13.0

### Breaking changes

`glide` was replaced with `dep`.

## 0.12.0

### Breaking changes
Expand Down
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ was out there, so we decided to build it ourselves.

The core public API is almost stable as most changes will only touch the inner workings.

We strongly encourage vendoring fosite using [glide](https://glide.sh) or comparable tools.
We strongly encourage vendoring fosite using [dep](https://github.com/golang/dep) or comparable tools.

## Example

Expand All @@ -69,10 +69,9 @@ of code.
You can run this minimalistic example by doing

```
go get github.com/Masterminds/glide
go get github.com/ory/fosite-example
cd $GOPATH/src/github.com/ory/fosite-example
glide install
dep ensure
go install github.com/ory/fosite-example
fosite-example
```
Expand Down Expand Up @@ -148,7 +147,7 @@ GOPATH environment variable.
go get -d github.com/ory/fosite
```

We recommend to use [Glide](https://github.com/Masterminds/glide) or [Godep](https://github.com/tools/godep) to
We recommend to use [dep](https://github.com/golang/dep) to
mitigate compatibility breaks that come with new api versions.

## Documentation
Expand Down Expand Up @@ -385,10 +384,10 @@ go get -d github.com/ory/fosite
cd $GOPATH/src/github.com/ory/fosite
git status
git remote add myfork <url-to-your-fork>
go test $(glide novendor)
go test ./..
```

Simple, right? Now you are ready to go! Make sure to run `go test $(glide novendor)` often, detecting problems with your code
Simple, right? Now you are ready to go! Make sure to run `go test ./...` often, detecting problems with your code
rather sooner than later. Please read [CONTRIBUTE.md] before creating pull requests and issues.

### Refresh mock objects
Expand Down
73 changes: 0 additions & 73 deletions glide.lock

This file was deleted.

Loading

0 comments on commit ec43e3a

Please sign in to comment.