Skip to content

Commit f66e8d1

Browse files
author
Chaï Koren
committed
[BUILD] Update handling of version string to avoid problems on newer python versions
* The use of the "-" separator in code_saturne version's strings leads to errors in setup.py starting with python 3.13. * We add a simple parsing function to procude a PEP440 compliant version string.
1 parent cf94325 commit f66e8d1

File tree

1 file changed

+33
-1
lines changed

1 file changed

+33
-1
lines changed

python/setup.py

+33-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,38 @@
2222
# Get environment variables needed
2323
# ==============================================================================
2424

25+
# ------------------------------------------------------------------------------
26+
# Simple version string parser to avoid errors
27+
# ------------------------------------------------------------------------------
28+
29+
def _parse_saturne_version_string(version_string):
30+
"""
31+
Parse a version string and return a PEP440 compliant one.
32+
"""
33+
34+
retval = ''
35+
if version_string and len(version_string) > 0:
36+
_string = version_string.split('-')
37+
retval = _string[0]
38+
if len(_string) > 1:
39+
if _string[1] == "alpha":
40+
retval += 'a0'
41+
elif _string[1] == "beta":
42+
retval += 'b0'
43+
elif _string[1][:2] == 'rc':
44+
retval += _string[1]
45+
elif _string[1] == 'patch':
46+
retval += '.post0'
47+
else:
48+
retval += '.dev0'
49+
50+
else:
51+
retval = 'master'
52+
53+
return retval
54+
55+
# ------------------------------------------------------------------------------
56+
2557
_cs_opts = {'enable_gui':False,
2658
'use_qt5':False,
2759
'exclude_dirs':[],
@@ -35,7 +67,7 @@
3567
if '--version' in sys.argv:
3668
index = sys.argv.index('--version')
3769
sys.argv.pop(index)
38-
_cs_opts['version'] = sys.argv.pop(index)
70+
_cs_opts['version'] = _parse_saturne_version_string(sys.argv.pop(index))
3971
else:
4072
_cs_opts['version'] = 'master'
4173

0 commit comments

Comments
 (0)