From 8264d8ba0a0b2a55785aef123a2e9b9a57a16a95 Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Tue, 13 Dec 2016 10:04:28 -0500 Subject: [PATCH 1/2] fix(semver): Ranges can fail with some pre-release numbering There was a hyphen range bug in semver that prevented constraints in the form of v2.3.5-20161202202307-sha.e8fc5e5. This would be parsed incorrectly as a hyphen range and then fail. The bug in semver was fixed in semver v1.2.2 for this issue. --- glide.lock | 6 +++--- glide.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/glide.lock b/glide.lock index 9df10d3b2..159f0cdc7 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 93ecfadd94d604412b346a3b988000c40e4e4414788d653cec36139481e4d157 -updated: 2016-12-13T00:31:11.783543393-08:00 +hash: 2fc61aa64319b4dc6cd4a107c46a25264865f2e07362d7dcd8a3db002278d6a6 +updated: 2016-12-13T10:01:05.940550036-05:00 imports: - name: cloud.google.com/go version: 3b1ae45394a234c385be014e9a488f2bb6eef821 @@ -180,7 +180,7 @@ imports: - jlexer - jwriter - name: github.com/Masterminds/semver - version: 52edfc04e184ecf0962489d167b511b27aeebd61 + version: 59c29afe1a994eacb71c833025ca7acf874bb1da - name: github.com/Masterminds/sprig version: 1e60e4ce482a1e2c7b9c9be667535ef152e04300 - name: github.com/mattn/go-runewidth diff --git a/glide.yaml b/glide.yaml index be7ec30be..76a2618f4 100644 --- a/glide.yaml +++ b/glide.yaml @@ -12,7 +12,7 @@ import: version: ^2.7 - package: github.com/ghodss/yaml - package: github.com/Masterminds/semver - version: ~1.2.1 + version: ~1.2.2 - package: github.com/technosophos/moniker - package: github.com/golang/protobuf version: df1d3ca07d2d07bba352d5b73c4313b4e2a6203e From 4f096581d73dc31cc0ef1c107d25493d3f21e27d Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Tue, 13 Dec 2016 17:09:07 -0500 Subject: [PATCH 2/2] fix(deps): Adding missing test dependencies --- glide.lock | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/glide.lock b/glide.lock index 159f0cdc7..3419cc0a8 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ hash: 2fc61aa64319b4dc6cd4a107c46a25264865f2e07362d7dcd8a3db002278d6a6 -updated: 2016-12-13T10:01:05.940550036-05:00 +updated: 2016-12-13T17:07:47.402783003-05:00 imports: - name: cloud.google.com/go version: 3b1ae45394a234c385be014e9a488f2bb6eef821 @@ -490,4 +490,14 @@ imports: - third_party/forked/golang/netutil - third_party/forked/golang/reflect - third_party/forked/golang/template -testImports: [] +testImports: +- name: github.com/pmezard/go-difflib + version: d8ed2627bdf02c080bf22230dbb337003b7aba2d + subpackages: + - difflib +- name: github.com/stretchr/testify + version: e3a8ff8ce36581f87a15341206f205b1da467059 + subpackages: + - assert + - mock + - require