Remove PyPy version from PythonConfiguration

This commit is contained in:
Joe Rickerby
2020-03-18 10:11:09 +00:00
parent 33da3d65c7
commit ffaad9134b
2 changed files with 11 additions and 9 deletions
+5 -4
View File
@@ -34,6 +34,7 @@ def get_nuget_args(version, arch):
def get_python_configurations(build_selector):
PythonConfiguration = namedtuple('PythonConfiguration', ['version', 'arch', 'identifier', 'url'])
python_configurations = [
# CPython
PythonConfiguration(version='2.7.17', arch='32', identifier='cp27-win32', url=None),
PythonConfiguration(version='2.7.17', arch='64', identifier='cp27-win_amd64', url=None),
PythonConfiguration(version='3.5.4', arch='32', identifier='cp35-win32', url=None),
@@ -44,8 +45,9 @@ def get_python_configurations(build_selector):
PythonConfiguration(version='3.7.6', arch='64', identifier='cp37-win_amd64', url=None),
PythonConfiguration(version='3.8.2', arch='32', identifier='cp38-win32', url=None),
PythonConfiguration(version='3.8.2', arch='64', identifier='cp38-win_amd64', url=None),
PythonConfiguration(version='2.7-v7.3.0', arch='32', identifier='pp27-win32', url='https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.0-win32.zip'),
PythonConfiguration(version='3.6-v7.3.0', arch='32', identifier='pp36-win32', url='https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.3.0-win32.zip'),
# PyPy
PythonConfiguration(version='2.7', arch='32', identifier='pp27-win32', url='https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.0-win32.zip'),
PythonConfiguration(version='3.6', arch='32', identifier='pp36-win32', url='https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.3.0-win32.zip'),
]
if IS_RUNNING_ON_TRAVIS:
@@ -132,9 +134,8 @@ def build(project_dir, output_dir, test_command, before_test, test_requires, tes
dependency_constraint_flags = []
if dependency_constraints:
python_version, _, _ = config.version.partition('-')
dependency_constraint_flags = [
'-c', dependency_constraints.get_for_python_version(python_version)
'-c', dependency_constraints.get_for_python_version(config.version)
]
# make sure pip is installed