From 319aee73f2b519cf1e17a3e4c7a4aa854506cbe4 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 9 Nov 2019 11:19:02 +0100 Subject: [PATCH 1/3] Force python 3.8 on Azure --- azure-pipelines.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6d67dfbb..72ff2b85 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,6 +3,8 @@ jobs: pool: {vmImage: 'Ubuntu-18.04'} steps: - task: UsePythonVersion@0 + inputs: + versionSpec: '3.8' - bash: | python -m pip install -r requirements-dev.txt python ./bin/run_tests.py @@ -11,6 +13,8 @@ jobs: pool: {vmImage: 'macOS-10.13'} steps: - task: UsePythonVersion@0 + inputs: + versionSpec: '3.8' - bash: | python -m pip install -r requirements-dev.txt python ./bin/run_tests.py @@ -19,6 +23,8 @@ jobs: pool: {vmImage: 'vs2017-win2016'} steps: - task: UsePythonVersion@0 + inputs: + versionSpec: '3.8' - script: choco install vcpython27 -f -y displayName: Install Visual C++ for Python 2.7 - bash: | From ce93a0309823642532068489dd603dea1d747e91 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 9 Nov 2019 12:16:25 +0100 Subject: [PATCH 2/3] Fix tests on Windows Python 3.8 --- unit_test/environment_test.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/unit_test/environment_test.py b/unit_test/environment_test.py index 0f0f385e..1bc95374 100644 --- a/unit_test/environment_test.py +++ b/unit_test/environment_test.py @@ -1,3 +1,4 @@ +import os from cibuildwheel.environment import parse_environment @@ -37,12 +38,15 @@ def test_inheritance(): def test_shell_eval(): environment_recipe = parse_environment('VAR="$(echo "a test" string)"') + env_copy = os.environ.copy() + env_copy.pop('VAR', None) + environment_dict = environment_recipe.as_dictionary( - prev_environment={} + prev_environment=env_copy ) environment_cmds = environment_recipe.as_shell_commands() - assert environment_dict == {'VAR': 'a test string'} + assert environment_dict['VAR'] == 'a test string' assert environment_cmds == ['export VAR="$(echo "a test" string)"'] def test_shell_eval_and_env(): From 7dee79a96b26a4084fef995e1a0d79b4822b5cd5 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 9 Nov 2019 12:38:38 +0100 Subject: [PATCH 3/3] Add python_requires metadata --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 5f715538..9236eb9b 100644 --- a/setup.py +++ b/setup.py @@ -21,6 +21,8 @@ setup( package_data={ 'cibuildwheel': ['resources/*'], }, + # Supported python versions + python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', keywords='ci wheel packaging pypi travis appveyor macos linux windows', classifiers=[ 'Intended Audience :: Developers',