From d47c76d0bacb29f11e9687387a0b12570dfdc1e8 Mon Sep 17 00:00:00 2001 From: tess <48131946+stress-tess@users.noreply.github.com> Date: Wed, 28 Aug 2024 11:36:49 -0400 Subject: [PATCH 1/2] Closes #3703: Upper bound for python version (#3707) This PR (Closes #3703) makes `3.12.3` the upper bound for python version because greater than this causes `ForwardRef` type errors. These will be worked in #3346. I also added a single dim registration file to `.configs` to make switching between states easier Co-authored-by: Tess Hayes --- .configs/registration-config-single-dim.json | 15 +++++++++++++++ arkouda-env-dev.yml | 2 +- arkouda-env.yml | 2 +- pydoc/requirements.txt | 2 +- pydoc/setup/REQUIREMENTS.md | 2 +- setup.py | 2 +- src/ArgSortMsg.chpl | 2 +- 7 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 .configs/registration-config-single-dim.json diff --git a/.configs/registration-config-single-dim.json b/.configs/registration-config-single-dim.json new file mode 100644 index 0000000000..44afced3bf --- /dev/null +++ b/.configs/registration-config-single-dim.json @@ -0,0 +1,15 @@ +{ + "parameter_classes": { + "array": { + "nd": [1], + "dtype": [ + "int", + "uint", + "uint(8)", + "real", + "bool", + "bigint" + ] + } + } +} diff --git a/arkouda-env-dev.yml b/arkouda-env-dev.yml index 530271efe8..f9b5fd88d4 100644 --- a/arkouda-env-dev.yml +++ b/arkouda-env-dev.yml @@ -3,7 +3,7 @@ channels: - conda-forge - defaults dependencies: - - python>=3.9,!=3.12.4 # minimum 3.9 + - python>=3.9,<3.12.4 # minimum 3.9 - numpy>=1.24.1,<2.0 - pandas>=1.4.0,!=2.2.0 - pyzmq>=20.0.0 diff --git a/arkouda-env.yml b/arkouda-env.yml index 62ee2afffd..4905242337 100644 --- a/arkouda-env.yml +++ b/arkouda-env.yml @@ -3,7 +3,7 @@ channels: - conda-forge - defaults dependencies: - - python>=3.9,!=3.12.4 # minimum 3.9 + - python>=3.9,<3.12.4 # minimum 3.9 - numpy>=1.24.1,<2.0 - pandas>=1.4.0,!=2.2.0 - pyzmq>=20.0.0 diff --git a/pydoc/requirements.txt b/pydoc/requirements.txt index 80589acc49..824275fadf 100644 --- a/pydoc/requirements.txt +++ b/pydoc/requirements.txt @@ -1,5 +1,5 @@ # dependencies -python>=3.9,!=3.12.4 +python>=3.9,<3.12.4 numpy>=1.24.1,<2.0 pandas>=1.4.0,!=2.2.0 pyzmq>=20.0.0 diff --git a/pydoc/setup/REQUIREMENTS.md b/pydoc/setup/REQUIREMENTS.md index 35a166062b..f23adbd7b6 100644 --- a/pydoc/setup/REQUIREMENTS.md +++ b/pydoc/setup/REQUIREMENTS.md @@ -17,7 +17,7 @@ The installation instructions for the dependencies listed here may vary dependin The following python packages are required by the Arkouda client package. -- `python>=3.9,!=3.12.4` +- `python>=3.9,<3.12.4` - `numpy>=1.24.1,<2.0` - `pandas>=1.4.0,!=2.2.0` - `pyzmq>=20.0.0` diff --git a/setup.py b/setup.py index 6275bf6dc1..469612e5ff 100644 --- a/setup.py +++ b/setup.py @@ -107,7 +107,7 @@ # and refuse to install the project if the version does not match. If you # do not support Python 2, you can simplify this to '>=3.5' or similar, see # https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires - python_requires=">=3.9,!=3.12.4", + python_requires=">=3.9,<3.12.4", # This field lists other packages that your project depends on to run. # Any package you put here will be installed by pip when your project is # installed, so they must be valid existing projects. diff --git a/src/ArgSortMsg.chpl b/src/ArgSortMsg.chpl index d952fd54e6..12cd06ab61 100644 --- a/src/ArgSortMsg.chpl +++ b/src/ArgSortMsg.chpl @@ -461,4 +461,4 @@ module ArgSortMsg use CommandMap; registerFunction("argsortStrings", argsortStrings, getModuleName()); registerFunction("coargsort", coargsortMsg, getModuleName()); -} \ No newline at end of file +} From 844ad2fd73cd49a93ed5057f2ef5f5e7df061d8a Mon Sep 17 00:00:00 2001 From: ajpotts Date: Wed, 28 Aug 2024 11:55:13 -0400 Subject: [PATCH 2/2] Closes #3705: Add annotations to skip tests based on rank. (#3706) Co-authored-by: Amanda Potts Co-authored-by: drculhane --- tests/client_test.py | 3 ++- tests/numeric_test.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/client_test.py b/tests/client_test.py index 4d40977a1c..4571436a0d 100644 --- a/tests/client_test.py +++ b/tests/client_test.py @@ -1,7 +1,7 @@ import pytest import arkouda as ak -from arkouda.client import generic_msg +from arkouda.client import generic_msg, get_max_array_rank from server_util.test.server_test_util import TestRunningMode, start_arkouda_server @@ -156,6 +156,7 @@ def test_client_get_server_commands(self): for cmd in ["connect", "info", "str"]: assert cmd in cmds + @pytest.mark.skip_if_max_rank_greater_than(9) def test_client_array_dim_cmd_error(self): """ Tests that a user will get a helpful error message if they attempt to diff --git a/tests/numeric_test.py b/tests/numeric_test.py index 73dd3db837..cdbbf54cda 100644 --- a/tests/numeric_test.py +++ b/tests/numeric_test.py @@ -287,6 +287,7 @@ def test_histogram(self, num_type): host = subprocess.check_output("hostname").decode("utf-8").strip() @pytest.mark.skipif(host == "horizon", reason="Fails on horizon") + @pytest.mark.skip_if_max_rank_less_than(2) def test_histogram_multidim(self): # test 2d histogram seed = 1