From 7a48bd34014aff3a11b6377bb06e357980004fb3 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 12 May 2025 14:29:42 +0100 Subject: [PATCH 1/2] Drop a NumPy version pin that should no longer be necessary --- setup.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 065f3847..2c6a9965 100644 --- a/setup.py +++ b/setup.py @@ -313,14 +313,12 @@ def get_long_description(): "traitsui", ], "h5": [ - # PyTables is currently incompatible with NumPy 2.0 - # xref: enthought/apptools#345 - "numpy < 2.0", + "numpy", "pandas", "tables", ], "persistence": [ - "numpy < 2.0", + "numpy", ], "preferences": [ "configobj", From 90a94559fd400e5dafb243fcc029966faf23b01e Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 12 May 2025 14:34:31 +0100 Subject: [PATCH 2/2] Restore the pin, but only for Python < 3.10 --- setup.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 2c6a9965..629d54ed 100644 --- a/setup.py +++ b/setup.py @@ -313,12 +313,17 @@ def get_long_description(): "traitsui", ], "h5": [ - "numpy", + # For Python earlier than 3.10, the most recent version of + # PyTables is incompatible with NumPy 2.x. + # xref: https://github.com/enthought/apptools/issues/345 + "numpy < 2.0; python_version<'3.10'", + "numpy; python_version>='3.10'", "pandas", "tables", ], "persistence": [ - "numpy", + "numpy < 2.0; python_version<'3.10'", + "numpy; python_version>='3.10'", ], "preferences": [ "configobj",