From 848aca2a7bc9eb18a0bd1dacd93b3ad12b6b1731 Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Wed, 18 Oct 2023 10:27:58 -0400
Subject: [PATCH 1/2] MNT: Add py312-dev-x64 environment

---
 tox.ini | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tox.ini b/tox.ini
index dd8e1650b..bf3d4886d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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
@@ -34,6 +36,7 @@ python =
 DEPENDS =
   none: none, install
   pre: pre
+  dev: dev
   full: full, install
   min: min
 
@@ -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
@@ -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
@@ -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
 

From 98489b589cf01469227f3df607125da31fb3895b Mon Sep 17 00:00:00 2001
From: Eric Larson <larson.eric.d@gmail.com>
Date: Wed, 18 Oct 2023 11:01:07 -0400
Subject: [PATCH 2/2] CI: Test NumPy 2.0

---
 .github/workflows/test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9b12727bd..9c4f08eb3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -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