Skip to content

Commit

Permalink
Merge branch 'master' into 3699-zeros-ones-full-to-return-Array
Browse files Browse the repository at this point in the history
  • Loading branch information
ajpotts authored Aug 28, 2024
2 parents 2da970b + 844ad2f commit 781866e
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 7 deletions.
15 changes: 15 additions & 0 deletions .configs/registration-config-single-dim.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"parameter_classes": {
"array": {
"nd": [1],
"dtype": [
"int",
"uint",
"uint(8)",
"real",
"bool",
"bigint"
]
}
}
}
2 changes: 1 addition & 1 deletion arkouda-env-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arkouda-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pydoc/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion pydoc/setup/REQUIREMENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/ArgSortMsg.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -461,4 +461,4 @@ module ArgSortMsg
use CommandMap;
registerFunction("argsortStrings", argsortStrings, getModuleName());
registerFunction("coargsort", coargsortMsg, getModuleName());
}
}
3 changes: 2 additions & 1 deletion tests/client_test.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/numeric_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 781866e

Please sign in to comment.