Amending previous commit. [skip ci]

DIPlib · Dec 8, 2022 · 1e941e8 · 1e941e8
1 parent 0d8d910
commit 1e941e8
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 58 deletions.
diff --git a/tools/travis/deploy_macos.sh b/tools/travis/deploy_macos.sh
@@ -5,9 +5,9 @@
 export BUILD_THREADS=3
 export DELOCATE=`pwd`/tools/travis/delocate
 
-#brew install [email protected]
-#brew install [email protected]
-#brew install [email protected]
+brew install [email protected]
+brew install [email protected]
+brew install [email protected]
 brew install [email protected]
 # The install above might have changed the default version of `python3`, so we need to reinstall packages:
 python3 -m pip install setuptools wheel build twine delocate
@@ -19,26 +19,26 @@ wget https://downloads.openmicroscopy.org/bio-formats/6.5.0/artifacts/bioformats
 # Basic configuration
 cmake .. -DDIP_PYDIP_WHEEL_INCLUDE_LIBS=On -DBIOFORMATS_JAR=`pwd`/bioformats_package.jar -DDIP_BUILD_DIPIMAGE=Off
 
-## Python 3.8
-#export PYTHON=/usr/local/opt/[email protected]/bin/python3
-#export PYTHON_VERSION=3.8
-#cmake .. -DPYBIND11_PYTHON_VERSION=$PYTHON_VERSION -DPYTHON_EXECUTABLE=$PYTHON
-#make -j $BUILD_THREADS bdist_wheel
-#python3 $DELOCATE -w wheelhouse/ -v pydip/staging/dist/*.whl
-#
-## Python 3.9
-#export PYTHON=/usr/local/opt/[email protected]/bin/python3
-#export PYTHON_VERSION=3.9
-#cmake .. -DPYBIND11_PYTHON_VERSION=$PYTHON_VERSION -DPYTHON_EXECUTABLE=$PYTHON
-#make -j $BUILD_THREADS bdist_wheel
-#python3 $DELOCATE -w wheelhouse/ -v pydip/staging/dist/*.whl
-#
-## Python 3.10
-#export PYTHON=/usr/local/opt/[email protected]/bin/python3
-#export PYTHON_VERSION=3.10
-#cmake .. -DPYBIND11_PYTHON_VERSION=$PYTHON_VERSION -DPYTHON_EXECUTABLE=$PYTHON
-#make -j $BUILD_THREADS bdist_wheel
-#python3 $DELOCATE -w wheelhouse/ -v pydip/staging/dist/*.whl
+# Python 3.8
+export PYTHON=/usr/local/opt/[email protected]/bin/python3
+export PYTHON_VERSION=3.8
+cmake .. -DPYBIND11_PYTHON_VERSION=$PYTHON_VERSION -DPYTHON_EXECUTABLE=$PYTHON
+make -j $BUILD_THREADS bdist_wheel
+python3 $DELOCATE -w wheelhouse/ -v pydip/staging/dist/*.whl
+
+# Python 3.9
+export PYTHON=/usr/local/opt/[email protected]/bin/python3
+export PYTHON_VERSION=3.9
+cmake .. -DPYBIND11_PYTHON_VERSION=$PYTHON_VERSION -DPYTHON_EXECUTABLE=$PYTHON
+make -j $BUILD_THREADS bdist_wheel
+python3 $DELOCATE -w wheelhouse/ -v pydip/staging/dist/*.whl
+
+# Python 3.10
+export PYTHON=/usr/local/opt/[email protected]/bin/python3
+export PYTHON_VERSION=3.10
+cmake .. -DPYBIND11_PYTHON_VERSION=$PYTHON_VERSION -DPYTHON_EXECUTABLE=$PYTHON
+make -j $BUILD_THREADS bdist_wheel
+python3 $DELOCATE -w wheelhouse/ -v pydip/staging/dist/*.whl
 
 # Python 3.11
 export PYTHON=/usr/local/opt/[email protected]/bin/python3

diff --git a/tools/travis/deploy_windows.bat b/tools/travis/deploy_windows.bat
@@ -2,9 +2,9 @@ REM Run this on Windows 10 with VS C++ build tools installed
 
 REM Get Python versions
 
-REM FOR /F "tokens=*" %%g IN ('dir C:\hostedtoolcache\windows\Python\3.8.* /B') do (SET PYTHON38=%%g)
-REM FOR /F "tokens=*" %%g IN ('dir C:\hostedtoolcache\windows\Python\3.9.* /B') do (SET PYTHON39=%%g)
-REM 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.8.* /B') do (SET PYTHON38=%%g)
+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)
 
 REM Setup
@@ -27,22 +27,22 @@ REM Basic configuration
 cmake .. -A x64 -DBIOFORMATS_JAR=%CD%\bioformats_package.jar -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.8
-REM C:\hostedtoolcache\windows\Python\%PYTHON38%\x64\python.exe -m pip install setuptools wheel build
-REM cmake .. -A x64 -DPYTHON_EXECUTABLE=C:\hostedtoolcache\windows\Python\%PYTHON38%\x64\python.exe
-REM cmake --build . --target bdist_wheel --config Release
-REM copy pydip\Release\staging\dist\*.whl wheelhouse
+C:\hostedtoolcache\windows\Python\%PYTHON38%\x64\python.exe -m pip install setuptools wheel build
+cmake .. -A x64 -DPYTHON_EXECUTABLE=C:\hostedtoolcache\windows\Python\%PYTHON38%\x64\python.exe
+cmake --build . --target bdist_wheel --config Release
+copy pydip\Release\staging\dist\*.whl wheelhouse
 
 REM Python 3.9
-REM C:\hostedtoolcache\windows\Python\%PYTHON39%\x64\python.exe -m pip install setuptools wheel build
-REM cmake .. -A x64 -DPYTHON_EXECUTABLE=C:\hostedtoolcache\windows\Python\%PYTHON39%\x64\python.exe
-REM cmake --build . --target bdist_wheel --config Release
-REM copy pydip\Release\staging\dist\*.whl wheelhouse
+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
-REM C:\hostedtoolcache\windows\Python\%PYTHON310%\x64\python.exe -m pip install setuptools wheel build
-REM cmake .. -A x64 -DPYTHON_EXECUTABLE=C:\hostedtoolcache\windows\Python\%PYTHON310%\x64\python.exe
-REM cmake --build . --target bdist_wheel --config Release
-REM copy pydip\Release\staging\dist\*.whl wheelhouse
+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
+cmake --build . --target bdist_wheel --config Release
+copy pydip\Release\staging\dist\*.whl wheelhouse
 
 REM Python 3.11
 C:\hostedtoolcache\windows\Python\%PYTHON311%\x64\python.exe -m pip install setuptools wheel build

diff --git a/tools/travis/manylinux2010.sh b/tools/travis/manylinux2010.sh
@@ -18,26 +18,26 @@ wget https://downloads.openmicroscopy.org/bio-formats/6.5.0/artifacts/bioformats
 # Basic configuration
 $CMAKE .. -DDIP_PYDIP_WHEEL_INCLUDE_LIBS=On -DBIOFORMATS_JAR=`pwd`/bioformats_package.jar 
 
-## Python 3.8
-#export PYTHON=cp38-cp38
-#export PYTHON_VERSION=3.8
-#$CMAKE .. -DPYBIND11_PYTHON_VERSION=$PYTHON_VERSION -DPYTHON_EXECUTABLE=/opt/python/$PYTHON/bin/python
-#make -j $BUILD_THREADS bdist_wheel
-#/opt/python/cp39-cp39m/bin/python $AUDITWHEEL repair pydip/staging/dist/*.whl
-#
-## Python 3.9
-#export PYTHON=cp39-cp39
-#export PYTHON_VERSION=3.9
-#$CMAKE .. -DPYBIND11_PYTHON_VERSION=$PYTHON_VERSION -DPYTHON_EXECUTABLE=/opt/python/$PYTHON/bin/python
-#make -j $BUILD_THREADS bdist_wheel
-#/opt/python/cp39-cp39m/bin/python $AUDITWHEEL repair pydip/staging/dist/*.whl
-#
-## Python 3.10
-#export PYTHON=cp310-cp310
-#export PYTHON_VERSION=3.10
-#$CMAKE .. -DPYBIND11_PYTHON_VERSION=$PYTHON_VERSION -DPYTHON_EXECUTABLE=/opt/python/$PYTHON/bin/python
-#make -j $BUILD_THREADS bdist_wheel
-#/opt/python/cp39-cp39m/bin/python $AUDITWHEEL repair pydip/staging/dist/*.whl
+# Python 3.8
+export PYTHON=cp38-cp38
+export PYTHON_VERSION=3.8
+$CMAKE .. -DPYBIND11_PYTHON_VERSION=$PYTHON_VERSION -DPYTHON_EXECUTABLE=/opt/python/$PYTHON/bin/python
+make -j $BUILD_THREADS bdist_wheel
+/opt/python/cp39-cp39m/bin/python $AUDITWHEEL repair pydip/staging/dist/*.whl
+
+# Python 3.9
+export PYTHON=cp39-cp39
+export PYTHON_VERSION=3.9
+$CMAKE .. -DPYBIND11_PYTHON_VERSION=$PYTHON_VERSION -DPYTHON_EXECUTABLE=/opt/python/$PYTHON/bin/python
+make -j $BUILD_THREADS bdist_wheel
+/opt/python/cp39-cp39m/bin/python $AUDITWHEEL repair pydip/staging/dist/*.whl
+
+# Python 3.10
+export PYTHON=cp310-cp310
+export PYTHON_VERSION=3.10
+$CMAKE .. -DPYBIND11_PYTHON_VERSION=$PYTHON_VERSION -DPYTHON_EXECUTABLE=/opt/python/$PYTHON/bin/python
+make -j $BUILD_THREADS bdist_wheel
+/opt/python/cp39-cp39m/bin/python $AUDITWHEEL repair pydip/staging/dist/*.whl
 
 # Python 3.11
 export PYTHON=cp311-cp311