Skip to content

Commit 0bafef6

Browse files
authored
Fixes for wheel building (#50)
1 parent 045ea93 commit 0bafef6

File tree

6 files changed

+191
-196
lines changed

6 files changed

+191
-196
lines changed

.github/workflows/release-wheels.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: release-deploy
33
on:
44
release:
55
types: [ published ]
6+
# push:
7+
# branches: [ main ]
8+
# pull_request:
69

710
jobs:
811
build-sdist:
@@ -17,12 +20,13 @@ jobs:
1720
- uses: actions/setup-python@v4
1821
name: Install Python
1922
with:
20-
python-version: '3.11'
23+
python-version: '3.10'
2124

2225
- name: Build sdist
2326
run: |
24-
python -m pip install .
25-
python setup.py sdist
27+
python -m pip install -U pip
28+
python -m pip install poetry
29+
poetry build -f sdist
2630
2731
- name: Store artifacts
2832
uses: actions/upload-artifact@v3
@@ -55,9 +59,6 @@ jobs:
5559
platform_id: win32
5660

5761
# Windows 64 bit
58-
- os: windows-latest
59-
python: 37
60-
platform_id: win_amd64
6162
- os: windows-latest
6263
python: 38
6364
platform_id: win_amd64
@@ -166,7 +167,7 @@ jobs:
166167
- name: Install cibuildwheel
167168
run: |
168169
python -m pip install -U pip
169-
python -m pip install cibuildwheel==2.12.0
170+
python -m pip install cibuildwheel>=2.16
170171
171172
- name: Build wheels
172173
env:
@@ -209,6 +210,7 @@ jobs:
209210
path: dist/
210211

211212
- name: Install from package wheels and test
213+
# If testing wheel builds might need --pre to install dev version
212214
run: |
213215
python -m venv testwhl
214216
source testwhl/bin/activate
@@ -217,8 +219,8 @@ jobs:
217219
python -m pip uninstall -y pylibjpeg-libjpeg
218220
python -m pip uninstall -y pylibjpeg-openjpeg
219221
python -m pip install git+https://github.com/pydicom/pylibjpeg-data
220-
python -m pip install -U --find-links dist/ pylibjpeg-libjpeg
221-
python -c "import pytest; pytest.main(['--pyargs', 'libjpeg.tests'])"
222+
python -m pip install -U --pre --find-links dist/ pylibjpeg-libjpeg
223+
python -m pytest --pyargs libjpeg.tests
222224
deactivate
223225
224226
- name: Install from package tarball and test
@@ -230,8 +232,8 @@ jobs:
230232
python -m pip uninstall -y pylibjpeg-libjpeg
231233
python -m pip uninstall -y pylibjpeg-openjpeg
232234
python -m pip install git+https://github.com/pydicom/pylibjpeg-data
233-
python -m pip install -U dist/pylibjpeg-libjpeg-*.tar.gz
234-
python -c "import pytest; pytest.main(['--pyargs', 'libjpeg.tests'])"
235+
python -m pip install -U dist/pylibjpeg*libjpeg-*.tar.gz
236+
python -m pytest --pyargs libjpeg.tests
235237
deactivate
236238
237239
# The pypi upload fails with non-linux containers, so grab the uploaded

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ __pycache__/
44
*$py.class
55

66
# C extensions
7-
*.so
7+
#*.so
88

99
# Distribution / packaging
1010
.Python

0 commit comments

Comments
 (0)