From fdc44d9342336e0dac69c4d681dc53d46fa35b72 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Tue, 7 May 2024 20:50:27 -0300 Subject: [PATCH 01/18] Testings --- CMakeLists.txt | 4 --- pyproject.toml | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f19b999..4f26b03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,10 +14,6 @@ else() set(GDCM_BUILD_SHARED_LIBS ON) endif(WIN32) -if(LINUX) - set(PYTHON_LIBRARY "MANOLO") -endif(LINUX) - find_package( Python COMPONENTS Interpreter Development.Module diff --git a/pyproject.toml b/pyproject.toml index 68ee36d..e7278c6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,11 +1,24 @@ [build-system] build-backend = "hatchling.build" requires = [ +<<<<<<< HEAD "hatchling", "wheel", "ninja >= 1.10.2.3", "cmake >= 3.22.1", "scikit-build-core~=0.9.0", +||||||| parent of e8bd0b5 (Testings) + "setuptools >= 61.0", + "wheel", + "ninja >= 1.10.2.3", + "cmake >= 3.22.1", +======= + "hatchling", + "wheel", + "ninja >= 1.10.2.3", + "cmake >= 3.22.1", + "scikit-build-core~=0.9.0", +>>>>>>> e8bd0b5 (Testings) ] [project] @@ -61,9 +74,75 @@ gdcmxml = "_gdcm.scripts.gdcmxml:main" Homepage = "https://github.com/tfmoraes/python-gdcm/" issues = "https://github.com/tfmoraes/python-gdcm/issues" +<<<<<<< HEAD [tool.hatch.build.targets.sdist] include = ["gdcm.py", "_gdcm/*", "gdcm_src/*"] exclude = ["gdcm_src/.*", "gdcm_src/Testing", ".gitignore"] +||||||| parent of e8bd0b5 (Testings) +[tool.setuptools] +py-modules=[ "gdcm", ] +packages=[ "_gdcm", "_gdcm.scripts" ] +platforms=["Windows", "Linux", "Solaris", "Mac OS-X", "Unix"] +include-package-data = true +======= +[tool.hatch.build.targets.sdist] +include = [ + "gdcm.py", + "_gdcm/*", + "gdcm_src/*" +] +exclude = [ + "gdcm_src/.*", + "gdcm_src/Testing", + ".gitignore" +] + +[tool.hatch.build.targets.wheel] +packages = ["_gdcm", "gdcm.py"] +artifacts = [ + "gdcm.py", + "*.py", + "*.so.*", + "_gdcm*.so", + # Linux modules. + "*-linux-gnu.so", + # Unix shared libraries. + "lib*.so*", + # macOS modules. + "*-darwin.so", + # macOS shared libraries. + "lib*.dylib*", + # Windows modules. + "*.pyd", + # Windows shared libraries. + "*.dll", + # GDCM applications + "*.exe", + "gdcmanon", + "gdcmconv", + "gdcmdiff", + "gdcmdump", + "gdcmgendir", + "gdcmimg", + "gdcminfo", + "gdcmpap3", + "gdcmraw", + "gdcmscanner", + "gdcmscu", + "gdcmtar", + "gdcmxml", + "XML/*.xml", +] + +[tool.hatch.build.targets.wheel.hooks.scikit-build] +experimental = true + +[tool.setuptools] +py-modules=[ "gdcm", ] +packages=[ "_gdcm", "_gdcm.scripts" ] +platforms=["Windows", "Linux", "Solaris", "Mac OS-X", "Unix"] +include-package-data = true +>>>>>>> e8bd0b5 (Testings) [tool.hatch.build.targets.wheel] packages = ["_gdcm", "gdcm.py"] From 5dd4f41b7879bec2cdfe069b6335755f1b41f211 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Wed, 8 May 2024 11:33:09 -0300 Subject: [PATCH 02/18] More testings --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e7278c6..24cfb51 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -100,7 +100,6 @@ exclude = [ [tool.hatch.build.targets.wheel] packages = ["_gdcm", "gdcm.py"] artifacts = [ - "gdcm.py", "*.py", "*.so.*", "_gdcm*.so", From 55b356a0813392165c681b26f4ecc1c6b76a18ff Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Wed, 8 May 2024 17:09:25 -0300 Subject: [PATCH 03/18] More testings --- pyproject.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 24cfb51..c3ead93 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -136,6 +136,11 @@ artifacts = [ [tool.hatch.build.targets.wheel.hooks.scikit-build] experimental = true +[tool.scikit-build] +# cmake.verbose = true +# logging.level = "INFO" +# wheel.install-dir = "gdcm.libs" + [tool.setuptools] py-modules=[ "gdcm", ] packages=[ "_gdcm", "_gdcm.scripts" ] From 73c4926acbab07ef3b2d218203c548b3dbffeba8 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Thu, 9 May 2024 10:52:37 -0300 Subject: [PATCH 04/18] More testings --- pyproject.toml | 88 +++----------------------------------------------- 1 file changed, 5 insertions(+), 83 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c3ead93..059898f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,24 +1,16 @@ [build-system] build-backend = "hatchling.build" requires = [ -<<<<<<< HEAD "hatchling", "wheel", "ninja >= 1.10.2.3", "cmake >= 3.22.1", "scikit-build-core~=0.9.0", -||||||| parent of e8bd0b5 (Testings) - "setuptools >= 61.0", - "wheel", - "ninja >= 1.10.2.3", - "cmake >= 3.22.1", -======= - "hatchling", - "wheel", - "ninja >= 1.10.2.3", - "cmake >= 3.22.1", - "scikit-build-core~=0.9.0", ->>>>>>> e8bd0b5 (Testings) + "hatchling", + "wheel", + "ninja >= 1.10.2.3", + "cmake >= 3.22.1", + "scikit-build-core~=0.9.0", ] [project] @@ -74,79 +66,9 @@ gdcmxml = "_gdcm.scripts.gdcmxml:main" Homepage = "https://github.com/tfmoraes/python-gdcm/" issues = "https://github.com/tfmoraes/python-gdcm/issues" -<<<<<<< HEAD [tool.hatch.build.targets.sdist] include = ["gdcm.py", "_gdcm/*", "gdcm_src/*"] exclude = ["gdcm_src/.*", "gdcm_src/Testing", ".gitignore"] -||||||| parent of e8bd0b5 (Testings) -[tool.setuptools] -py-modules=[ "gdcm", ] -packages=[ "_gdcm", "_gdcm.scripts" ] -platforms=["Windows", "Linux", "Solaris", "Mac OS-X", "Unix"] -include-package-data = true -======= -[tool.hatch.build.targets.sdist] -include = [ - "gdcm.py", - "_gdcm/*", - "gdcm_src/*" -] -exclude = [ - "gdcm_src/.*", - "gdcm_src/Testing", - ".gitignore" -] - -[tool.hatch.build.targets.wheel] -packages = ["_gdcm", "gdcm.py"] -artifacts = [ - "*.py", - "*.so.*", - "_gdcm*.so", - # Linux modules. - "*-linux-gnu.so", - # Unix shared libraries. - "lib*.so*", - # macOS modules. - "*-darwin.so", - # macOS shared libraries. - "lib*.dylib*", - # Windows modules. - "*.pyd", - # Windows shared libraries. - "*.dll", - # GDCM applications - "*.exe", - "gdcmanon", - "gdcmconv", - "gdcmdiff", - "gdcmdump", - "gdcmgendir", - "gdcmimg", - "gdcminfo", - "gdcmpap3", - "gdcmraw", - "gdcmscanner", - "gdcmscu", - "gdcmtar", - "gdcmxml", - "XML/*.xml", -] - -[tool.hatch.build.targets.wheel.hooks.scikit-build] -experimental = true - -[tool.scikit-build] -# cmake.verbose = true -# logging.level = "INFO" -# wheel.install-dir = "gdcm.libs" - -[tool.setuptools] -py-modules=[ "gdcm", ] -packages=[ "_gdcm", "_gdcm.scripts" ] -platforms=["Windows", "Linux", "Solaris", "Mac OS-X", "Unix"] -include-package-data = true ->>>>>>> e8bd0b5 (Testings) [tool.hatch.build.targets.wheel] packages = ["_gdcm", "gdcm.py"] From 33ba189d214478f2c7824f0298c88bf155e0e08f Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Thu, 9 May 2024 11:17:18 -0300 Subject: [PATCH 05/18] More testings --- pyproject.toml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 059898f..68ee36d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,11 +6,6 @@ requires = [ "ninja >= 1.10.2.3", "cmake >= 3.22.1", "scikit-build-core~=0.9.0", - "hatchling", - "wheel", - "ninja >= 1.10.2.3", - "cmake >= 3.22.1", - "scikit-build-core~=0.9.0", ] [project] From cca39f919fc82c9013ecc46b526f0a735258feea Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Thu, 9 May 2024 11:26:20 -0300 Subject: [PATCH 06/18] More testings --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f26b03..a2e96df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,7 @@ if(APPLE) set(CMAKE_INSTALL_RPATH "@loader_path") set(CMAKE_BUILD_RPATH "@loader_path") elseif(LINUX) + set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(CMAKE_INSTALL_RPATH "\$ORIGIN") endif() From 234dc56dd0b52c24d0c3f3703894d5244e055c15 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Thu, 9 May 2024 14:54:19 -0300 Subject: [PATCH 07/18] More testings --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a2e96df..4f26b03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,6 @@ if(APPLE) set(CMAKE_INSTALL_RPATH "@loader_path") set(CMAKE_BUILD_RPATH "@loader_path") elseif(LINUX) - set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(CMAKE_INSTALL_RPATH "\$ORIGIN") endif() From 5e90b561469f2630e8e3c2cf62f231014091f2e0 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Fri, 10 May 2024 20:28:17 -0300 Subject: [PATCH 08/18] More testings --- CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f26b03..1ccfd56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,8 +52,13 @@ if(APPLE) set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -undefined dynamic_lookup -liconv") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup -liconv") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -undefined dynamic_lookup -liconv") - set(CMAKE_INSTALL_RPATH "@loader_path") - set(CMAKE_BUILD_RPATH "@loader_path") + set(CMAKE_INSTALL_RPATH "\$ORIGIN") + set(CMAKE_BUILD_RPATH "\$ORIGIN") + execute_process( + COMMAND sed -i "" -E "s/^[[:blank:]]*list\\(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR \"\\$\\{CMAKE_INSTALL_PREFIX\\}\\/\\$\\{OPENJPEG_INSTALL_LIB_DIR\\}\\\")//" + ${CMAKE_SOURCE_DIR}/gdcm_src/Utilities/gdcmopenjpeg/CMakeLists.txt + RESULT_VARIABLE result + ) elseif(LINUX) set(CMAKE_INSTALL_RPATH "\$ORIGIN") endif() From 546228648a342ced3082f768a1f3644a1a4f862c Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Fri, 10 May 2024 22:55:45 -0300 Subject: [PATCH 09/18] More testings --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ccfd56..94b234a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,8 +52,8 @@ if(APPLE) set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -undefined dynamic_lookup -liconv") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup -liconv") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -undefined dynamic_lookup -liconv") - set(CMAKE_INSTALL_RPATH "\$ORIGIN") - set(CMAKE_BUILD_RPATH "\$ORIGIN") + set(CMAKE_INSTALL_RPATH "@loader_path") + set(CMAKE_BUILD_RPATH "@loader_path") execute_process( COMMAND sed -i "" -E "s/^[[:blank:]]*list\\(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR \"\\$\\{CMAKE_INSTALL_PREFIX\\}\\/\\$\\{OPENJPEG_INSTALL_LIB_DIR\\}\\\")//" ${CMAKE_SOURCE_DIR}/gdcm_src/Utilities/gdcmopenjpeg/CMakeLists.txt From fd5e1e68b10eb54efa3c63e5f28979505afb2142 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Wed, 10 Sep 2025 16:42:46 -0300 Subject: [PATCH 10/18] Testing 3.2.0 --- gdcm_src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdcm_src b/gdcm_src index 06cd7db..0c7b33d 160000 --- a/gdcm_src +++ b/gdcm_src @@ -1 +1 @@ -Subproject commit 06cd7db23f28446d5d9ff338dfdd6025965f9f9a +Subproject commit 0c7b33d3ce99afc4ad4d4a5ed2210d5a573d2bd4 From 0d2bcf14a187213dccd8e95d7ca2b8ca7d70d469 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Wed, 10 Sep 2025 18:29:35 -0300 Subject: [PATCH 11/18] windows 2019 -> 2022 --- .github/workflows/wheels.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index d0f8fa7..9f009ef 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -10,7 +10,33 @@ jobs: fail-fast: false matrix: include: + # Windows 32-bit + - os: windows-2022 + python: 37 + platform_id: win32 + - os: windows-2022 + python: 38 + platform_id: win32 + - os: windows-2022 + python: 39 + platform_id: win32 + - os: windows-2022 + python: 310 + platform_id: win32 + - os: windows-2022 + python: 311 + platform_id: win32 + - os: windows-2022 + python: 312 + platform_id: win32 + # Windows 64-bit + - os: windows-2022 + python: 37 + platform_id: win_amd64 + - os: windows-2022 + python: 38 + platform_id: win_amd64 - os: windows-2022 python: 39 platform_id: win_amd64 From 6d506bda0e807830a31fb7f571fa64351a33dd6a Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Wed, 10 Sep 2025 18:38:17 -0300 Subject: [PATCH 12/18] openssl ubunut --- .github/workflows/wheels.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 9f009ef..5389d97 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -254,6 +254,12 @@ jobs: popd popd + - name: Install openssl ubuntu + if: matrix.os == 'ubuntu-latest' + run: | + sudo apt-get update + sudo apt-get install --yes libssl-dev + - name: Install cibuildwheel run: python -m pip install cibuildwheel==3.0.1 From 5b75e19b5692305a50d476b607c0f5499db1849f Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Thu, 11 Sep 2025 10:16:18 -0300 Subject: [PATCH 13/18] Updates --- .github/workflows/wheels.yml | 25 +++++++++---------------- gdcm_src | 2 +- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 5389d97..6505a9c 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -6,17 +6,16 @@ jobs: build_wheels: name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform_id }} runs-on: ${{ matrix.os }} + env: + # OpenSSL version control + OPENSSL_VERSION: "openssl-3.5.2" + # SWIG version control + SWIG_VERSION: "4.3.1" strategy: fail-fast: false matrix: include: # Windows 32-bit - - os: windows-2022 - python: 37 - platform_id: win32 - - os: windows-2022 - python: 38 - platform_id: win32 - os: windows-2022 python: 39 platform_id: win32 @@ -31,12 +30,6 @@ jobs: platform_id: win32 # Windows 64-bit - - os: windows-2022 - python: 37 - platform_id: win_amd64 - - os: windows-2022 - python: 38 - platform_id: win_amd64 - os: windows-2022 python: 39 platform_id: win_amd64 @@ -216,7 +209,7 @@ jobs: pushd c:/ git clone https://github.com/openssl/openssl.git pushd openssl - git checkout openssl-3.3.0 + git checkout ${{ env.OPENSSL_VERSION }} perl Configure no-shared no-tests VC-WIN64A nmake mkdir lib\VC @@ -266,9 +259,9 @@ jobs: - name: Build wheels # to supply options, put them in 'env', like: env: - CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 - CIBW_MANYLINUX_I686_IMAGE: manylinux2014 - CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 + CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28 + CIBW_MANYLINUX_I686_IMAGE: manylinux_2_28 + CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28 CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }} CIBW_ARCHS_LINUX: auto aarch64 diff --git a/gdcm_src b/gdcm_src index 0c7b33d..9db6ec3 160000 --- a/gdcm_src +++ b/gdcm_src @@ -1 +1 @@ -Subproject commit 0c7b33d3ce99afc4ad4d4a5ed2210d5a573d2bd4 +Subproject commit 9db6ec37c65efff07e82aa57be5c65f263ce37b5 From 013c39992a4ca69b1aa2c6e4328ad1eef12e4b28 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Thu, 11 Sep 2025 10:23:03 -0300 Subject: [PATCH 14/18] Updates --- .github/workflows/wheels.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 6505a9c..39e8513 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -224,7 +224,7 @@ jobs: pushd c:\ git clone https://github.com/openssl/openssl.git pushd openssl - git checkout openssl-3.3.1 + git checkout ${{ env.OPENSSL_VERSION }} perl Configure no-shared no-tests VC-WIN32 nmake mkdir lib\VC @@ -239,7 +239,7 @@ jobs: pushd /tmp git clone https://github.com/openssl/openssl.git pushd openssl - git checkout openssl-3.3.1 + git checkout ${{ env.OPENSSL_VERSION }} export MACOSX_DEPLOYMENT_TARGET="${{ matrix.macosx_deployment_target }}" ./Configure --prefix=/usr/local/openssl no-tests darwin64-${{ matrix.arch }}-cc make @@ -254,14 +254,14 @@ jobs: sudo apt-get install --yes libssl-dev - name: Install cibuildwheel - run: python -m pip install cibuildwheel==3.0.1 + run: python -m pip install cibuildwheel==3.1.4 - name: Build wheels # to supply options, put them in 'env', like: env: - CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28 - CIBW_MANYLINUX_I686_IMAGE: manylinux_2_28 - CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28 + # CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28 + # CIBW_MANYLINUX_I686_IMAGE: manylinux_2_28 + # CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28 CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }} CIBW_ARCHS_LINUX: auto aarch64 @@ -276,7 +276,7 @@ jobs: /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.3.1/swig-4.3.1.tar.gz/download --output /tmp/swig.tar.gz + curl -L https://sourceforge.net/projects/swig/files/swig/swig-${{ env.SWIG_VERSION }}/swig-${{ env.SWIG_VERSION }}.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 From eea160fbf8f3b5daa8703654d29127f1bac3db32 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Thu, 11 Sep 2025 10:48:40 -0300 Subject: [PATCH 15/18] Updates --- .github/workflows/wheels.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 39e8513..d6d622d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -15,20 +15,6 @@ jobs: fail-fast: false matrix: include: - # Windows 32-bit - - os: windows-2022 - python: 39 - platform_id: win32 - - os: windows-2022 - python: 310 - platform_id: win32 - - os: windows-2022 - python: 311 - platform_id: win32 - - os: windows-2022 - python: 312 - platform_id: win32 - # Windows 64-bit - os: windows-2022 python: 39 From 59ccaf1671112f6b94e1f28ded0e48c4c126410a Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Thu, 11 Sep 2025 11:53:29 -0300 Subject: [PATCH 16/18] Updates --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 68ee36d..0f3ca25 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ requires = [ [project] name = "python-gdcm" -version = "3.0.26" +version = "3.2.1" authors = [ { name = "Thiago Franco de Moraes", email = "totonixsame@gmail.com" }, ] From e0162e95ce89f6b23cb50f74327022ce903c7a7e Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Thu, 11 Sep 2025 22:05:55 -0300 Subject: [PATCH 17/18] Updates --- .github/workflows/wheels.yml | 2 +- gdcm_src | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index d6d622d..997fba8 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -318,7 +318,7 @@ jobs: - uses: actions/upload-artifact@v4 with: path: ./dist/*.tar.gz - name: artifact-${{ matrix.os }}-${{ matrix.platform_id }}-python-${{ matrix.python }} + name: artifact-sdist merge: runs-on: ubuntu-latest diff --git a/gdcm_src b/gdcm_src index 9db6ec3..0c7b33d 160000 --- a/gdcm_src +++ b/gdcm_src @@ -1 +1 @@ -Subproject commit 9db6ec37c65efff07e82aa57be5c65f263ce37b5 +Subproject commit 0c7b33d3ce99afc4ad4d4a5ed2210d5a573d2bd4 From 5d3dd91b6864d1496954d8a23851f815996cf4d1 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Thu, 11 Sep 2025 22:20:24 -0300 Subject: [PATCH 18/18] Updates --- CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94b234a..8518871 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,10 @@ else() set(GDCM_BUILD_SHARED_LIBS ON) endif(WIN32) +if(LINUX) + set(PYTHON_LIBRARY "MANOLO") +endif(LINUX) + find_package( Python COMPONENTS Interpreter Development.Module @@ -54,14 +58,9 @@ if(APPLE) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -undefined dynamic_lookup -liconv") set(CMAKE_INSTALL_RPATH "@loader_path") set(CMAKE_BUILD_RPATH "@loader_path") - execute_process( - COMMAND sed -i "" -E "s/^[[:blank:]]*list\\(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR \"\\$\\{CMAKE_INSTALL_PREFIX\\}\\/\\$\\{OPENJPEG_INSTALL_LIB_DIR\\}\\\")//" - ${CMAKE_SOURCE_DIR}/gdcm_src/Utilities/gdcmopenjpeg/CMakeLists.txt - RESULT_VARIABLE result - ) elseif(LINUX) set(CMAKE_INSTALL_RPATH "\$ORIGIN") endif() -add_subdirectory(gdcm_src) +add_subdirectory(gdcm_src) \ No newline at end of file