From 188193e93fbee0b04ce40539cbb720f9b2641af4 Mon Sep 17 00:00:00 2001 From: Rodney Richardson Date: Tue, 21 Dec 2021 15:33:18 +0000 Subject: [PATCH 1/4] Remove python 3.6 support, and add python 3.10. Signed-off-by: Rodney Richardson --- .circleci/config.yml | 45 ++++++++++++++++++++++---------------------- appveyor.yml | 2 +- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb31c5891..0e7a5a65b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ commands: python_version: description: "version of python to install" type: string - default: 3.6.5 + default: "3.7.12" steps: - run: | brew update @@ -29,53 +29,45 @@ commands: - run: pytest jobs: - mac_python_3_6: - shell: /bin/bash --login - macos: - xcode: '9.4.1' - steps: - - checkout - - mac_install_python: - python_version: "3.6.5" - - install_run_tests - - mac_python_3_7: shell: /bin/bash --login macos: - xcode: '9.4.1' + xcode: '10.3.0' steps: - checkout - mac_install_python: - python_version: "3.7.10" + python_version: "3.7.12" - install_run_tests mac_python_3_8: shell: /bin/bash --login macos: - xcode: '9.4.1' + xcode: '10.3.0' steps: - checkout - mac_install_python: - python_version: "3.8.10" + python_version: "3.8.12" - install_run_tests mac_python_3_9: shell: /bin/bash --login macos: - xcode: '9.4.1' + xcode: '10.3.0' steps: - checkout - mac_install_python: - python_version: "3.9.5" + python_version: "3.9.9" - install_run_tests - linux_python_3_6: - docker: - - image: python:3.6 + mac_python_3_6: + shell: /bin/bash --login + macos: + xcode: '10.3.0' steps: - checkout + - mac_install_python: + python_version: "3.10.1" - install_run_tests linux_python_3_7: @@ -99,15 +91,22 @@ jobs: - checkout - install_run_tests + linux_python_3_10: + docker: + - image: python:3.10 + steps: + - checkout + - install_run_tests + workflows: version: 2 python_matrix_build: jobs: - - mac_python_3_6 - mac_python_3_7 - mac_python_3_8 - mac_python_3_9 - - linux_python_3_6 + - mac_python_3_10 - linux_python_3_7 - linux_python_3_8 - linux_python_3_9 + - linux_python_3_10 diff --git a/appveyor.yml b/appveyor.yml index 83fc722cc..f5dfe3156 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,10 +3,10 @@ image: - Visual Studio 2019 environment: matrix: - - PYTHON_EXE: "C:\\Python36-x64\\python.exe" - PYTHON_EXE: "C:\\Python37-x64\\python.exe" - PYTHON_EXE: "C:\\Python38-x64\\python.exe" - PYTHON_EXE: "C:\\Python39-x64\\python.exe" + - PYTHON_EXE: "C:\\Python310-x64\\python.exe" install: - "%PYTHON_EXE% --version" From 31876cb35ad62f22be88102e80156369b2e30f16 Mon Sep 17 00:00:00 2001 From: Rodney Richardson Date: Tue, 21 Dec 2021 15:35:59 +0000 Subject: [PATCH 2/4] Fix name of mac_python_3_10 Signed-off-by: Rodney Richardson --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0e7a5a65b..127ecb3fd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ commands: python_version: description: "version of python to install" type: string - default: "3.7.12" + default: 3.7.12 steps: - run: | brew update @@ -60,7 +60,7 @@ jobs: python_version: "3.9.9" - install_run_tests - mac_python_3_6: + mac_python_3_10: shell: /bin/bash --login macos: xcode: '10.3.0' From 1fcdb16df20b753af2aca459ec31ae556757a3bf Mon Sep 17 00:00:00 2001 From: Rodney Richardson Date: Tue, 21 Dec 2021 15:44:26 +0000 Subject: [PATCH 3/4] List available pyenv version to help determine latest available Signed-off-by: Rodney Richardson --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 127ecb3fd..6c48844b7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,6 +16,7 @@ commands: echo 'eval "$(pyenv init --path)"' >> ~/.bash_profile echo 'eval "$(pyenv init -)"' >> ~/.bash_profile source ~/.bash_profile + pyenv install --list pyenv install << parameters.python_version >> pyenv versions pyenv global << parameters.python_version >> From 1696d0240ab85d278b6d58d6c143c562069f4dd6 Mon Sep 17 00:00:00 2001 From: Rodney Richardson Date: Tue, 21 Dec 2021 15:51:32 +0000 Subject: [PATCH 4/4] Update python patches to latest available in circleci macos VM Signed-off-by: Rodney Richardson --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c48844b7..21ad15bad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ commands: python_version: description: "version of python to install" type: string - default: 3.7.12 + default: 3.7.10 steps: - run: | brew update @@ -37,7 +37,7 @@ jobs: steps: - checkout - mac_install_python: - python_version: "3.7.12" + python_version: "3.7.10" - install_run_tests @@ -48,7 +48,7 @@ jobs: steps: - checkout - mac_install_python: - python_version: "3.8.12" + python_version: "3.8.10" - install_run_tests mac_python_3_9: @@ -58,7 +58,7 @@ jobs: steps: - checkout - mac_install_python: - python_version: "3.9.9" + python_version: "3.9.5" - install_run_tests mac_python_3_10: @@ -68,7 +68,7 @@ jobs: steps: - checkout - mac_install_python: - python_version: "3.10.1" + python_version: "3.10.0b1" - install_run_tests linux_python_3_7: