From f6d4ee91f2d499827f18a7240d743694d367dec0 Mon Sep 17 00:00:00 2001 From: Nan Liu Date: Mon, 13 Jun 2016 12:01:29 -0700 Subject: [PATCH] Glide with semver dependencies. --- Godeps/Godeps.json | 209 ----------------------------------------- Godeps/Readme | 5 - docs/BUILD_AND_TEST.md | 13 +-- glide.yaml | 53 +++++++++++ scheduler/wmap/wmap.go | 3 +- scripts/deps.sh | 6 +- 6 files changed, 62 insertions(+), 227 deletions(-) delete mode 100644 Godeps/Godeps.json delete mode 100644 Godeps/Readme create mode 100644 glide.yaml diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json deleted file mode 100644 index 0a5264320..000000000 --- a/Godeps/Godeps.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "ImportPath": "github.com/intelsdi-x/snap", - "GoVersion": "go1.5", - "GodepVersion": "v74", - "Packages": [ - "./..." - ], - "Deps": [ - { - "ImportPath": "github.com/Sirupsen/logrus", - "Comment": "v0.10.0-16-gcd7d1bb", - "Rev": "cd7d1bbe41066b6c1f19780f895901052150a575" - }, - { - "ImportPath": "github.com/appc/spec/aci", - "Comment": "v0.8.3", - "Rev": "db96f94ae6b227fe4d8288527ead8927181620f6" - }, - { - "ImportPath": "github.com/appc/spec/pkg/device", - "Comment": "v0.8.3", - "Rev": "db96f94ae6b227fe4d8288527ead8927181620f6" - }, - { - "ImportPath": "github.com/appc/spec/pkg/tarheader", - "Comment": "v0.8.3", - "Rev": "db96f94ae6b227fe4d8288527ead8927181620f6" - }, - { - "ImportPath": "github.com/appc/spec/schema", - "Comment": "v0.8.3", - "Rev": "db96f94ae6b227fe4d8288527ead8927181620f6" - }, - { - "ImportPath": "github.com/appc/spec/schema/common", - "Comment": "v0.8.3", - "Rev": "db96f94ae6b227fe4d8288527ead8927181620f6" - }, - { - "ImportPath": "github.com/appc/spec/schema/types", - "Comment": "v0.8.3", - "Rev": "db96f94ae6b227fe4d8288527ead8927181620f6" - }, - { - "ImportPath": "github.com/armon/go-metrics", - "Rev": "06b60999766278efd6d2b5d8418a58c3d5b99e87" - }, - { - "ImportPath": "github.com/asaskevich/govalidator", - "Comment": "v2-51-g9699ab6", - "Rev": "9699ab6b38bee2e02cd3fe8b99ecf67665395c96" - }, - { - "ImportPath": "github.com/codegangsta/cli", - "Comment": "v1.17.0", - "Rev": "01857ac33766ce0c93856370626f9799281c14f4" - }, - { - "ImportPath": "github.com/codegangsta/negroni", - "Comment": "v0.1-70-gc7477ad", - "Rev": "c7477ad8e330bef55bf1ebe300cf8aa67c492d1b" - }, - { - "ImportPath": "github.com/coreos/go-semver/semver", - "Rev": "d043ae190b3202550d026daf009359bb5d761672" - }, - { - "ImportPath": "github.com/ghodss/yaml", - "Rev": "c3eb24aeea63668ebdac08d2e252f20df8b6b1ae" - }, - { - "ImportPath": "github.com/gopherjs/gopherjs/js", - "Rev": "4b53e1bddba0e2f734514aeb6c02db652f4c6fe8" - }, - { - "ImportPath": "github.com/gogo/protobuf/proto", - "Comment": "v0.2-20-g318371c", - "Rev": "318371cbef6bab80e8d1c69b470fffa79eebfb54" - }, - { - "ImportPath": "github.com/golang/protobuf/proto", - "Rev": "8616e8ee5e20a1704615e6c8d7afcdac06087a67" - }, - { - "ImportPath": "github.com/hashicorp/go-msgpack/codec", - "Rev": "fa3f63826f7c23912c15263591e65d54d080b458" - }, - { - "ImportPath": "github.com/hashicorp/memberlist", - "Rev": "a93fbd426dd831f5a66db3adc6a5ffa6f44cc60a" - }, - { - "ImportPath": "github.com/intelsdi-x/gomit", - "Rev": "4f098da2bbb51d787be003e4abfbc25d01837564" - }, - { - "ImportPath": "github.com/intelsdi-x/snap-plugin-utilities", - "Rev": "0b327aae781a2e94b414be121d5ac4668750156c" - }, - { - "ImportPath": "github.com/jtolds/gls", - "Rev": "8ddce2a84170772b95dd5d576c48d517b22cac63" - }, - { - "ImportPath": "github.com/julienschmidt/httprouter", - "Comment": "v1.1", - "Rev": "8c199fb6259ffc1af525cc3ad52ee60ba8359669" - }, - { - "ImportPath": "github.com/pborman/uuid", - "Rev": "ca53cad383cad2479bbba7f7a1a05797ec1386e4" - }, - { - "ImportPath": "github.com/robfig/cron", - "Comment": "v1-7-g32d9c27", - "Rev": "32d9c273155a0506d27cf73dd1246e86a470997e" - }, - { - "ImportPath": "github.com/spf13/pflag", - "Rev": "7f60f83a2c81bc3c3c0d5297f61ddfa68da9d3b7" - }, - { - "ImportPath": "github.com/vrischmann/jsonutil", - "Rev": "694784f9315ee9fc763c1d30f28753cba21307aa" - }, - { - "ImportPath": "github.com/xeipuuv/gojsonpointer", - "Rev": "e0fe6f68307607d540ed8eac07a342c33fa1b54a" - }, - { - "ImportPath": "github.com/xeipuuv/gojsonreference", - "Rev": "e02fc20de94c78484cd5ffb007f8af96be030a45" - }, - { - "ImportPath": "github.com/xeipuuv/gojsonschema", - "Rev": "d3178baac32433047aa76f07317f84fbe2be6cda" - }, - { - "ImportPath": "go4.org/errorutil", - "Rev": "15c19124e43b90eba9aa27b4341e38365254a84a" - }, - { - "ImportPath": "github.com/smartystreets/assertions", - "Comment": "1.5.0-412-g443d812", - "Rev": "443d812296a84445c202c085f19e18fc238f8250" - }, - { - "ImportPath": "github.com/smartystreets/goconvey/convey", - "Comment": "1.6.0-10-g995f5b2", - "Rev": "995f5b2e021c69b8b028ba6d0b05c1dd500783db" - }, - { - "ImportPath": "golang.org/x/crypto/cast5", - "Rev": "aedad9a179ec1ea11b7064c57cbc6dc30d7724ec" - }, - { - "ImportPath": "golang.org/x/crypto/openpgp", - "Rev": "aedad9a179ec1ea11b7064c57cbc6dc30d7724ec" - }, - { - "ImportPath": "golang.org/x/net/context", - "Rev": "154d9f9ea81208afed560f4cf27b4860c8ed1904" - }, - { - "ImportPath": "golang.org/x/net/http2", - "Rev": "154d9f9ea81208afed560f4cf27b4860c8ed1904" - }, - { - "ImportPath": "golang.org/x/net/internal/timeseries", - "Rev": "154d9f9ea81208afed560f4cf27b4860c8ed1904" - }, - { - "ImportPath": "golang.org/x/net/trace", - "Rev": "154d9f9ea81208afed560f4cf27b4860c8ed1904" - }, - { - "ImportPath": "golang.org/x/sys", - "Rev": "7f918dd405547ecb864d14a8ecbbfe205b5f930f" - }, - { - "ImportPath": "google.golang.org/grpc", - "Rev": "88aeffff979aa77aa502cb011423d0a08fa12c5a" - }, - { - "ImportPath": "gopkg.in/inf.v0", - "Comment": "v0.9.0", - "Rev": "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4" - }, - { - "ImportPath": "gopkg.in/yaml.v2", - "Rev": "c1cd2254a6dd314c9d73c338c12688c9325d85c6" - }, - { - "ImportPath": "k8s.io/kubernetes/pkg/api/resource", - "Comment": "v1.3.0-beta.0", - "Rev": "a4f439eb6d6e8086cb19d1d991a3256c4399f669" - }, - { - "ImportPath": "k8s.io/kubernetes/pkg/conversion", - "Comment": "v1.3.0-beta.0", - "Rev": "a4f439eb6d6e8086cb19d1d991a3256c4399f669" - }, - { - "ImportPath": "k8s.io/kubernetes/third_party/forked/reflect", - "Comment": "v1.3.0-beta.0", - "Rev": "a4f439eb6d6e8086cb19d1d991a3256c4399f669" - } - ] -} diff --git a/Godeps/Readme b/Godeps/Readme deleted file mode 100644 index 4cdaa53d5..000000000 --- a/Godeps/Readme +++ /dev/null @@ -1,5 +0,0 @@ -This directory tree is generated automatically by godep. - -Please do not edit. - -See https://github.com/tools/godep for more information. diff --git a/docs/BUILD_AND_TEST.md b/docs/BUILD_AND_TEST.md index a57a33106..28f42e986 100644 --- a/docs/BUILD_AND_TEST.md +++ b/docs/BUILD_AND_TEST.md @@ -38,14 +38,9 @@ $ go get -d github.com/intelsdi-x/snap $ cd $GOPATH/src/github.com/intelsdi-x/snap ``` -[godeps](https://github.com/tools/godep) is a dependency for running the `make` task(s) required for the build process. If it is not already installed, install `godeps` now: +For Go 1.5.x, enable GOVENDOREXPERIMENT. This is not required in GO 1.6+: ``` -$ # first check to see if it is installed -$ which godep -$ # if not installed, do so -$ # then download and set your path -$ go get github.com/tools/godep -$ export PATH=$GOPATH/bin/ +$ export GOVENDOREXPERIMENT=1 ``` In the `snap/` directory there's a `Makefile` that builds all dependencies and then the Snap Framework binaries. To get dependencies and build Snap run: @@ -54,9 +49,9 @@ $ cd $GOPATH/src/github.com/intelsdi-x/snap $ make ``` -It runs `make deps` and `make all` commands for you. Alternatively, you can run `make` with any of these other targets: +By default `make` runs `make deps` and `make all` commands for you. Alternatively, you can run `make` with any of these other targets: -* `deps`: fetches all dependencies using godeps +* `deps`: fetches all dependencies using glide * `check`: runs test suite * `all`: builds snapd, snapctl, and the test plugins * `snap` builds snapd and snapctl diff --git a/glide.yaml b/glide.yaml new file mode 100644 index 000000000..e4a3af750 --- /dev/null +++ b/glide.yaml @@ -0,0 +1,53 @@ +package: github.com/intelsdi-x/snap +import: +- package: github.com/Sirupsen/logrus + version: be52937128b38f1d99787bb476c789e2af1147f1 +- package: github.com/appc/spec + version: db96f94ae6b227fe4d8288527ead8927181620f6 + subpackages: + - aci + - schema +- package: github.com/asaskevich/govalidator + version: 9699ab6b38bee2e02cd3fe8b99ecf67665395c96 +- package: github.com/codegangsta/cli + version: 01857ac33766ce0c93856370626f9799281c14f4 +- package: github.com/codegangsta/negroni + version: c7477ad8e330bef55bf1ebe300cf8aa67c492d1b +- package: github.com/ghodss/yaml + version: c3eb24aeea63668ebdac08d2e252f20df8b6b1ae +- package: github.com/golang/protobuf + version: 8616e8ee5e20a1704615e6c8d7afcdac06087a67 + subpackages: + - proto +- package: github.com/hashicorp/go-msgpack + version: fa3f63826f7c23912c15263591e65d54d080b458 + subpackages: + - codec +- package: github.com/hashicorp/memberlist + version: a93fbd426dd831f5a66db3adc6a5ffa6f44cc60a +- package: github.com/intelsdi-x/gomit +- package: github.com/julienschmidt/httprouter + version: 8c199fb6259ffc1af525cc3ad52ee60ba8359669 +- package: github.com/pborman/uuid + version: ca53cad383cad2479bbba7f7a1a05797ec1386e4 +- package: github.com/robfig/cron + version: 32d9c273155a0506d27cf73dd1246e86a470997e +- package: github.com/vrischmann/jsonutil + version: 694784f9315ee9fc763c1d30f28753cba21307aa +- package: github.com/xeipuuv/gojsonschema + version: d3178baac32433047aa76f07317f84fbe2be6cda +- package: golang.org/x/crypto + version: aedad9a179ec1ea11b7064c57cbc6dc30d7724ec + subpackages: + - openpgp + - ssh/terminal +- package: golang.org/x/net + version: 04557861f124410b768b1ba5bb3a91b705afbfc6 + subpackages: + - context + - trace + - http2 +- package: google.golang.org/grpc + version: 88aeffff979aa77aa502cb011423d0a08fa12c5a +- package: gopkg.in/yaml.v2 + version: c1cd2254a6dd314c9d73c338c12688c9325d85c6 diff --git a/scheduler/wmap/wmap.go b/scheduler/wmap/wmap.go index 5d95358b9..0d150d1a4 100644 --- a/scheduler/wmap/wmap.go +++ b/scheduler/wmap/wmap.go @@ -26,9 +26,10 @@ import ( "regexp" "strings" + yaml "gopkg.in/yaml.v2" + "github.com/intelsdi-x/snap/core/cdata" "github.com/intelsdi-x/snap/core/ctypes" - "gopkg.in/yaml.v2" ) var ( diff --git a/scripts/deps.sh b/scripts/deps.sh index 1350ecbcb..6d192ae28 100755 --- a/scripts/deps.sh +++ b/scripts/deps.sh @@ -29,7 +29,7 @@ __proj_dir="$(dirname "$__dir")" _go_path -_go_get github.com/tools/godep +_go_get github.com/Masterminds/glide -_info "restoring dependency with godep" -(cd "${__proj_dir}" && godep restore) +_info "restoring dependency with glide" +(cd "${__proj_dir}" && glide install)