From d98879978d115318b14867656f4c5185deb81a17 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Fri, 11 Jul 2025 11:08:10 -0300 Subject: [PATCH 1/3] Update subproject commit and modify GitHub Actions workflow for Python 3.11 and additional Python 3.14 support --- .github/workflows/wheels.yml | 63 ++++++++++++++++++------------------ gdcm_src | 2 +- pyproject.toml | 2 +- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 5644fcb..ea878f3 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -11,9 +11,6 @@ jobs: matrix: include: # Windows 32-bit - - os: windows-2019 - python: 38 - platform_id: win32 - os: windows-2019 python: 39 platform_id: win32 @@ -29,11 +26,11 @@ jobs: - os: windows-2019 python: 313 platform_id: win32 + - os: windows-2019 + python: 314 + platform_id: win32 # Windows 64-bit - - os: windows-2019 - python: 38 - platform_id: win_amd64 - os: windows-2019 python: 39 platform_id: win_amd64 @@ -49,11 +46,11 @@ jobs: - os: windows-2019 python: 313 platform_id: win_amd64 + - os: windows-2019 + python: 314 + platform_id: win_amd64 # Linux 32-bit - - os: ubuntu-latest - python: 38 - platform_id: manylinux_i686 - os: ubuntu-latest python: 39 platform_id: manylinux_i686 @@ -69,11 +66,11 @@ jobs: - os: ubuntu-latest python: 313 platform_id: manylinux_i686 + - os: ubuntu-latest + python: 314 + platform_id: manylinux_i686 # Linux 64-bit - - os: ubuntu-latest - python: 38 - platform_id: manylinux_x86_64 - os: ubuntu-latest python: 39 platform_id: manylinux_x86_64 @@ -89,11 +86,11 @@ jobs: - os: ubuntu-latest python: 313 platform_id: manylinux_x86_64 + - os: ubuntu-latest + python: 314 + platform_id: manylinux_x86_64 # Linux aarch64 - - os: ubuntu-latest - python: 38 - platform_id: manylinux_aarch64 - os: ubuntu-latest python: 39 platform_id: manylinux_aarch64 @@ -109,13 +106,11 @@ jobs: - os: ubuntu-latest python: 313 platform_id: manylinux_aarch64 + - os: ubuntu-latest + python: 314 + platform_id: manylinux_aarch64 # macOS on Intel 64-bit - - os: macos-latest - python: 38 - arch: x86_64 - platform_id: macosx_x86_64 - macosx_deployment_target: "10.9" - os: macos-latest python: 39 arch: x86_64 @@ -136,19 +131,18 @@ jobs: arch: x86_64 platform_id: macosx_x86_64 macosx_deployment_target: "10.9" - - os: macos-latest python: 313 arch: x86_64 platform_id: macosx_x86_64 macosx_deployment_target: "10.9" + - os: macos-latest + python: 314 + arch: x86_64 + platform_id: macosx_x86_64 + macosx_deployment_target: "10.9" # macOS on Apple M1 64-bit - - os: macos-latest - python: 38 - arch: arm64 - platform_id: macosx_arm64 - macosx_deployment_target: "11.0" - os: macos-latest python: 39 arch: arm64 @@ -174,6 +168,11 @@ jobs: arch: arm64 platform_id: macosx_arm64 macosx_deployment_target: "11.0" + - os: macos-latest + python: 314 + arch: arm64 + platform_id: macosx_arm64 + macosx_deployment_target: "11.0" steps: - uses: actions/checkout@v4 @@ -189,7 +188,7 @@ jobs: - uses: actions/setup-python@v5 name: Install Python host for cibuildwheel with: - python-version: '3.9' + python-version: '3.11' # Visual Studio - name: Set up MSVC x86 @@ -270,7 +269,7 @@ jobs: popd - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.20.0 + run: python -m pip install cibuildwheel==3.0.1 - name: Build wheels # to supply options, put them in 'env', like: @@ -288,10 +287,10 @@ jobs: CIBW_BEFORE_ALL_LINUX: | yum install -y gcc-c++ pcre-devel openssl-devel - /opt/python/cp38-cp38/bin/python -m pip install ninja - ln -s /opt/python/cp38-cp38/bin/ninja /usr/bin/ninja + /opt/python/cp311-cp311/bin/python -m pip install ninja + ln -s /opt/python/cp311-cp311/bin/ninja /usr/bin/ninja if [[ ! -e $(command -v swig) ]]; then - curl -L https://sourceforge.net/projects/swig/files/swig/swig-4.2.1/swig-4.2.1.tar.gz/download --output /tmp/swig.tar.gz + curl -L https://sourceforge.net/projects/swig/files/swig/swig-4.3.1/swig-4.3.1.tar.gz/download --output /tmp/swig.tar.gz mkdir /tmp/swig tar -xvzf /tmp/swig.tar.gz -C /tmp/swig --strip-components 1 &> /dev/null pushd /tmp/swig @@ -337,7 +336,7 @@ jobs: - uses: actions/setup-python@v5 name: Install Python host for sdist with: - python-version: '3.9' + python-version: '3.11' - name: Create sdist run: | diff --git a/gdcm_src b/gdcm_src index 41c9bd7..06cd7db 160000 --- a/gdcm_src +++ b/gdcm_src @@ -1 +1 @@ -Subproject commit 41c9bd758000da78b02a71569fb7dfd2d8a86007 +Subproject commit 06cd7db23f28446d5d9ff338dfdd6025965f9f9a diff --git a/pyproject.toml b/pyproject.toml index abb7301..68ee36d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ requires = [ [project] name = "python-gdcm" -version = "3.0.25" +version = "3.0.26" authors = [ { name = "Thiago Franco de Moraes", email = "totonixsame@gmail.com" }, ] From f427533a7ee0f5b0dd81f025b05fb9e8c904ad6c Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Fri, 11 Jul 2025 13:52:54 -0300 Subject: [PATCH 2/3] Refactor GitHub Actions workflow by removing outdated Python versions for Windows and Linux, and enable prerelease Python builds. --- .github/workflows/wheels.yml | 41 +----------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index ea878f3..1f23d9d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -10,26 +10,6 @@ jobs: fail-fast: false matrix: include: - # Windows 32-bit - - os: windows-2019 - python: 39 - platform_id: win32 - - os: windows-2019 - python: 310 - platform_id: win32 - - os: windows-2019 - python: 311 - platform_id: win32 - - os: windows-2019 - python: 312 - platform_id: win32 - - os: windows-2019 - python: 313 - platform_id: win32 - - os: windows-2019 - python: 314 - platform_id: win32 - # Windows 64-bit - os: windows-2019 python: 39 @@ -50,26 +30,6 @@ jobs: python: 314 platform_id: win_amd64 - # Linux 32-bit - - os: ubuntu-latest - python: 39 - platform_id: manylinux_i686 - - os: ubuntu-latest - python: 310 - platform_id: manylinux_i686 - - os: ubuntu-latest - python: 311 - platform_id: manylinux_i686 - - os: ubuntu-latest - python: 312 - platform_id: manylinux_i686 - - os: ubuntu-latest - python: 313 - platform_id: manylinux_i686 - - os: ubuntu-latest - python: 314 - platform_id: manylinux_i686 - # Linux 64-bit - os: ubuntu-latest python: 39 @@ -282,6 +242,7 @@ jobs: # Include latest Python beta CIBW_PRERELEASE_PYTHONS: True + CIBW_ENABLE: cpython-prerelease CIBW_BUILD_FRONTEND: build From e6c9a9dd853e138603ca7b8cac1dfb233e2024b8 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Fri, 11 Jul 2025 14:03:51 -0300 Subject: [PATCH 3/3] Update GitHub Actions workflow to use Windows 2022 for Python builds, enhancing compatibility with newer environments. --- .github/workflows/wheels.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 1f23d9d..d0f8fa7 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -11,22 +11,22 @@ jobs: matrix: include: # Windows 64-bit - - os: windows-2019 + - os: windows-2022 python: 39 platform_id: win_amd64 - - os: windows-2019 + - os: windows-2022 python: 310 platform_id: win_amd64 - - os: windows-2019 + - os: windows-2022 python: 311 platform_id: win_amd64 - - os: windows-2019 + - os: windows-2022 python: 312 platform_id: win_amd64 - - os: windows-2019 + - os: windows-2022 python: 313 platform_id: win_amd64 - - os: windows-2019 + - os: windows-2022 python: 314 platform_id: win_amd64