diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index d0f8fa7..997fba8 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -6,6 +6,11 @@ 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: @@ -190,7 +195,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 @@ -205,7 +210,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 @@ -220,7 +225,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 @@ -228,15 +233,21 @@ 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 + 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: 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 @@ -251,7 +262,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 @@ -307,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/CMakeLists.txt b/CMakeLists.txt index f19b999..8518871 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,4 +63,4 @@ elseif(LINUX) endif() -add_subdirectory(gdcm_src) +add_subdirectory(gdcm_src) \ No newline at end of file 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 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" }, ]