summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2019-04-30 23:36:23 -0700
committerGitHub <noreply@github.com>2019-04-30 23:36:23 -0700
commit41e1c054268104df1412f413245dc4b12951143e (patch)
treeaa5522555f6867d735bca6ef1d6f15c9cc79abc8
parent613d6aad83acc9931ff2ecfd6a6c7bd8061dc125 (diff)
parent20a5c067243bb8736595e92addb873f828fb4e1b (diff)
downloaddocker-py-41e1c054268104df1412f413245dc4b12951143e.tar.gz
Merge pull request #2325 from docker/fix_versions_script
Fix versions.py to include release stage
-rwxr-xr-x[-rw-r--r--]scripts/versions.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/versions.py b/scripts/versions.py
index 93fe0d7..4bdcb74 100644..100755
--- a/scripts/versions.py
+++ b/scripts/versions.py
@@ -26,8 +26,8 @@ class Version(namedtuple('_Version', 'major minor patch stage edition')):
edition = stage
stage = None
elif '-' in stage:
- edition, stage = stage.split('-')
- major, minor, patch = version.split('.', 3)
+ edition, stage = stage.split('-', 1)
+ major, minor, patch = version.split('.', 2)
return cls(major, minor, patch, stage, edition)
@property
@@ -63,7 +63,7 @@ def main():
res = requests.get(url)
content = res.text
versions = [Version.parse(v) for v in re.findall(
- r'"docker-([0-9]+\.[0-9]+\.[0-9]+)-?.*tgz"', content
+ r'"docker-([0-9]+\.[0-9]+\.[0-9]+-?.*)\.tgz"', content
)]
sorted_versions = sorted(
versions, reverse=True, key=operator.attrgetter('order')