Skip to content

Commit 366ff8e

Browse files
committed
CI: Hack around h5py weirdness
1 parent 574846c commit 366ff8e

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

.github/workflows/pre-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ jobs:
4444
- python-version: '3.12'
4545
architecture: x86
4646

47+
env:
48+
DEPENDS: ${{ matrix.dependencies }}
49+
ARCH: ${{ matrix.architecture }}
50+
4751
steps:
4852
- uses: actions/checkout@v3
4953
with:
@@ -63,12 +67,8 @@ jobs:
6367
python -m pip install tox tox-gh-actions
6468
- name: Show tox config
6569
run: pipx run tox c
66-
env:
67-
DEPENDS: ${{ matrix.dependencies }}
6870
- name: Run tox
6971
run: tox
70-
env:
71-
DEPENDS: ${{ matrix.dependencies }}
7272
- uses: codecov/codecov-action@v3
7373
if: ${{ always() }}
7474
with:

.github/workflows/stable.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@ jobs:
135135
- python-version: '3.12'
136136
architecture: x86
137137

138+
env:
139+
DEPENDS: ${{ matrix.dependencies }}
140+
ARCH: ${{ ! contains(['none', 'min'], matrix.dependencies) && matrix.architecture }}
141+
138142
steps:
139143
- uses: actions/checkout@v3
140144
with:
@@ -154,12 +158,8 @@ jobs:
154158
python -m pip install tox tox-gh-actions
155159
- name: Show tox config
156160
run: pipx run tox c
157-
env:
158-
DEPENDS: ${{ matrix.dependencies }}
159161
- name: Run tox
160162
run: tox
161-
env:
162-
DEPENDS: ${{ matrix.dependencies }}
163163
- uses: codecov/codecov-action@v3
164164
if: ${{ always() }}
165165
with:

tox.ini

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ DEPENDS =
2525
full: full
2626
min: min
2727

28+
ARCH =
29+
x64: x64
30+
2831
CHECK =
2932
build: build
3033
doctest: doctest
@@ -63,7 +66,6 @@ deps =
6366
min: scipy ==1.6
6467
min: matplotlib ==3.4
6568
min: pillow ==8.1
66-
min: h5py ==2.10
6769
min: indexed_gzip ==1.4
6870
min: pyzstd ==0.14.3
6971
# Numpy 2.0 is a major breaking release; we cannot put much effort into
@@ -72,15 +74,19 @@ deps =
7274
full,pre: scipy >=1.6
7375
full,pre: matplotlib >=3.4
7476
full,pre: pillow >=8.1
75-
# Exception: h5py 3.0.0 dropped win32 wheels, so extend back a little further
76-
full: h5py >=2.10
77-
# h5py missing 3.12 wheels, so disable from pre for now
78-
# full,pre: h5py >=3.0
7977
full,pre: indexed_gzip >=1.4
8078
full,pre: pyzstd >=0.14.3
8179
min: pydicom ==2.1
8280
full,pre: pydicom >=2.1
81+
# pydicom master seems to be breaking things
8382
# pre: pydicom @ git+https://github.com/pydicom/pydicom.git@main
83+
# h5py is a pain. They dropped win32 wheels at 3.0, which only supports
84+
# thru py39. Add a special -x64 environment to limit tests to x64. We
85+
# will exclude this environment for none/min in GitHub actions.
86+
min: h5py ==2.10
87+
x64: h5py >=2.10
88+
# h5py missing 3.12 wheels, so disable from pre for now
89+
# pre: h5py >=2.10
8490

8591
commands =
8692
pytest --doctest-modules --doctest-plus \

0 commit comments

Comments
 (0)