Skip to content

Commit

Permalink
gha/wheels: Remove Python 3.8 build and add those for 3.12 and 3.13
Browse files Browse the repository at this point in the history
Python 3.8 reached EOL so there is no need to continue upload wheel
for it.
  • Loading branch information
anlambert committed Nov 26, 2024
1 parent 7fd6ea0 commit d20c52b
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 20 deletions.
35 changes: 20 additions & 15 deletions .github/workflows/macos-macports-wheels-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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())"
Expand All @@ -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())"
2 changes: 1 addition & 1 deletion .github/workflows/windows-wheels-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
Expand Down
3 changes: 2 additions & 1 deletion bundlers/linux/talipot_python_wheels_manylinux_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions library/talipot-python/src/PythonVersionChecker.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -17,8 +17,8 @@
#include <QRegularExpression>

// 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
Expand Down

0 comments on commit d20c52b

Please sign in to comment.