From 9342718a6e37cae908cbd93eb1dca4d640c96ecc Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Thu, 9 Mar 2017 14:20:59 -0300 Subject: [PATCH 1/2] using golang/dep instead of glide --- Makefile | 4 +- glide.lock | 54 ------------------------- glide.yaml | 17 -------- lock.json | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++ manifest.json | 19 +++++++++ 5 files changed, 129 insertions(+), 73 deletions(-) delete mode 100644 glide.lock delete mode 100644 glide.yaml create mode 100644 lock.json create mode 100644 manifest.json diff --git a/Makefile b/Makefile index ac50b87b5..e8799e637 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,10 @@ TEST_OPTIONS?= setup: ## Install all the build and lint dependencies go get -u github.com/alecthomas/gometalinter - go get -u github.com/Masterminds/glide + go get -u github.com/golang/dep/... go get -u github.com/pierrre/gotestcover go get -u golang.org/x/tools/cmd/cover - glide install + dep ensure gometalinter --install test: ## Run all the tests diff --git a/glide.lock b/glide.lock deleted file mode 100644 index f5a5cc103..000000000 --- a/glide.lock +++ /dev/null @@ -1,54 +0,0 @@ -hash: 2c942a7561b41834e42ce185a40875d4982f81650fb15ae9c5388ee125b14f2d -updated: 2017-02-23T16:01:12.607119087-03:00 -imports: -- name: github.com/golang/protobuf - version: 69b215d01a5606c843240eab4937eab3acee6530 - subpackages: - - proto -- name: github.com/google/go-github - version: b59d3a6479bd00374a1523ad032da4621d9dd84a - subpackages: - - github -- name: github.com/google/go-querystring - version: 53e6ce116135b80d037921a7fdd5138cf32d7a8a - subpackages: - - query -- name: github.com/urfave/cli - version: 0bdeddeeb0f650497d603c4ad7b20cfe685682f6 -- name: golang.org/x/net - version: 6b27048ae5e6ad1ef927e72e437531493de612fe - subpackages: - - context -- name: golang.org/x/oauth2 - version: b9780ec78894ab900c062d58ee3076cd9b2a4501 - subpackages: - - internal -- name: golang.org/x/sync - version: 86ddc858aa39d0f6cccccd733e482ddc52b852e9 - subpackages: - - errgroup -- name: google.golang.org/appengine - version: 3a452f9e00122ead39586d68ffdb9c6e1326af3c - subpackages: - - internal - - internal/base - - internal/datastore - - internal/log - - internal/remote_api - - internal/urlfetch - - urlfetch -- name: gopkg.in/yaml.v1 - version: 9f9df34309c04878acc86042b16630b0f696e1de -testImports: -- name: github.com/davecgh/go-spew - version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9 - subpackages: - - spew -- name: github.com/pmezard/go-difflib - version: d8ed2627bdf02c080bf22230dbb337003b7aba2d - subpackages: - - difflib -- name: github.com/stretchr/testify - version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0 - subpackages: - - assert diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index d6531eca8..000000000 --- a/glide.yaml +++ /dev/null @@ -1,17 +0,0 @@ -package: github.com/goreleaser/goreleaser -import: -- package: github.com/google/go-github - subpackages: - - github -- package: github.com/urfave/cli - version: ~1.19.1 -- package: golang.org/x/oauth2 -- package: golang.org/x/sync - subpackages: - - errgroup -- package: gopkg.in/yaml.v1 -testImport: -- package: github.com/stretchr/testify - version: ~1.1.4 - subpackages: - - assert diff --git a/lock.json b/lock.json new file mode 100644 index 000000000..5fd7e4382 --- /dev/null +++ b/lock.json @@ -0,0 +1,108 @@ +{ + "memo": "71eb406bc76ac8012b7930667c630d2a35388459e8aad82bc4bc719c617c7438", + "projects": [ + { + "name": "github.com/davecgh/go-spew", + "version": "v1.1.0", + "revision": "346938d642f2ec3594ed81d874461961cd0faa76", + "packages": [ + "spew" + ] + }, + { + "name": "github.com/golang/protobuf", + "branch": "master", + "revision": "c9c7427a2a70d2eb3bafa0ab2dc163e45f143317", + "packages": [ + "proto" + ] + }, + { + "name": "github.com/google/go-github", + "branch": "master", + "revision": "b59d3a6479bd00374a1523ad032da4621d9dd84a", + "packages": [ + "github" + ] + }, + { + "name": "github.com/google/go-querystring", + "branch": "master", + "revision": "53e6ce116135b80d037921a7fdd5138cf32d7a8a", + "packages": [ + "query" + ] + }, + { + "name": "github.com/pmezard/go-difflib", + "version": "v1.0.0", + "revision": "792786c7400a136282c1664665ae0a8db921c6c2", + "packages": [ + "difflib" + ] + }, + { + "name": "github.com/stretchr/testify", + "version": "v1.1.4", + "revision": "69483b4bd14f5845b5a1e55bca19e954e827f1d0", + "packages": [ + "assert" + ] + }, + { + "name": "github.com/urfave/cli", + "branch": "master", + "revision": "2526b57c56f30b50466c96c4133b1a4ad0f0191f", + "packages": [ + "." + ] + }, + { + "name": "golang.org/x/net", + "branch": "master", + "revision": "6b27048ae5e6ad1ef927e72e437531493de612fe", + "packages": [ + "context" + ] + }, + { + "name": "golang.org/x/oauth2", + "branch": "master", + "revision": "b9780ec78894ab900c062d58ee3076cd9b2a4501", + "packages": [ + ".", + "internal" + ] + }, + { + "name": "golang.org/x/sync", + "branch": "master", + "revision": "86ddc858aa39d0f6cccccd733e482ddc52b852e9", + "packages": [ + "errgroup" + ] + }, + { + "name": "google.golang.org/appengine", + "version": "v1.0.0", + "revision": "150dc57a1b433e64154302bdc40b6bb8aefa313a", + "packages": [ + "internal", + "internal/base", + "internal/datastore", + "internal/log", + "internal/remote_api", + "internal/urlfetch", + "urlfetch" + ] + }, + { + "name": "gopkg.in/yaml.v1", + "branch": "v1", + "revision": "9f9df34309c04878acc86042b16630b0f696e1de", + "packages": [ + "." + ] + } + ] +} diff --git a/manifest.json b/manifest.json new file mode 100644 index 000000000..3b8150ad4 --- /dev/null +++ b/manifest.json @@ -0,0 +1,19 @@ +{ + "dependencies": { + "github.com/google/go-github": { + "branch": "master" + }, + "github.com/urfave/cli": { + "branch": "master" + }, + "golang.org/x/oauth2": { + "branch": "master" + }, + "golang.org/x/sync": { + "branch": "master" + }, + "gopkg.in/yaml.v1": { + "branch": "v1" + } + } +} From 6646c0219f78c9f3fe73c49d2b3f606ff737ba46 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Wed, 22 Mar 2017 21:34:36 -0300 Subject: [PATCH 2/2] bump deps --- lock.json | 8 ++++---- manifest.json | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lock.json b/lock.json index 5fd7e4382..03ee2146c 100644 --- a/lock.json +++ b/lock.json @@ -1,5 +1,5 @@ { - "memo": "71eb406bc76ac8012b7930667c630d2a35388459e8aad82bc4bc719c617c7438", + "memo": "4a9f04efa74d2fb39f61aa1820bd1132a74f6360bf03562f1787a6bf4fad7b83", "projects": [ { "name": "github.com/davecgh/go-spew", @@ -43,8 +43,8 @@ }, { "name": "github.com/stretchr/testify", - "version": "v1.1.4", - "revision": "69483b4bd14f5845b5a1e55bca19e954e827f1d0", + "branch": "master", + "revision": "4d4bfba8f1d1027c4fdbe371823030df51419987", "packages": [ "assert" ] @@ -60,7 +60,7 @@ { "name": "golang.org/x/net", "branch": "master", - "revision": "6b27048ae5e6ad1ef927e72e437531493de612fe", + "revision": "a6577fac2d73be281a500b310739095313165611", "packages": [ "context" ] diff --git a/manifest.json b/manifest.json index 3b8150ad4..ed6ecf68f 100644 --- a/manifest.json +++ b/manifest.json @@ -3,6 +3,9 @@ "github.com/google/go-github": { "branch": "master" }, + "github.com/stretchr/testify": { + "branch": "master" + }, "github.com/urfave/cli": { "branch": "master" },