Skip to content

Commit 9a74642

Browse files
authored
Merge pull request #250 from stdweird/setuptools
Setuptools limits max 71.X
2 parents 0a3940c + 6b54e39 commit 9a74642

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

lib/vsc/install/shared_setup.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@
4141
import re
4242
import builtins
4343

44-
MAX_SETUPTOOLS_VERSION_PY39 = '54.0'
45-
MAX_SETUPTOOLS_VERSION_PY36 = '42.0'
44+
MAX_SETUPTOOLS_VERSION_INFINITE = '72.0' # current limit due to removal of test command
45+
MAX_SETUPTOOLS_VERSION_PY312 = '70.0'
46+
MAX_SETUPTOOLS_VERSION_PY39 = '54.0' # el9 ships 53.X
47+
MAX_SETUPTOOLS_VERSION_PY36 = '42.0' # el8 ships 41.X
4648

4749
if sys.version_info.major == 3 and sys.version_info.minor > 6:
4850
# Must run before importing setuptools
@@ -52,8 +54,12 @@
5254
print(" If you get this, set 'SETUPTOOLS_USE_DISTUTILS=local' or check the setuptools version >= 53.0")
5355

5456

55-
# only for sys.version_info.minor == 9 (rhel9 setup)
56-
MAX_SETUPTOOLS_VERSION = MAX_SETUPTOOLS_VERSION_PY39
57+
if sys.version_info.minor == 9: # el9
58+
MAX_SETUPTOOLS_VERSION = MAX_SETUPTOOLS_VERSION_PY39
59+
elif sys.version_info.minor == 12: # el10
60+
MAX_SETUPTOOLS_VERSION = MAX_SETUPTOOLS_VERSION_PY312
61+
else:
62+
MAX_SETUPTOOLS_VERSION = MAX_SETUPTOOLS_VERSION_INFINITE
5763

5864
sud = os.environ.get('SETUPTOOLS_USE_DISTUTILS', None)
5965
if sud is None:
@@ -189,7 +195,7 @@ def _log(self, level, msg, args):
189195

190196
RELOAD_VSC_MODS = False
191197

192-
VERSION = '0.21.3'
198+
VERSION = '0.21.4'
193199

194200
log.info('This is (based on) vsc.install.shared_setup %s', VERSION)
195201
log.info('(using setuptools version %s located at %s)', setuptools.__version__, setuptools.__file__)

0 commit comments

Comments
 (0)