Skip to content

Commit 3b3dadc

Browse files
authored
GDCM 3.2.1 (#30)
* Testings * More testings * More testings * More testings * More testings * More testings * More testings * More testings * More testings * Testing 3.2.0 * windows 2019 -> 2022 * openssl ubunut * Updates * Updates * Updates * Updates * Updates * Updates
1 parent 3cfb24e commit 3b3dadc

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
lines changed

.github/workflows/wheels.yml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ jobs:
66
build_wheels:
77
name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform_id }}
88
runs-on: ${{ matrix.os }}
9+
env:
10+
# OpenSSL version control
11+
OPENSSL_VERSION: "openssl-3.5.2"
12+
# SWIG version control
13+
SWIG_VERSION: "4.3.1"
914
strategy:
1015
fail-fast: false
1116
matrix:
@@ -190,7 +195,7 @@ jobs:
190195
pushd c:/
191196
git clone https://github.com/openssl/openssl.git
192197
pushd openssl
193-
git checkout openssl-3.3.0
198+
git checkout ${{ env.OPENSSL_VERSION }}
194199
perl Configure no-shared no-tests VC-WIN64A
195200
nmake
196201
mkdir lib\VC
@@ -205,7 +210,7 @@ jobs:
205210
pushd c:\
206211
git clone https://github.com/openssl/openssl.git
207212
pushd openssl
208-
git checkout openssl-3.3.1
213+
git checkout ${{ env.OPENSSL_VERSION }}
209214
perl Configure no-shared no-tests VC-WIN32
210215
nmake
211216
mkdir lib\VC
@@ -220,23 +225,29 @@ jobs:
220225
pushd /tmp
221226
git clone https://github.com/openssl/openssl.git
222227
pushd openssl
223-
git checkout openssl-3.3.1
228+
git checkout ${{ env.OPENSSL_VERSION }}
224229
export MACOSX_DEPLOYMENT_TARGET="${{ matrix.macosx_deployment_target }}"
225230
./Configure --prefix=/usr/local/openssl no-tests darwin64-${{ matrix.arch }}-cc
226231
make
227232
sudo make install
228233
popd
229234
popd
230235
236+
- name: Install openssl ubuntu
237+
if: matrix.os == 'ubuntu-latest'
238+
run: |
239+
sudo apt-get update
240+
sudo apt-get install --yes libssl-dev
241+
231242
- name: Install cibuildwheel
232-
run: python -m pip install cibuildwheel==3.0.1
243+
run: python -m pip install cibuildwheel==3.1.4
233244

234245
- name: Build wheels
235246
# to supply options, put them in 'env', like:
236247
env:
237-
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
238-
CIBW_MANYLINUX_I686_IMAGE: manylinux2014
239-
CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
248+
# CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
249+
# CIBW_MANYLINUX_I686_IMAGE: manylinux_2_28
250+
# CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
240251
CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }}
241252
CIBW_ARCHS_LINUX: auto aarch64
242253

@@ -251,7 +262,7 @@ jobs:
251262
/opt/python/cp311-cp311/bin/python -m pip install ninja
252263
ln -s /opt/python/cp311-cp311/bin/ninja /usr/bin/ninja
253264
if [[ ! -e $(command -v swig) ]]; then
254-
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
265+
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
255266
mkdir /tmp/swig
256267
tar -xvzf /tmp/swig.tar.gz -C /tmp/swig --strip-components 1 &> /dev/null
257268
pushd /tmp/swig
@@ -307,7 +318,7 @@ jobs:
307318
- uses: actions/upload-artifact@v4
308319
with:
309320
path: ./dist/*.tar.gz
310-
name: artifact-${{ matrix.os }}-${{ matrix.platform_id }}-python-${{ matrix.python }}
321+
name: artifact-sdist
311322

312323
merge:
313324
runs-on: ubuntu-latest

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ elseif(LINUX)
6363
endif()
6464

6565

66-
add_subdirectory(gdcm_src)
66+
add_subdirectory(gdcm_src)

gdcm_src

Submodule gdcm_src updated 359 files

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ requires = [
1010

1111
[project]
1212
name = "python-gdcm"
13-
version = "3.0.26"
13+
version = "3.2.1"
1414
authors = [
1515
{ name = "Thiago Franco de Moraes", email = "[email protected]" },
1616
]

0 commit comments

Comments
 (0)