From 578e6468dd7e3ff603ebe0103d208317f54b1e73 Mon Sep 17 00:00:00 2001 From: Amanda Potts Date: Thu, 8 Feb 2024 14:38:10 -0500 Subject: [PATCH] Closes #2958 rename akstats to akscipy --- .../{akstats/akstats_test.py => akscipy/akscipy_test.py} | 0 .../tests/{akmath/akmath_tests.py => akscipy/math_tests.py} | 2 +- arkouda/__init__.py | 4 ++-- arkouda/{akstats => akscipy}/LICENSE.txt | 0 arkouda/{akstats => akscipy}/__init__.py | 0 arkouda/{akstats => akscipy}/_stats_py.py | 2 +- arkouda/{akstats => akscipy}/_stats_py.pyi | 0 arkouda/{akmath => akscipy/special}/__init__.py | 0 arkouda/{akmath => akscipy/special}/_math.py | 2 +- pytest.ini | 4 ++-- tests/{akstats/akstats_test.py => akscipy/akscipy_test.py} | 4 ++-- tests/{akmath/akmath_test.py => akscipy/math_test.py} | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) rename PROTO_tests/tests/{akstats/akstats_test.py => akscipy/akscipy_test.py} (100%) rename PROTO_tests/tests/{akmath/akmath_tests.py => akscipy/math_tests.py} (94%) rename arkouda/{akstats => akscipy}/LICENSE.txt (100%) rename arkouda/{akstats => akscipy}/__init__.py (100%) rename arkouda/{akstats => akscipy}/_stats_py.py (99%) rename arkouda/{akstats => akscipy}/_stats_py.pyi (100%) rename arkouda/{akmath => akscipy/special}/__init__.py (100%) rename arkouda/{akmath => akscipy/special}/_math.py (96%) rename tests/{akstats/akstats_test.py => akscipy/akscipy_test.py} (94%) rename tests/{akmath/akmath_test.py => akscipy/math_test.py} (95%) diff --git a/PROTO_tests/tests/akstats/akstats_test.py b/PROTO_tests/tests/akscipy/akscipy_test.py similarity index 100% rename from PROTO_tests/tests/akstats/akstats_test.py rename to PROTO_tests/tests/akscipy/akscipy_test.py diff --git a/PROTO_tests/tests/akmath/akmath_tests.py b/PROTO_tests/tests/akscipy/math_tests.py similarity index 94% rename from PROTO_tests/tests/akmath/akmath_tests.py rename to PROTO_tests/tests/akscipy/math_tests.py index 8737ea559a..8ca39886f5 100644 --- a/PROTO_tests/tests/akmath/akmath_tests.py +++ b/PROTO_tests/tests/akscipy/math_tests.py @@ -3,8 +3,8 @@ import numpy as np import arkouda as ak -from arkouda.akmath import xlogy from arkouda.pdarrayclass import pdarray +from arkouda.scipy.special import xlogy class TestStats: diff --git a/arkouda/__init__.py b/arkouda/__init__.py index 42ca2b3f16..5661ed292d 100644 --- a/arkouda/__init__.py +++ b/arkouda/__init__.py @@ -39,5 +39,5 @@ is_registered, broadcast_dims, ) -from arkouda.akmath import * -from arkouda.akstats import * +from arkouda.akscipy.special import * +from arkouda.akscipy import * diff --git a/arkouda/akstats/LICENSE.txt b/arkouda/akscipy/LICENSE.txt similarity index 100% rename from arkouda/akstats/LICENSE.txt rename to arkouda/akscipy/LICENSE.txt diff --git a/arkouda/akstats/__init__.py b/arkouda/akscipy/__init__.py similarity index 100% rename from arkouda/akstats/__init__.py rename to arkouda/akscipy/__init__.py diff --git a/arkouda/akstats/_stats_py.py b/arkouda/akscipy/_stats_py.py similarity index 99% rename from arkouda/akstats/_stats_py.py rename to arkouda/akscipy/_stats_py.py index 1077d5b3ea..772f51569f 100644 --- a/arkouda/akstats/_stats_py.py +++ b/arkouda/akscipy/_stats_py.py @@ -5,7 +5,7 @@ from scipy.stats import chi2 import arkouda as ak -from arkouda.akmath import xlogy +from arkouda.akscipy.special import xlogy from arkouda.dtypes import float64 as akfloat64 __all__ = ["power_divergence", "chisquare", "Power_divergenceResult"] diff --git a/arkouda/akstats/_stats_py.pyi b/arkouda/akscipy/_stats_py.pyi similarity index 100% rename from arkouda/akstats/_stats_py.pyi rename to arkouda/akscipy/_stats_py.pyi diff --git a/arkouda/akmath/__init__.py b/arkouda/akscipy/special/__init__.py similarity index 100% rename from arkouda/akmath/__init__.py rename to arkouda/akscipy/special/__init__.py diff --git a/arkouda/akmath/_math.py b/arkouda/akscipy/special/_math.py similarity index 96% rename from arkouda/akmath/_math.py rename to arkouda/akscipy/special/_math.py index 63f121762c..0f48dbedbe 100644 --- a/arkouda/akmath/_math.py +++ b/arkouda/akscipy/special/_math.py @@ -26,7 +26,7 @@ def xlogy(x: Union[pdarray, np.float64], y: pdarray): >>> import arkouda as ak >>> ak.connect() - >>> from arkouda.akmath import xlogy + >>> from arkouda.akscipy.special import xlogy >>> xlogy( ak.array([1, 2, 3, 4]), ak.array([5,6,7,8])) array([1.6094379124341003 3.5835189384561099 5.8377304471659395 8.317766166719343]) >>> xlogy( 5.0, ak.array([1, 2, 3, 4])) diff --git a/pytest.ini b/pytest.ini index 241d0d8c0e..469ebd671d 100644 --- a/pytest.ini +++ b/pytest.ini @@ -2,8 +2,8 @@ filterwarnings = ignore:Version mismatch between client .* testpaths = - tests/akmath/akmath_test.py - tests/akstats/akstats_test.py + tests/akscipy/math_test.py + tests/akscipy/akscipy_test.py tests/alignment_tests.py tests/array_view_test.py tests/bitops_test.py diff --git a/tests/akstats/akstats_test.py b/tests/akscipy/akscipy_test.py similarity index 94% rename from tests/akstats/akstats_test.py rename to tests/akscipy/akscipy_test.py index 93982c4a50..5db90fd583 100644 --- a/tests/akstats/akstats_test.py +++ b/tests/akscipy/akscipy_test.py @@ -23,7 +23,7 @@ def create_stat_test_pairs(self): def test_power_divergence(self): from scipy.stats import power_divergence as scipy_power_divergence - from arkouda.akstats import power_divergence as ak_power_divergence + from arkouda.akscipy import power_divergence as ak_power_divergence pairs = self.create_stat_test_pairs() @@ -57,7 +57,7 @@ def test_power_divergence(self): def test_chisquare(self): from scipy.stats import chisquare as scipy_chisquare - from arkouda.akstats import chisquare as ak_chisquare + from arkouda.akscipy import chisquare as ak_chisquare pairs = self.create_stat_test_pairs() diff --git a/tests/akmath/akmath_test.py b/tests/akscipy/math_test.py similarity index 95% rename from tests/akmath/akmath_test.py rename to tests/akscipy/math_test.py index 89c60f925d..424f8295fa 100644 --- a/tests/akmath/akmath_test.py +++ b/tests/akscipy/math_test.py @@ -2,7 +2,7 @@ from base_test import ArkoudaTest from context import arkouda as ak -from arkouda.akmath import xlogy +from arkouda.akscipy.special import xlogy from arkouda.pdarrayclass import pdarray