Skip to content

Commit a11477e

Browse files
committed
PEP 404 backport
1 parent cccaec3 commit a11477e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/check_updated_preconfigs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if [[ ! "$COMMIT_MESSAGE" == *"Update version to"* ]]
3535
then
3636
cd CPAC
37-
VERSION=$(python -c "from info import __version__; print('.'.join(('.'.join(__version__[::-1].split('-')[1].split('.')[1:])[::-1], __version__.split('-')[1])) if '-' in __version__ else __version__)")
37+
VERSION=$(python -c "from info import __version__; print(('.'.join(('.'.join(__version__[::-1].split('-')[1].split('.')[1:])[::-1], __version__.split('-')[1])) if '-' in __version__ else __version__).split('+', 1)[0])")
3838
cd ..
3939
echo "v${VERSION}" > version
4040
find ./CPAC/resources/configs -name "*.yml" -exec sed -i -r "s/^(# [Vv]ersion ).*$/# Version ${VERSION}/g" {} \;

CPAC/info.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
_version_major = 1
4545
_version_minor = 8
4646
_version_micro = 6
47-
_version_extra = 'dev1'
47+
_version_extra = 'dev'
4848

4949

5050
def get_cpac_gitversion():
@@ -83,7 +83,7 @@ def get_cpac_gitversion():
8383
if 'dev' in _version_extra:
8484
gitversion = get_cpac_gitversion()
8585
if gitversion:
86-
_version_extra = gitversion + '-' + 'dev'
86+
_version_extra = f'dev1+{gitversion}'
8787

8888

8989
__version__ = "%s.%s.%s" % (_version_major,

0 commit comments

Comments
 (0)