From 5fc4587af5b488e6adcec86ec96db6d0eac1479e Mon Sep 17 00:00:00 2001 From: Lucian Smith Date: Wed, 18 Sep 2024 15:51:49 -0700 Subject: [PATCH 01/12] Move to numpy 2. Try just changing the requirements.txt file; maybe everything will Just Work? Hopefully? --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 210ba6aec0..9cbf1e39cc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -numpy~=1.26 +numpy~=2.1 From 52ff65ac5ed640b5d17c085e0ac93f07e252692d Mon Sep 17 00:00:00 2001 From: Lucian Smith Date: Wed, 18 Sep 2024 15:58:09 -0700 Subject: [PATCH 02/12] Numpy only works with Python 3.10 and up. --- .github/workflows/main.yml | 94 +++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fad1f5a343..755ac27c09 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -80,13 +80,13 @@ jobs: shell: bash # v1 should be the earliest supported version, and v4 the latest. Tests are only run on v1 and v4. run: | - echo "python_v1=3.9" >> $GITHUB_ENV - echo "python_v2=3.10" >> $GITHUB_ENV - echo "python_v3=3.11" >> $GITHUB_ENV + echo "python_v1=3.10" >> $GITHUB_ENV + echo "python_v2=3.11" >> $GITHUB_ENV + # echo "python_v3=3.12" >> $GITHUB_ENV echo "python_v4=3.12" >> $GITHUB_ENV echo "python_v1_name=v1" >> $GITHUB_ENV echo "python_v2_name=v2" >> $GITHUB_ENV - echo "python_v3_name=v3" >> $GITHUB_ENV + # echo "python_v3_name=v3" >> $GITHUB_ENV echo "python_v4_name=v4" >> $GITHUB_ENV - name: Checkout RoadRunner @@ -105,7 +105,7 @@ jobs: python-version: | ${{ env.python_v1 }} ${{ env.python_v2 }} - ${{ env.python_v3 }} + # ${{ env.python_v3 }} ${{ env.python_v4 }} - name: Setup Python for Manylinux platforms @@ -128,8 +128,8 @@ jobs: echo "python_v1_dir=/Miniconda3/envs/${{ env.python_v1_name }}" >> $GITHUB_ENV echo "python_v2_exe=/Miniconda3/envs/${{ env.python_v2_name }}/bin/python" >> $GITHUB_ENV echo "python_v2_dir=/Miniconda3/envs/${{ env.python_v2_name }}" >> $GITHUB_ENV - echo "python_v3_exe=/Miniconda3/envs/${{ env.python_v3_name }}/bin/python" >> $GITHUB_ENV - echo "python_v3_dir=/Miniconda3/envs/${{ env.python_v3_name }}" >> $GITHUB_ENV + # echo "python_v3_exe=/Miniconda3/envs/${{ env.python_v3_name }}/bin/python" >> $GITHUB_ENV + # echo "python_v3_dir=/Miniconda3/envs/${{ env.python_v3_name }}" >> $GITHUB_ENV echo "python_v4_exe=/Miniconda3/envs/${{ env.python_v4_name }}/bin/python" >> $GITHUB_ENV echo "python_v4_dir=/Miniconda3/envs/${{ env.python_v4_name }}" >> $GITHUB_ENV @@ -151,11 +151,11 @@ jobs: echo "python_v2_exe=$pythonWinExecutable/python.exe" | Out-File -FilePath $env:GITHUB_ENV -Append echo "python_v2_dir=$pythonWinExecutable" | Out-File -FilePath $env:GITHUB_ENV -Append - cd ../../${{ env.python_v3 }}*/x64/ - $pythonWinExecutable = $(realpath .) - $pythonWinExecutable = $pythonWinExecutable -replace $pattern, '/' - echo "python_v3_exe=$pythonWinExecutable/python.exe" | Out-File -FilePath $env:GITHUB_ENV -Append - echo "python_v3_dir=$pythonWinExecutable" | Out-File -FilePath $env:GITHUB_ENV -Append + #cd ../../${{ env.python_v3 }}*/x64/ + #$pythonWinExecutable = $(realpath .) + #$pythonWinExecutable = $pythonWinExecutable -replace $pattern, '/' + #echo "python_v3_exe=$pythonWinExecutable/python.exe" | Out-File -FilePath $env:GITHUB_ENV -Append + #echo "python_v3_dir=$pythonWinExecutable" | Out-File -FilePath $env:GITHUB_ENV -Append cd ../../${{ env.python_v4 }}*/x64/ $pythonWinExecutable = $(realpath .) @@ -179,9 +179,9 @@ jobs: echo "python_v2_exe=$PWD/python" >> $GITHUB_ENV echo "python_v2_dir=$PWD" >> $GITHUB_ENV - cd ../../${{ env.python_v3 }}*/$py_lastdir/ - echo "python_v3_exe=$PWD/python" >> $GITHUB_ENV - echo "python_v3_dir=$PWD" >> $GITHUB_ENV + #cd ../../${{ env.python_v3 }}*/$py_lastdir/ + #echo "python_v3_exe=$PWD/python" >> $GITHUB_ENV + #echo "python_v3_dir=$PWD" >> $GITHUB_ENV cd ../../${{ env.python_v4 }}*/$py_lastdir/ echo "python_v4_exe=$PWD/python" >> $GITHUB_ENV @@ -201,10 +201,10 @@ jobs: ${{ env.python_v2_exe }} -m pip install -r ./requirements.txt ${{ env.python_v2_exe }} -m pip install -r ./test-requirements.txt ${{ env.python_v2_exe }} -m pip install build - ${{ env.python_v3_exe }} -m pip install --upgrade pip - ${{ env.python_v3_exe }} -m pip install -r ./requirements.txt - ${{ env.python_v3_exe }} -m pip install -r ./test-requirements.txt - ${{ env.python_v3_exe }} -m pip install build + #${{ env.python_v3_exe }} -m pip install --upgrade pip + #${{ env.python_v3_exe }} -m pip install -r ./requirements.txt + #${{ env.python_v3_exe }} -m pip install -r ./test-requirements.txt + #${{ env.python_v3_exe }} -m pip install build ${{ env.python_v4_exe }} -m pip install --upgrade pip ${{ env.python_v4_exe }} -m pip install -r ./requirements.txt ${{ env.python_v4_exe }} -m pip install -r ./test-requirements.txt @@ -507,34 +507,34 @@ jobs: mv * ${RUNNER_WORKSPACE}/wheels/ - - name: Rebuild RoadRunner with third Python version - if: matrix.platform.build_python == 'ON' - shell: bash - run: | - rm -r -f ${RUNNER_WORKSPACE}/install-roadrunner - cd ${RUNNER_WORKSPACE}/build-roadrunner - cmake $GITHUB_WORKSPACE -DPython_ROOT_DIR=${{ env.python_v3_dir }} - cmake --build . --target install --config ${{ matrix.platform.build_type }} - - - name: Create third Python wheel artifacts and rename - if: matrix.platform.build_type == 'Release' && matrix.platform.build_python == 'ON' - shell: bash - run: | - cd ${RUNNER_WORKSPACE}/install-roadrunner - ${{ env.python_v3_exe }} -m build --wheel - rm -r -f build - mv setup_rrplugins.py setup.py - ${{ env.python_v3_exe }} -m build --wheel - rm -r -f build - cd ${RUNNER_WORKSPACE}/install-roadrunner/dist - if compgen -G "*universal*whl" > /dev/null; then - mv libroadrunner*universal*.whl $(echo libroadrunner*universal*.whl | sed "s/universal2/${host_architecture}/g") - mv rrplugins*universal*.whl $(echo rrplugins*universal*.whl | sed "s/universal2/${host_architecture}/g") - elif compgen -G "*-linux*whl" > /dev/null; then - mv libroadrunner*-linux*.whl $(echo libroadrunner*-linux*.whl | sed "s/-linux/-manylinux_2_28/g") - mv rrplugins*-linux*.whl $(echo rrplugins*-linux*.whl | sed "s/-linux/-manylinux_2_28/g") - fi - mv * ${RUNNER_WORKSPACE}/wheels/ + # - name: Rebuild RoadRunner with third Python version + # if: matrix.platform.build_python == 'ON' + # shell: bash + # run: | + # rm -r -f ${RUNNER_WORKSPACE}/install-roadrunner + # cd ${RUNNER_WORKSPACE}/build-roadrunner + # cmake $GITHUB_WORKSPACE -DPython_ROOT_DIR=${{ env.python_v3_dir }} + # cmake --build . --target install --config ${{ matrix.platform.build_type }} + + # - name: Create third Python wheel artifacts and rename + # if: matrix.platform.build_type == 'Release' && matrix.platform.build_python == 'ON' + # shell: bash + # run: | + # cd ${RUNNER_WORKSPACE}/install-roadrunner + # ${{ env.python_v3_exe }} -m build --wheel + # rm -r -f build + # mv setup_rrplugins.py setup.py + # ${{ env.python_v3_exe }} -m build --wheel + # rm -r -f build + # cd ${RUNNER_WORKSPACE}/install-roadrunner/dist + # if compgen -G "*universal*whl" > /dev/null; then + # mv libroadrunner*universal*.whl $(echo libroadrunner*universal*.whl | sed "s/universal2/${host_architecture}/g") + # mv rrplugins*universal*.whl $(echo rrplugins*universal*.whl | sed "s/universal2/${host_architecture}/g") + # elif compgen -G "*-linux*whl" > /dev/null; then + # mv libroadrunner*-linux*.whl $(echo libroadrunner*-linux*.whl | sed "s/-linux/-manylinux_2_28/g") + # mv rrplugins*-linux*.whl $(echo rrplugins*-linux*.whl | sed "s/-linux/-manylinux_2_28/g") + # fi + # mv * ${RUNNER_WORKSPACE}/wheels/ - name: Rebuild RoadRunner with fourth Python version From d04528b106e357dea36d7b566dd5ae255ad53532 Mon Sep 17 00:00:00 2001 From: Lucian Smith Date: Wed, 18 Sep 2024 15:59:16 -0700 Subject: [PATCH 03/12] Can't put comment there. --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 755ac27c09..b85b4d2505 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -105,7 +105,6 @@ jobs: python-version: | ${{ env.python_v1 }} ${{ env.python_v2 }} - # ${{ env.python_v3 }} ${{ env.python_v4 }} - name: Setup Python for Manylinux platforms From b027fcd0d0dbbda1465bb42e10dacd48572f278c Mon Sep 17 00:00:00 2001 From: Lucian Smith Date: Wed, 18 Sep 2024 16:52:52 -0700 Subject: [PATCH 04/12] See if python 3.13 is available. It officially releases Oct 1, but maybe it's there on some servers anyway? --- .github/workflows/main.yml | 97 ++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 45 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b85b4d2505..947e28f1b5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,6 +61,12 @@ jobs: container_image: quay.io/pypa/manylinux_2_28_x86_64 build_type: Release build_python: ON + - name: manylinux_2_28-debug + os_type: manylinux + os_name: ubuntu-latest + container_image: quay.io/pypa/manylinux_2_28_x86_64 + build_type: Debug + build_python: ON libroadrunner_deps_owner: [ "sys-bio" ] libroadrunner_deps_repo: [ "libroadrunner-deps" ] libroadrunner_deps_name: [ "libroadrunner-deps" ] @@ -82,11 +88,11 @@ jobs: run: | echo "python_v1=3.10" >> $GITHUB_ENV echo "python_v2=3.11" >> $GITHUB_ENV - # echo "python_v3=3.12" >> $GITHUB_ENV - echo "python_v4=3.12" >> $GITHUB_ENV + echo "python_v3=3.12" >> $GITHUB_ENV + echo "python_v4=3.13" >> $GITHUB_ENV echo "python_v1_name=v1" >> $GITHUB_ENV echo "python_v2_name=v2" >> $GITHUB_ENV - # echo "python_v3_name=v3" >> $GITHUB_ENV + echo "python_v3_name=v3" >> $GITHUB_ENV echo "python_v4_name=v4" >> $GITHUB_ENV - name: Checkout RoadRunner @@ -105,6 +111,7 @@ jobs: python-version: | ${{ env.python_v1 }} ${{ env.python_v2 }} + ${{ env.python_v3 }} ${{ env.python_v4 }} - name: Setup Python for Manylinux platforms @@ -127,8 +134,8 @@ jobs: echo "python_v1_dir=/Miniconda3/envs/${{ env.python_v1_name }}" >> $GITHUB_ENV echo "python_v2_exe=/Miniconda3/envs/${{ env.python_v2_name }}/bin/python" >> $GITHUB_ENV echo "python_v2_dir=/Miniconda3/envs/${{ env.python_v2_name }}" >> $GITHUB_ENV - # echo "python_v3_exe=/Miniconda3/envs/${{ env.python_v3_name }}/bin/python" >> $GITHUB_ENV - # echo "python_v3_dir=/Miniconda3/envs/${{ env.python_v3_name }}" >> $GITHUB_ENV + echo "python_v3_exe=/Miniconda3/envs/${{ env.python_v3_name }}/bin/python" >> $GITHUB_ENV + echo "python_v3_dir=/Miniconda3/envs/${{ env.python_v3_name }}" >> $GITHUB_ENV echo "python_v4_exe=/Miniconda3/envs/${{ env.python_v4_name }}/bin/python" >> $GITHUB_ENV echo "python_v4_dir=/Miniconda3/envs/${{ env.python_v4_name }}" >> $GITHUB_ENV @@ -150,11 +157,11 @@ jobs: echo "python_v2_exe=$pythonWinExecutable/python.exe" | Out-File -FilePath $env:GITHUB_ENV -Append echo "python_v2_dir=$pythonWinExecutable" | Out-File -FilePath $env:GITHUB_ENV -Append - #cd ../../${{ env.python_v3 }}*/x64/ - #$pythonWinExecutable = $(realpath .) - #$pythonWinExecutable = $pythonWinExecutable -replace $pattern, '/' - #echo "python_v3_exe=$pythonWinExecutable/python.exe" | Out-File -FilePath $env:GITHUB_ENV -Append - #echo "python_v3_dir=$pythonWinExecutable" | Out-File -FilePath $env:GITHUB_ENV -Append + cd ../../${{ env.python_v3 }}*/x64/ + $pythonWinExecutable = $(realpath .) + $pythonWinExecutable = $pythonWinExecutable -replace $pattern, '/' + echo "python_v3_exe=$pythonWinExecutable/python.exe" | Out-File -FilePath $env:GITHUB_ENV -Append + echo "python_v3_dir=$pythonWinExecutable" | Out-File -FilePath $env:GITHUB_ENV -Append cd ../../${{ env.python_v4 }}*/x64/ $pythonWinExecutable = $(realpath .) @@ -178,9 +185,9 @@ jobs: echo "python_v2_exe=$PWD/python" >> $GITHUB_ENV echo "python_v2_dir=$PWD" >> $GITHUB_ENV - #cd ../../${{ env.python_v3 }}*/$py_lastdir/ - #echo "python_v3_exe=$PWD/python" >> $GITHUB_ENV - #echo "python_v3_dir=$PWD" >> $GITHUB_ENV + cd ../../${{ env.python_v3 }}*/$py_lastdir/ + echo "python_v3_exe=$PWD/python" >> $GITHUB_ENV + echo "python_v3_dir=$PWD" >> $GITHUB_ENV cd ../../${{ env.python_v4 }}*/$py_lastdir/ echo "python_v4_exe=$PWD/python" >> $GITHUB_ENV @@ -200,10 +207,10 @@ jobs: ${{ env.python_v2_exe }} -m pip install -r ./requirements.txt ${{ env.python_v2_exe }} -m pip install -r ./test-requirements.txt ${{ env.python_v2_exe }} -m pip install build - #${{ env.python_v3_exe }} -m pip install --upgrade pip - #${{ env.python_v3_exe }} -m pip install -r ./requirements.txt - #${{ env.python_v3_exe }} -m pip install -r ./test-requirements.txt - #${{ env.python_v3_exe }} -m pip install build + ${{ env.python_v3_exe }} -m pip install --upgrade pip + ${{ env.python_v3_exe }} -m pip install -r ./requirements.txt + ${{ env.python_v3_exe }} -m pip install -r ./test-requirements.txt + ${{ env.python_v3_exe }} -m pip install build ${{ env.python_v4_exe }} -m pip install --upgrade pip ${{ env.python_v4_exe }} -m pip install -r ./requirements.txt ${{ env.python_v4_exe }} -m pip install -r ./test-requirements.txt @@ -506,34 +513,34 @@ jobs: mv * ${RUNNER_WORKSPACE}/wheels/ - # - name: Rebuild RoadRunner with third Python version - # if: matrix.platform.build_python == 'ON' - # shell: bash - # run: | - # rm -r -f ${RUNNER_WORKSPACE}/install-roadrunner - # cd ${RUNNER_WORKSPACE}/build-roadrunner - # cmake $GITHUB_WORKSPACE -DPython_ROOT_DIR=${{ env.python_v3_dir }} - # cmake --build . --target install --config ${{ matrix.platform.build_type }} - - # - name: Create third Python wheel artifacts and rename - # if: matrix.platform.build_type == 'Release' && matrix.platform.build_python == 'ON' - # shell: bash - # run: | - # cd ${RUNNER_WORKSPACE}/install-roadrunner - # ${{ env.python_v3_exe }} -m build --wheel - # rm -r -f build - # mv setup_rrplugins.py setup.py - # ${{ env.python_v3_exe }} -m build --wheel - # rm -r -f build - # cd ${RUNNER_WORKSPACE}/install-roadrunner/dist - # if compgen -G "*universal*whl" > /dev/null; then - # mv libroadrunner*universal*.whl $(echo libroadrunner*universal*.whl | sed "s/universal2/${host_architecture}/g") - # mv rrplugins*universal*.whl $(echo rrplugins*universal*.whl | sed "s/universal2/${host_architecture}/g") - # elif compgen -G "*-linux*whl" > /dev/null; then - # mv libroadrunner*-linux*.whl $(echo libroadrunner*-linux*.whl | sed "s/-linux/-manylinux_2_28/g") - # mv rrplugins*-linux*.whl $(echo rrplugins*-linux*.whl | sed "s/-linux/-manylinux_2_28/g") - # fi - # mv * ${RUNNER_WORKSPACE}/wheels/ + - name: Rebuild RoadRunner with third Python version + if: matrix.platform.build_python == 'ON' + shell: bash + run: | + rm -r -f ${RUNNER_WORKSPACE}/install-roadrunner + cd ${RUNNER_WORKSPACE}/build-roadrunner + cmake $GITHUB_WORKSPACE -DPython_ROOT_DIR=${{ env.python_v3_dir }} + cmake --build . --target install --config ${{ matrix.platform.build_type }} + + - name: Create third Python wheel artifacts and rename + if: matrix.platform.build_type == 'Release' && matrix.platform.build_python == 'ON' + shell: bash + run: | + cd ${RUNNER_WORKSPACE}/install-roadrunner + ${{ env.python_v3_exe }} -m build --wheel + rm -r -f build + mv setup_rrplugins.py setup.py + ${{ env.python_v3_exe }} -m build --wheel + rm -r -f build + cd ${RUNNER_WORKSPACE}/install-roadrunner/dist + if compgen -G "*universal*whl" > /dev/null; then + mv libroadrunner*universal*.whl $(echo libroadrunner*universal*.whl | sed "s/universal2/${host_architecture}/g") + mv rrplugins*universal*.whl $(echo rrplugins*universal*.whl | sed "s/universal2/${host_architecture}/g") + elif compgen -G "*-linux*whl" > /dev/null; then + mv libroadrunner*-linux*.whl $(echo libroadrunner*-linux*.whl | sed "s/-linux/-manylinux_2_28/g") + mv rrplugins*-linux*.whl $(echo rrplugins*-linux*.whl | sed "s/-linux/-manylinux_2_28/g") + fi + mv * ${RUNNER_WORKSPACE}/wheels/ - name: Rebuild RoadRunner with fourth Python version From a8bd8a8a308d4923eb498c445e7efdd293377e2d Mon Sep 17 00:00:00 2001 From: Lucian Smith Date: Wed, 18 Sep 2024 17:14:22 -0700 Subject: [PATCH 05/12] Just set latest to 12, too. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 947e28f1b5..951de55919 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -89,7 +89,7 @@ jobs: echo "python_v1=3.10" >> $GITHUB_ENV echo "python_v2=3.11" >> $GITHUB_ENV echo "python_v3=3.12" >> $GITHUB_ENV - echo "python_v4=3.13" >> $GITHUB_ENV + echo "python_v4=3.12" >> $GITHUB_ENV echo "python_v1_name=v1" >> $GITHUB_ENV echo "python_v2_name=v2" >> $GITHUB_ENV echo "python_v3_name=v3" >> $GITHUB_ENV From ea1e20f260e1603a3bac1df5f93714dd8b14b042 Mon Sep 17 00:00:00 2001 From: Lucian Smith Date: Wed, 18 Sep 2024 17:28:51 -0700 Subject: [PATCH 06/12] No manylinux-debug. (No llvm for it.) --- .github/workflows/main.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 951de55919..ec8e0bac65 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,12 +61,6 @@ jobs: container_image: quay.io/pypa/manylinux_2_28_x86_64 build_type: Release build_python: ON - - name: manylinux_2_28-debug - os_type: manylinux - os_name: ubuntu-latest - container_image: quay.io/pypa/manylinux_2_28_x86_64 - build_type: Debug - build_python: ON libroadrunner_deps_owner: [ "sys-bio" ] libroadrunner_deps_repo: [ "libroadrunner-deps" ] libroadrunner_deps_name: [ "libroadrunner-deps" ] From f806bbcee56bce9161317f677af10e69feb2af8f Mon Sep 17 00:00:00 2001 From: Lucian Smith Date: Wed, 18 Sep 2024 18:57:52 -0700 Subject: [PATCH 07/12] Update action versions. --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ec8e0bac65..9e43258c66 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -99,7 +99,7 @@ jobs: - name: Setup Python for non-Manylinux platforms if: matrix.platform.build_python == 'ON' && matrix.platform.os_type != 'manylinux' - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 id: four_pythons with: python-version: | @@ -214,7 +214,7 @@ jobs: - name: Set MSVC as the default compiler on Windows if: matrix.platform.os_type == 'windows' - uses: ilammy/msvc-dev-cmd@v1.12.1 + uses: ilammy/msvc-dev-cmd@v1 - name: Upgrade gcc on Linux if: matrix.platform.os_type == 'manylinux' @@ -446,7 +446,7 @@ jobs: echo "artifacts_path=${RUNNER_WORKSPACE}/install-roadrunner" >> $GITHUB_ENV - name: Upload roadrunner binaries - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.artifacts_name }} path: ${{ env.artifacts_path }} @@ -587,7 +587,7 @@ jobs: - name: Upload RoadRunner Python wheel artifacts if: matrix.platform.build_type == 'Release' && matrix.platform.build_python == 'ON' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.roadrunner_python_wheel_artifacts_name }} path: ${{ env.roadrunner_python_wheel_artifacts_file }} From 3a5e585ba85f03745f50979616e1682c900ab6fb Mon Sep 17 00:00:00 2001 From: Lucian Smith Date: Fri, 4 Oct 2024 11:11:39 -0700 Subject: [PATCH 08/12] Include Python 3.13 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9e43258c66..45f4bb0b2c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -83,7 +83,7 @@ jobs: echo "python_v1=3.10" >> $GITHUB_ENV echo "python_v2=3.11" >> $GITHUB_ENV echo "python_v3=3.12" >> $GITHUB_ENV - echo "python_v4=3.12" >> $GITHUB_ENV + echo "python_v4=3.13" >> $GITHUB_ENV echo "python_v1_name=v1" >> $GITHUB_ENV echo "python_v2_name=v2" >> $GITHUB_ENV echo "python_v3_name=v3" >> $GITHUB_ENV From 68396b4aea82b39e986be1ac0cb04cc62c150c16 Mon Sep 17 00:00:00 2001 From: Lucian Smith Date: Fri, 4 Oct 2024 11:13:24 -0700 Subject: [PATCH 09/12] No 3.13 available on VMs yet. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 45f4bb0b2c..9e43258c66 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -83,7 +83,7 @@ jobs: echo "python_v1=3.10" >> $GITHUB_ENV echo "python_v2=3.11" >> $GITHUB_ENV echo "python_v3=3.12" >> $GITHUB_ENV - echo "python_v4=3.13" >> $GITHUB_ENV + echo "python_v4=3.12" >> $GITHUB_ENV echo "python_v1_name=v1" >> $GITHUB_ENV echo "python_v2_name=v2" >> $GITHUB_ENV echo "python_v3_name=v3" >> $GITHUB_ENV From 0cc0470ad1e8449fdae4940654fd5d2d01ceeae9 Mon Sep 17 00:00:00 2001 From: Lucian Smith Date: Thu, 24 Oct 2024 12:56:40 -0700 Subject: [PATCH 10/12] Try python 3.13 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9e43258c66..45f4bb0b2c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -83,7 +83,7 @@ jobs: echo "python_v1=3.10" >> $GITHUB_ENV echo "python_v2=3.11" >> $GITHUB_ENV echo "python_v3=3.12" >> $GITHUB_ENV - echo "python_v4=3.12" >> $GITHUB_ENV + echo "python_v4=3.13" >> $GITHUB_ENV echo "python_v1_name=v1" >> $GITHUB_ENV echo "python_v2_name=v2" >> $GITHUB_ENV echo "python_v3_name=v3" >> $GITHUB_ENV From 0a0b7281f488eca34a311f8690da830d345b945c Mon Sep 17 00:00:00 2001 From: Lucian Smith Date: Thu, 24 Oct 2024 13:42:57 -0700 Subject: [PATCH 11/12] Replace PyEval_CallObject with PyObject_Call cf https://github.com/tensorflow/tensorflow/pull/72232/files --- wrappers/Python/roadrunner/PyIntegratorListener.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wrappers/Python/roadrunner/PyIntegratorListener.h b/wrappers/Python/roadrunner/PyIntegratorListener.h index 035d74916f..8825c184d9 100644 --- a/wrappers/Python/roadrunner/PyIntegratorListener.h +++ b/wrappers/Python/roadrunner/PyIntegratorListener.h @@ -109,7 +109,7 @@ class PyIntegratorListener : public IntegratorListener */ PyObject *args = Py_BuildValue("(N, N, d)", pyIntegrator, pyModel, time); - PyObject *pyres = PyEval_CallObject(pyOnTimeStep, args); + PyObject *pyres = PyObject_Call(pyOnTimeStep, args, NULL); if (PyErr_Occurred()) { @@ -168,7 +168,7 @@ class PyIntegratorListener : public IntegratorListener PyObject *pyIntegrator = Integrator_NewPythonObj(integrator); PyObject *pyModel = ExecutableModel_NewPythonObj(model); PyObject *args = Py_BuildValue("(N, N, s)", pyIntegrator, pyModel, time); - PyObject *pyres = PyEval_CallObject(pyOnEvent, args); + PyObject *pyres = PyObject_Call(pyOnEvent, args, NULL); if (PyErr_Occurred()) { From d00e9e0e1d4d6937b5c8a812d1c9192204671d8f Mon Sep 17 00:00:00 2001 From: Lucian Smith Date: Thu, 24 Oct 2024 13:51:33 -0700 Subject: [PATCH 12/12] Replace PyEval_CallObject with PyObject_Call cf https://github.com/tensorflow/tensorflow/pull/72232/files --- wrappers/Python/roadrunner/PyEventListener.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wrappers/Python/roadrunner/PyEventListener.h b/wrappers/Python/roadrunner/PyEventListener.h index e341c1af82..3d02fbd919 100644 --- a/wrappers/Python/roadrunner/PyEventListener.h +++ b/wrappers/Python/roadrunner/PyEventListener.h @@ -117,7 +117,7 @@ class PyEventListener : public EventListener */ PyObject *args = Py_BuildValue("(N, i, s)", pyModel, index, eventId.c_str()); - PyObject *pyres = PyEval_CallObject(pyOnTrigger, args); + PyObject *pyres = PyObject_Call(pyOnTrigger, args, NULL); if (PyErr_Occurred()) { @@ -170,7 +170,7 @@ class PyEventListener : public EventListener PyObject *pyModel = ExecutableModel_NewPythonObj(model); PyObject *args = Py_BuildValue("(N, i, s)", pyModel, index, eventId.c_str()); - PyObject *pyres = PyEval_CallObject(pyOnAssignment, args); + PyObject *pyres = PyObject_Call(pyOnAssignment, args, NULL); if (PyErr_Occurred()) {