Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vendor: glide #43

Merged
merged 3 commits into from
May 14, 2016
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
*.log
*.exe
cover.out
vendor/
10 changes: 3 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,11 @@ matrix:
- go: 1.4

install:
- go get github.com/axw/gocov/gocov
- go get github.com/mattn/goveralls
- go get golang.org/x/tools/cmd/cover
# - go get github.com/golang/lint/golint
- go get github.com/pierrre/gotestcover
- go get github.com/axw/gocov/gocov github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/pierrre/gotestcover github.com/Masterminds/glide
- go get -t ./...

script:
- go vet -x $(go list ./... | grep -v /internal/ | grep -v /vendor/)
# - golint .
- gotestcover -coverprofile="cover.out" -race -covermode="count" ./...
- glide install
- gotestcover -coverprofile="cover.out" -race -covermode="count" $(go list ./... | grep -v /vendor/)
- goveralls -coverprofile="cover.out"
2 changes: 1 addition & 1 deletion authorize_request_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
. "github.com/ory-am/fosite"
. "github.com/ory-am/fosite/internal"
"github.com/stretchr/testify/assert"
"github.com/vektra/errors"
"golang.org/x/net/context"
"github.com/go-errors/errors"
)

// Should pass
Expand Down
74 changes: 74 additions & 0 deletions glide.lock

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

22 changes: 22 additions & 0 deletions glide.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package: github.com/ory-am/fosite
import:
- package: github.com/asaskevich/govalidator
- package: github.com/dgrijalva/jwt-go
- package: github.com/go-errors/errors
- package: github.com/golang/mock
subpackages:
- gomock
- package: github.com/ory-am/common
subpackages:
- pkg
- package: github.com/parnurzeal/gorequest
- package: github.com/pborman/uuid
- package: golang.org/x/crypto
subpackages:
- bcrypt
- package: golang.org/x/net
subpackages:
- context
- package: golang.org/x/oauth2
subpackages:
- clientcredentials
3 changes: 1 addition & 2 deletions handler/core/strategy/jwt.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package strategy

import (
"errors"

"github.com/ory-am/fosite"
"github.com/ory-am/fosite/token/jwt"
"golang.org/x/net/context"
"github.com/go-errors/errors"
)

type JWTSessionContainer interface {
Expand Down