From f5f71d2c4d256ef1aaf822c162494ec1553b93c5 Mon Sep 17 00:00:00 2001 From: Tim Paine Date: Wed, 16 Nov 2022 13:36:32 -0500 Subject: [PATCH] Add python 3.10 to build matrix --- .github/workflows/build.yml | 17 +++++++++-------- cmake/modules/FindPythonHeaders.cmake | 4 ++-- python/perspective/setup.py | 1 - scripts/publish_python.js | 15 +++++++-------- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b16de861d..fc63d1c688 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -715,9 +715,9 @@ jobs: - windows-2022 # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md - windows-2019 # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md python-version: - - 3.7 - 3.8 - 3.9 + - "3.10" container: - none # Not manylinux, we will use this space to build the WASM assets - 2014 @@ -761,12 +761,12 @@ jobs: - is-full-run: false os: macos-11 - # Exclude Python 3.7 and 3.8 builds + # Exclude Python 3.8, 3.10 builds - is-full-run: false - python-version: 3.7 + python-version: 3.8 - is-full-run: false - python-version: 3.8 + python-version: "3.10" ################################## # Setup matrix job configuration # @@ -1206,9 +1206,9 @@ jobs: - windows-2022 # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md - windows-2019 # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md python-version: - - 3.7 - 3.8 - 3.9 + - "3.10" node-version: [16.x] is-full-run: - ${{ needs.initialize.outputs.FULL_RUN == 'true' }} @@ -1229,15 +1229,16 @@ jobs: - is-full-run: false os: windows-2019 - # Exclude Python 3.7 and 3.8 builds + # Exclude Mac builds - is-full-run: false os: macos-11 + # Exclude Python 3.8, 3.10 builds - is-full-run: false - python-version: 3.7 + python-version: 3.8 - is-full-run: false - python-version: 3.8 + python-version: "3.10" ################################## # Setup matrix job configuration # diff --git a/cmake/modules/FindPythonHeaders.cmake b/cmake/modules/FindPythonHeaders.cmake index ed3f4b931a..78b7b77fae 100644 --- a/cmake/modules/FindPythonHeaders.cmake +++ b/cmake/modules/FindPythonHeaders.cmake @@ -81,7 +81,7 @@ set(CMAKE_FIND_FRAMEWORK LAST) set(_PYTHON1_VERSIONS 1.6 1.5) set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) -set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) +set(_PYTHON3_VERSIONS 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) if(PythonLibs_FIND_VERSION) if(PythonLibs_FIND_VERSION_COUNT GREATER 1) @@ -267,4 +267,4 @@ endif() include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonHeaders REQUIRED_VARS Python_INCLUDE_DIRS - VERSION_VAR PYTHONLIBS_VERSION_STRING) \ No newline at end of file + VERSION_VAR PYTHONLIBS_VERSION_STRING) diff --git a/python/perspective/setup.py b/python/perspective/setup.py index 5f866dea96..a10bd358d6 100644 --- a/python/perspective/setup.py +++ b/python/perspective/setup.py @@ -283,7 +283,6 @@ def run_check(self): classifiers=[ "Development Status :: 5 - Production/Stable", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", diff --git a/scripts/publish_python.js b/scripts/publish_python.js index 082065c296..100d55cd2e 100644 --- a/scripts/publish_python.js +++ b/scripts/publish_python.js @@ -39,25 +39,26 @@ const dist_folders = [ // // https://github.com/actions/virtual-environments // Mac 11 - "perspective-python-dist-macos-11-3.7", "perspective-python-dist-macos-11-3.8", "perspective-python-dist-macos-11-3.9", + "perspective-python-dist-macos-11-3.10", // Ubuntu (Manylinux 2014 docker images) - "perspective-python-dist-ubuntu-20.04-3.7", "perspective-python-dist-ubuntu-20.04-3.8", "perspective-python-dist-ubuntu-20.04-3.9", + "perspective-python-dist-ubuntu-20.04-3.10", // Windows 2019 (No 3.6 on windows) - "perspective-python-dist-windows-2019-3.7", "perspective-python-dist-windows-2019-3.8", "perspective-python-dist-windows-2019-3.9", + "perspective-python-dist-windows-2019-3.10", // Windows 2022 // NOTE: omit these for now, rely on 2019 wheels // "perspective-python-dist-windows-2022-3.7", // "perspective-python-dist-windows-2022-3.8", // "perspective-python-dist-windows-2022-3.9", + // "perspective-python-dist-windows-2022-3.10", "perspective-python-sdist", ]; @@ -65,21 +66,19 @@ const dist_folders = [ // Artifacts inside those folders const wheels = [ // Mac 11 - // "cp36-cp36m-macosx_11_0_x86_64", - "cp37-cp37m-macosx_11_0_x86_64", "cp38-cp38-macosx_11_0_x86_64", "cp39-cp39-macosx_11_0_x86_64", + "cp310-cp310-macosx_11_0_x86_64", // Manylinux 2014 - // "cp36-cp36m-manylinux2014_x86_64", - "cp37-cp37m-manylinux2014_x86_64", "cp38-cp38-manylinux2014_x86_64", "cp39-cp39-manylinux2014_x86_64", + "cp310-cp310-manylinux2014_x86_64", // Windows (use 2019) - "cp37-cp37m-win_amd64", "cp38-cp38-win_amd64", "cp39-cp39-win_amd64", + "cp310-cp310-win_amd64", ]; // GitHub API Wrapper