From 214c987e118ecab6145a3e4e6c4209ccf3c7ad2c Mon Sep 17 00:00:00 2001 From: Paul Bonser Date: Tue, 26 Jul 2016 14:20:48 -0500 Subject: [PATCH 1/2] Update README with warning on breaking changes --- README => README.md | 7 +++++++ 1 file changed, 7 insertions(+) rename README => README.md (74%) diff --git a/README b/README.md similarity index 74% rename from README rename to README.md index 335d234..c3d67e7 100644 --- a/README +++ b/README.md @@ -1,3 +1,10 @@ +> **Note**: If you are switching to `OwnLocal/goes` from `belogik/goes` you will want to point whatever +> dependency management system you are using at the `v1.0.0` tag to maintain backward compatibility +> (or change your code to support any API changes which may exist). The `master` branch will contain +> whatever the latest released version is and the `develop` branch will contain the currently +> in-progress version. Either of these branches may contain backwards-incompatible changes from the +> `v1.0.0` tag (which contains the code as it was when the code was forked from `belogik/goes`). + Goes : a library to interact with ElasticSearch =============================================== From 9541a9a65783500663fd2481b5096a56c830af6e Mon Sep 17 00:00:00 2001 From: Paul Bonser Date: Tue, 26 Jul 2016 14:55:16 -0500 Subject: [PATCH 2/2] Add glide config and set up tests to use glide --- .gitignore | 1 + .travis.yml | 3 ++- glide.lock | 6 ++++++ glide.yaml | 5 +++++ goes_test.go | 2 +- 5 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 glide.lock create mode 100644 glide.yaml diff --git a/.gitignore b/.gitignore index 6788dd3..791c838 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.test *.swp +vendor diff --git a/.travis.yml b/.travis.yml index 4afb310..8eb55fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,8 @@ before_script: - ${HOME}/elasticsearch/elasticsearch-${ES_VERSION}/bin/elasticsearch >/dev/null & install: - - go get gopkg.in/check.v1 + - go install github.com/Masterminds/glide + - glide install script: - make test diff --git a/glide.lock b/glide.lock new file mode 100644 index 0000000..21728fd --- /dev/null +++ b/glide.lock @@ -0,0 +1,6 @@ +hash: 7e39b5bd354c3f0770ca3a9d28a74a0523695d18effa1e540f006b325defcfe7 +updated: 2016-07-26T14:50:32.597335795-05:00 +imports: [] +testImports: +- name: github.com/go-check/check + version: 4f90aeace3a26ad7021961c297b22c42160c7b25 diff --git a/glide.yaml b/glide.yaml new file mode 100644 index 0000000..1942ac4 --- /dev/null +++ b/glide.yaml @@ -0,0 +1,5 @@ +package: github.com/OwnLocal/goes +import: [] +testImport: +- package: github.com/go-check/check + version: v1 diff --git a/goes_test.go b/goes_test.go index 7866558..a69fcb1 100644 --- a/goes_test.go +++ b/goes_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - . "gopkg.in/check.v1" + . "github.com/go-check/check" ) var (