From 770a7cd6a6f0c92a19d53ee333c85d03f5787bc4 Mon Sep 17 00:00:00 2001 From: Anatoly Myachev Date: Wed, 5 Jun 2024 13:01:03 +0200 Subject: [PATCH] TEST-#0000: Test numpy>=2.0.0rc1 in CI Signed-off-by: Anatoly Myachev --- environment-dev.yml | 2 +- modin/numpy/__init__.py | 18 +---------------- modin/numpy/constants.py | 27 +------------------------ requirements-dev.txt | 2 +- requirements/env_unidist_linux.yml | 2 +- requirements/env_unidist_win.yml | 2 +- requirements/requirements-no-engine.yml | 2 +- setup.py | 2 +- 8 files changed, 8 insertions(+), 49 deletions(-) diff --git a/environment-dev.yml b/environment-dev.yml index 3ea51032bde..a9c65b75e8b 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -6,7 +6,7 @@ dependencies: # required dependencies - pandas>=2.2,<2.3 - - numpy>=1.22.4 + - numpy>=2.0.0rc1 - fsspec>=2022.11.0 - packaging>=21.0 - psutil>=5.8.0 diff --git a/modin/numpy/__init__.py b/modin/numpy/__init__.py index 765fc615786..07af16f6ed2 100644 --- a/modin/numpy/__init__.py +++ b/modin/numpy/__init__.py @@ -15,23 +15,7 @@ from .arr import array from .array_creation import ones_like, tri, zeros_like from .array_shaping import append, hstack, ravel, shape, split, transpose -from .constants import ( - NAN, - NINF, - NZERO, - PINF, - PZERO, - Inf, - Infinity, - NaN, - e, - euler_gamma, - inf, - infty, - nan, - newaxis, - pi, -) +from .constants import e, euler_gamma, inf, nan, newaxis, pi from .logic import ( all, any, diff --git a/modin/numpy/constants.py b/modin/numpy/constants.py index 6070901e5f6..c2feaa26f6a 100644 --- a/modin/numpy/constants.py +++ b/modin/numpy/constants.py @@ -12,37 +12,12 @@ # governing permissions and limitations under the License. # flake8: noqa -from numpy import ( - NAN, - NINF, - NZERO, - PINF, - PZERO, - Inf, - Infinity, - NaN, - e, - euler_gamma, - inf, - infty, - nan, - newaxis, - pi, -) +from numpy import e, euler_gamma, inf, nan, newaxis, pi __all__ = [ - "Inf", - "Infinity", - "NAN", - "NINF", - "NZERO", - "NaN", - "PINF", - "PZERO", "e", "euler_gamma", "inf", - "infty", "nan", "newaxis", "pi", diff --git a/requirements-dev.txt b/requirements-dev.txt index 16abb6bea19..1e00989ac0a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,6 @@ ## required dependencies pandas>=2.2,<2.3 -numpy>=1.22.4 +numpy>=2.0.0rc1 fsspec>=2022.11.0 packaging>=21.0 psutil>=5.8.0 diff --git a/requirements/env_unidist_linux.yml b/requirements/env_unidist_linux.yml index 155d88937e2..9ee532770fb 100644 --- a/requirements/env_unidist_linux.yml +++ b/requirements/env_unidist_linux.yml @@ -6,7 +6,7 @@ dependencies: # required dependencies - pandas>=2.2,<2.3 - - numpy>=1.22.4 + - numpy>=2.0.0rc1 - unidist-mpi>=0.2.1 - mpich - fsspec>=2022.11.0 diff --git a/requirements/env_unidist_win.yml b/requirements/env_unidist_win.yml index f4028288fb3..3baf1fb8f74 100644 --- a/requirements/env_unidist_win.yml +++ b/requirements/env_unidist_win.yml @@ -6,7 +6,7 @@ dependencies: # required dependencies - pandas>=2.2,<2.3 - - numpy>=1.22.4 + - numpy>=2.0.0rc1 - unidist-mpi>=0.2.1 - msmpi - fsspec>=2022.11.0 diff --git a/requirements/requirements-no-engine.yml b/requirements/requirements-no-engine.yml index 8c2ed06091d..d472b48e23e 100644 --- a/requirements/requirements-no-engine.yml +++ b/requirements/requirements-no-engine.yml @@ -5,7 +5,7 @@ dependencies: # required dependencies - pandas>=2.2,<2.3 - - numpy>=1.22.4 + - numpy>=2.0.0rc1 - fsspec>=2022.11.0 - packaging>=21.0 - psutil>=5.8.0 diff --git a/setup.py b/setup.py index 6134f0ec6fc..b2dd65dfb15 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ def make_distribution(self): install_requires=[ "pandas>=2.2,<2.3", "packaging>=21.0", - "numpy>=1.22.4", + "numpy>=2.0.0rc1", "fsspec>=2022.11.0", "psutil>=5.8.0", ],