Skip to content

Commit b1e5b02

Browse files
author
mganisin
authored
Merge pull request 3scale-qe#108 from mganisin/fix-release-version
Release version in setup.py commandline should not break setup.py
2 parents 3ded24a + f6ed90e commit b1e5b02

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: setup
1515
run: pip install wheel
1616
- name: build
17-
run: python setup.py ${GITHUB_REF#refs/tags/v} sdist bdist_wheel
17+
run: python setup.py --release-version ${GITHUB_REF#refs/tags/v} sdist bdist_wheel
1818
- name: release
1919
uses: pypa/gh-action-pypi-publish@master
2020
with:

setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66
with open("README.md", "r") as fh:
77
long_description = fh.read()
88

9-
VERSION = sys.argv.pop(1)
10-
assert re.match(r"[0-9]+\.[0-9]+\.[0-9]+", VERSION), "Version definition required as first arg"
9+
VERSION = "devel"
10+
if sys.argv[1] == "--release-version":
11+
sys.argv.pop(1)
12+
VERSION = sys.argv.pop(1)
13+
assert re.match(r"[0-9]+\.[0-9]+\.[0-9]+", VERSION), "Version definition required as first arg"
1114

1215
requirements = ['requests']
1316

0 commit comments

Comments
 (0)