From d20c52b5c2b2afc10bd59965a64d921008733a50 Mon Sep 17 00:00:00 2001 From: Antoine Lambert Date: Tue, 26 Nov 2024 22:14:15 +0100 Subject: [PATCH] gha/wheels: Remove Python 3.8 build and add those for 3.12 and 3.13 Python 3.8 reached EOL so there is no need to continue upload wheel for it. --- .../workflows/macos-macports-wheels-build.yml | 35 +++++++++++-------- .github/workflows/windows-wheels-build.yml | 2 +- .../talipot_python_wheels_manylinux_build.sh | 3 +- .../src/PythonVersionChecker.cpp | 6 ++-- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/.github/workflows/macos-macports-wheels-build.yml b/.github/workflows/macos-macports-wheels-build.yml index c4075498ee..4af8143503 100644 --- a/.github/workflows/macos-macports-wheels-build.yml +++ b/.github/workflows/macos-macports-wheels-build.yml @@ -77,12 +77,6 @@ jobs: graphviz - name: Install Python versions to build wheels against run: | - curl -LO https://www.python.org/ftp/python/3.7.6/python-3.7.6-macosx10.9.pkg - sudo installer -pkg python-3.7.6-macosx10.9.pkg -target / - sudo /Library/Frameworks/Python.framework/Versions/3.7/bin/pip3 install wheel - curl -LO https://www.python.org/ftp/python/3.8.1/python-3.8.1-macosx10.9.pkg - sudo installer -pkg python-3.8.1-macosx10.9.pkg -target / - sudo /Library/Frameworks/Python.framework/Versions/3.8/bin/pip3 install wheel curl -LO https://www.python.org/ftp/python/3.9.0/python-3.9.0-macosx10.9.pkg sudo installer -pkg python-3.9.0-macosx10.9.pkg -target / sudo /Library/Frameworks/Python.framework/Versions/3.9/bin/pip3 install wheel @@ -92,13 +86,18 @@ jobs: curl -LO https://www.python.org/ftp/python/3.11.0/python-3.11.0-macos11.pkg sudo installer -pkg python-3.11.0-macos11.pkg -target / sudo /Library/Frameworks/Python.framework/Versions/3.11/bin/pip3 install wheel - sudo /Library/Frameworks/Python.framework/Versions/3.11/bin/pip3 install twine + curl -LO https://www.python.org/ftp/python/3.12.7/python-3.12.7-macos11.pkg + sudo installer -pkg python-3.12.7-macos11.pkg -target / + sudo /Library/Frameworks/Python.framework/Versions/3.12/bin/pip3 install wheel + curl -LO https://www.python.org/ftp/python/3.13.0/python-3.13.0-macos11.pkg + sudo installer -pkg python-3.13.0-macos11.pkg -target / + sudo /Library/Frameworks/Python.framework/Versions/3.13/bin/pip3 install wheel twine - name: Create build directory run: mkdir build - name: Build Talipot Python wheels working-directory: ./build run: | - for py3Version in 3.8 3.9 3.10 3.11 + for py3Version in 3.9 3.10 3.11 3.12 3.13 do rm -f CMakeCache.txt || true sudo /Library/Frameworks/Python.framework/Versions/$py3Version/bin/pip3 install sip @@ -130,18 +129,16 @@ jobs: graphviz sudo port -N install \ - python38 \ - py38-pip \ python39 \ py39-pip \ python310 \ py310-pip \ python311 \ - py311-pip - - sudo pip-3.8 install --index-url https://test.pypi.org/simple/ talipot - python3.8 -c "from talipot import tlp; print(tlp.getLayoutAlgorithmPluginsList())" - python3.8 -c "from talipot import tlp; print(tlp.getImportPluginsList())" + py311-pip \ + python312 \ + py312-pip \ + python313 \ + py313-pip sudo pip-3.9 install --index-url https://test.pypi.org/simple/ talipot python3.9 -c "from talipot import tlp; print(tlp.getLayoutAlgorithmPluginsList())" @@ -154,3 +151,11 @@ jobs: sudo pip-3.11 install --index-url https://test.pypi.org/simple/ talipot python3.11 -c "from talipot import tlp; print(tlp.getLayoutAlgorithmPluginsList())" python3.11 -c "from talipot import tlp; print(tlp.getImportPluginsList())" + + sudo pip-3.12 install --index-url https://test.pypi.org/simple/ talipot + python3.12 -c "from talipot import tlp; print(tlp.getLayoutAlgorithmPluginsList())" + python3.12 -c "from talipot import tlp; print(tlp.getImportPluginsList())" + + sudo pip-3.13 install --index-url https://test.pypi.org/simple/ talipot + python3.13 -c "from talipot import tlp; print(tlp.getLayoutAlgorithmPluginsList())" + python3.13 -c "from talipot import tlp; print(tlp.getImportPluginsList())" diff --git a/.github/workflows/windows-wheels-build.yml b/.github/workflows/windows-wheels-build.yml index 7c1e6a870d..870a15de0c 100644 --- a/.github/workflows/windows-wheels-build.yml +++ b/.github/workflows/windows-wheels-build.yml @@ -13,7 +13,7 @@ jobs: shell: msys2 {0} strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - name: Cancel Previous Runs uses: styfle/cancel-workflow-action@0.12.1 diff --git a/bundlers/linux/talipot_python_wheels_manylinux_build.sh b/bundlers/linux/talipot_python_wheels_manylinux_build.sh index d04eeb3a51..8af71bf070 100644 --- a/bundlers/linux/talipot_python_wheels_manylinux_build.sh +++ b/bundlers/linux/talipot_python_wheels_manylinux_build.sh @@ -69,7 +69,8 @@ for CPYBIN in /opt/python/cp*/bin do if [[ $CPYBIN == *"cp27"* ]] || [[ $CPYBIN == *"cp34"* ]] \ || [[ $CPYBIN == *"cp35"* ]] || [[ $CPYBIN == *"cp36"* ]] \ - || [[ $CPYBIN == *"cp37"* ]] || [[ $CPYBIN == *"cp313t"* ]] + || [[ $CPYBIN == *"cp37"* ]] || [[ $CPYBIN == *"cp38"* ]] \ + || [[ $CPYBIN == *"cp313t"* ]] then continue fi diff --git a/library/talipot-python/src/PythonVersionChecker.cpp b/library/talipot-python/src/PythonVersionChecker.cpp index 4e71b6cc01..5b7449aac1 100644 --- a/library/talipot-python/src/PythonVersionChecker.cpp +++ b/library/talipot-python/src/PythonVersionChecker.cpp @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2019-2023 The Talipot developers + * Copyright (C) 2019-2024 The Talipot developers * * Talipot is a fork of Tulip, created by David Auber * and the Tulip development Team from LaBRI, University of Bordeaux @@ -17,8 +17,8 @@ #include // Current Python versions -static const char *pythonVersion[] = {"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", nullptr}; +static const char *pythonVersion[] = {"3.13", "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", nullptr}; // Windows specific functions #ifdef WIN32