Skip to content

Commit 79c8b4b

Browse files
authored
Merge pull request #1267 from effigies/mnt/numpydev
MNT: Add py312-dev-x64 environment
2 parents e356408 + 98489b5 commit 79c8b4b

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@ jobs:
119119
- os: ubuntu-latest
120120
python-version: 3.8
121121
dependencies: 'min'
122+
# NumPy 2.0
123+
- os: ubuntu-latest
124+
python-version: '3.12'
125+
dependencies: 'dev'
122126
exclude:
123127
- os: ubuntu-latest
124128
architecture: x86

tox.ini

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ envlist =
1515
py3{9,10,11}-pre-{x86,x64}
1616
# x64-only range
1717
py312-{full,pre}-x64
18+
# Special environment for numpy 2.0-dev testing
19+
py312-dev-x64
1820
install
1921
doctest
2022
style
@@ -34,6 +36,7 @@ python =
3436
DEPENDS =
3537
none: none, install
3638
pre: pre
39+
dev: dev
3740
full: full, install
3841
min: min
3942

@@ -48,10 +51,10 @@ install_command =
4851
python -I -m pip install -v \
4952
x64: --only-binary numpy,scipy,h5py,pillow \
5053
x86: --only-binary numpy,scipy,h5py,pillow,matplotlib \
51-
pre: --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
54+
pre,dev: --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
5255
{opts} {packages}
5356
pip_pre =
54-
pre: true
57+
pre,dev: true
5558
pass_env =
5659
# getpass.getuser() sources for Windows:
5760
LOGNAME
@@ -78,6 +81,7 @@ deps =
7881
# Numpy 2.0 is a major breaking release; we cannot put much effort into
7982
# supporting until it's at least RC stable
8083
pre: numpy <2.0.dev0
84+
dev: numpy >=2.0.dev0
8185
# Scipy stopped producing win32 wheels at py310
8286
py3{8,9}-full-x86,x64: scipy >=1.6
8387
# Matplotlib depends on scipy, so cannot be built for py310 on x86
@@ -89,7 +93,7 @@ deps =
8993
py3{8,9,10,11}-{full,pre}: indexed_gzip >=1.4
9094
full,pre: pyzstd >=0.14.3
9195
min: pydicom ==2.1
92-
full,pre: pydicom >=2.1
96+
full,pre,dev: pydicom >=2.1
9397
# pydicom master seems to be breaking things
9498
# pre: pydicom @ git+https://github.com/pydicom/pydicom.git@main
9599

0 commit comments

Comments
 (0)