summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlysses Souza <ulysses.souza@docker.com>2019-03-28 15:50:44 +0100
committerGitHub <noreply@github.com>2019-03-28 15:50:44 +0100
commitf97c577c1d57e1a7f9e2bd4b0ee1f764238f6b0c (patch)
treed648b46229a4584600b12736b111114d9d407257
parent3244094d97b6dcea0bfedf301ed7937a347ec270 (diff)
parentb0abdac90c7e6aef444368781bcc3df24f69cab0 (diff)
downloaddocker-py-f97c577c1d57e1a7f9e2bd4b0ee1f764238f6b0c.tar.gz
Merge pull request #2298 from ijc/fix-docker-version-detection-script
scripts/version.py: Use regex grouping to extract the version
-rw-r--r--scripts/versions.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/scripts/versions.py b/scripts/versions.py
index 7ad1d56..93fe0d7 100644
--- a/scripts/versions.py
+++ b/scripts/versions.py
@@ -62,13 +62,9 @@ def main():
for url in [base_url.format(cat) for cat in categories]:
res = requests.get(url)
content = res.text
- versions = [
- Version.parse(
- v.strip('"').lstrip('docker-').rstrip('.tgz').rstrip('-x86_64')
- ) for v in re.findall(
- r'"docker-[0-9]+\.[0-9]+\.[0-9]+-?.*tgz"', content
- )
- ]
+ versions = [Version.parse(v) for v in re.findall(
+ r'"docker-([0-9]+\.[0-9]+\.[0-9]+)-?.*tgz"', content
+ )]
sorted_versions = sorted(
versions, reverse=True, key=operator.attrgetter('order')
)