Skip to content

Commit

Permalink
Merge pull request #1267 from effigies/mnt/numpydev
Browse files Browse the repository at this point in the history
MNT: Add py312-dev-x64 environment
  • Loading branch information
effigies authored Oct 18, 2023
2 parents e356408 + 98489b5 commit 79c8b4b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ jobs:
- os: ubuntu-latest
python-version: 3.8
dependencies: 'min'
# NumPy 2.0
- os: ubuntu-latest
python-version: '3.12'
dependencies: 'dev'
exclude:
- os: ubuntu-latest
architecture: x86
Expand Down
10 changes: 7 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ envlist =
py3{9,10,11}-pre-{x86,x64}
# x64-only range
py312-{full,pre}-x64
# Special environment for numpy 2.0-dev testing
py312-dev-x64
install
doctest
style
Expand All @@ -34,6 +36,7 @@ python =
DEPENDS =
none: none, install
pre: pre
dev: dev
full: full, install
min: min

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

Expand Down

0 comments on commit 79c8b4b

Please sign in to comment.