Deploy also for Python 3.13, dropping 3.9. [skip ci]

DIPlib · Dec 27, 2024 · d2fe7fc · d2fe7fc
1 parent 7de12cf
commit d2fe7fc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/tools/build/deploy_macos.sh b/tools/build/deploy_macos.sh
@@ -2,7 +2,7 @@
 # set $PYPI_TOKEN to the PyPI token for the diplib project
 
 # Setup
-export PYTHON_VERSIONS=(3.9 3.10 3.11 3.12)
+export PYTHON_VERSIONS=(3.10 3.11 3.12 3.13)
 for v in ${PYTHON_VERSIONS[@]}; do
    brew install python@$v
 done;

diff --git a/tools/build/deploy_windows.bat b/tools/build/deploy_windows.bat
@@ -2,10 +2,10 @@ REM Run this on Windows 10 with VS C++ build tools installed
 
 REM Get Python versions
 
-FOR /F "tokens=*" %%g IN ('dir C:\hostedtoolcache\windows\Python\3.9.* /B') do (SET PYTHON39=%%g)
 FOR /F "tokens=*" %%g IN ('dir C:\hostedtoolcache\windows\Python\3.10.* /B') do (SET PYTHON310=%%g)
 FOR /F "tokens=*" %%g IN ('dir C:\hostedtoolcache\windows\Python\3.11.* /B') do (SET PYTHON311=%%g)
 FOR /F "tokens=*" %%g IN ('dir C:\hostedtoolcache\windows\Python\3.12.* /B') do (SET PYTHON312=%%g)
+FOR /F "tokens=*" %%g IN ('dir C:\hostedtoolcache\windows\Python\3.13.* /B') do (SET PYTHON313=%%g)
 
 REM Setup
 mkdir build
@@ -25,12 +25,6 @@ cd ..
 REM Basic configuration
 cmake .. -A x64 -DFREEGLUT_INCLUDE_DIR=%CD%\freeglut-3.0.0\include -DFREEGLUT_LIBRARY=%CD%\freeglut-3.0.0\build\lib\Release\freeglut_static.lib -DFREEGLUT_STATIC=On -DDIP_BUILD_DIPIMAGE=Off -DDIP_PYDIP_WHEEL_INCLUDE_LIBS=On -DDIP_ENABLE_UNICODE=Off
 
-REM Python 3.9
-C:\hostedtoolcache\windows\Python\%PYTHON39%\x64\python.exe -m pip install setuptools wheel build
-cmake .. -A x64 -DPython_EXECUTABLE=C:\hostedtoolcache\windows\Python\%PYTHON39%\x64\python.exe
-cmake --build . --target bdist_wheel --config Release
-copy pydip\Release\staging\dist\*.whl wheelhouse
-
 REM Python 3.10
 C:\hostedtoolcache\windows\Python\%PYTHON310%\x64\python.exe -m pip install setuptools wheel build
 cmake .. -A x64 -DPython_EXECUTABLE=C:\hostedtoolcache\windows\Python\%PYTHON310%\x64\python.exe
@@ -49,6 +43,12 @@ cmake .. -A x64 -DPython_EXECUTABLE=C:\hostedtoolcache\windows\Python\%PYTHON312
 cmake --build . --target bdist_wheel --config Release
 copy pydip\Release\staging\dist\*.whl wheelhouse
 
+REM Python 3.13
+C:\hostedtoolcache\windows\Python\%PYTHON313%\x64\python.exe -m pip install setuptools wheel build
+cmake .. -A x64 -DPython_EXECUTABLE=C:\hostedtoolcache\windows\Python\%PYTHON313%\x64\python.exe
+cmake --build . --target bdist_wheel --config Release
+copy pydip\Release\staging\dist\*.whl wheelhouse
+
 REM Upload to pypi.org
 cd wheelhouse
 @python -m twine upload *.whl -u __token__ -p %PYPI_TOKEN%
diff --git a/tools/build/manylinux.sh b/tools/build/manylinux.sh
@@ -6,7 +6,7 @@ yum -y install freeglut-devel java-1.8.0-openjdk-devel.x86_64
 /opt/python/cp39-cp39/bin/python -m pip install cmake auditwheel
 CMAKE=/opt/python/cp39-cp39/lib/python3.9/site-packages/cmake/data/bin/cmake
 BUILD_THREADS=4
-PYTHON_VERSIONS=(3.9 3.10 3.11 3.12)
+PYTHON_VERSIONS=(3.10 3.11 3.12 3.13)
 EXCLUDES=(libjvm.so libOpenGL.so.0 libGLX.so.0 libGLdispatch.so.0)
 
 # /io is diplib repo