Closes Bears-R-Us#3669: Rename proto-tests and make commands (Bears-R…

…-Us#3670) This PR (closes Bears-R-Us#3669) renames proto-tests and make commands Co-authored-by: Tess Hayes <stress-tess@users.noreply.github.com>
ajpotts · Aug 15, 2024 · 19b4d7c · 19b4d7c
1 parent bff8ca5
commit 19b4d7c
Show file tree

Hide file tree

Showing 75 changed files with 262 additions and 268 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -59,7 +59,7 @@ jobs:
         run: |
           flake8 arkouda          
 
-  arkouda_proto_python_portability:
+  arkouda_python_portability:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
@@ -92,9 +92,9 @@ jobs:
         python3 -m pip install -e .[dev]
     - name: Arkouda unit tests
       run: |
-        make test-python-proto size=100
+        make test-python size=100
 
-  arkouda_proto_chpl_portability:
+  arkouda_chpl_portability:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -123,9 +123,9 @@ jobs:
         python3 -m pip install -e .[dev]
     - name: Arkouda unit tests
       run: |
-        make test-python-proto size=100
+        make test-python size=100
 
-  arkouda_proto_multi-dim:
+  arkouda_multi-dim:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -158,9 +158,9 @@ jobs:
         python3 -m pip install -e .[dev]
     - name: Arkouda unit tests
       run: |
-        make test-python-proto size=100
+        make test-python size=100
 
-  arkouda_proto_tests_linux:
+  arkouda_tests_linux:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -198,7 +198,7 @@ jobs:
       env:
         ARKOUDA_PYTEST_OPTIONS: "--durations=0 --durations-min=5.0"
       run: |
-        make test-python-proto size=100
+        make test-python size=100
     - name: Arkouda benchmark --correctness-only
       if: matrix.image != 'chapel-gasnet-smp'
       run: |

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -105,7 +105,6 @@ If adding a new feature, add a test to make sure it behaves properly.
 Things to note:
 - If you make a new test, be sure to include `test_` at the beginning. Otherwise `pytest` will not run it.
 - If you make a new file of tests, be sure to include the file in `pytest.ini`, so it will be run during a `make test`.
-- If you make a new file of PROTO_tests, be sure to also include the file in `pytest_PROTO.ini`, so it will be run during a `make test-proto size=<size>`.
 
 See our wiki for more info on how to run our tests and create your own:
 https://github.com/Bears-R-Us/arkouda/wiki/Unit-Testing
@@ -116,9 +115,6 @@ https://github.com/Bears-R-Us/arkouda/wiki/Unit-Testing
 # Run all tests in pytest.ini
 make test
 
-# Run all tests in pytest_PROTO.ini
-make test-proto size=<size>
-
 # Run all tests in the CategoricalTest class (-v will print out the test name)
 python3 -m pytest tests/categorical_test.py::CategoricalTest -v
 
@@ -137,7 +133,6 @@ python3 server_util/test/parallel_start_test.py -d test
 Before posting a pull request, be sure to test locally to catch common CI failures early.
 This usually includes running:
 - `make test`
-- `make test-proto size=<size>`
 - `make mypy`
 - `flake8 arkouda`
 

diff --git a/Makefile b/Makefile
@@ -532,15 +532,15 @@ define TEST_HELP_TEXT
 endef
 $(eval $(call create_help_target,test-help,TEST_HELP_TEXT))
 
-.PHONY: test-proto
-test-proto: test-python-proto
+.PHONY: test
+test: test-python
 
 .PHONY: test-chapel
 test-chapel:
 	start_test $(TEST_SOURCE_DIR)
 
 .PHONY: test-all
-test-all: test-python-proto test-chapel
+test-all: test-python test-chapel
 
 mypy:
 	python3 -m mypy arkouda
@@ -556,7 +556,7 @@ print-%:
 	$(info $($*)) @trues
 
 size=100
-test-python-proto:
+test-python:
 	python3 -m pytest -c pytest.ini --size=$(size) $(ARKOUDA_PYTEST_OPTIONS)
 
 CLEAN_TARGETS += test-clean

diff --git a/PROTO_tests/conftest.py b/PROTO_tests/conftest.py
diff --git a/PROTO_tests/tests/saved_seeded_random/fourth_order_LOCALE0000.pq b/PROTO_tests/tests/saved_seeded_random/fourth_order_LOCALE0000.pq
diff --git a/PROTO_tests/tests/saved_seeded_random/fourth_order_LOCALE0001.pq b/PROTO_tests/tests/saved_seeded_random/fourth_order_LOCALE0001.pq
diff --git a/PROTO_tests/tests/saved_seeded_random/second_order_LOCALE0000.pq b/PROTO_tests/tests/saved_seeded_random/second_order_LOCALE0000.pq
diff --git a/PROTO_tests/tests/saved_seeded_random/second_order_LOCALE0001.pq b/PROTO_tests/tests/saved_seeded_random/second_order_LOCALE0001.pq
diff --git a/PROTO_tests/tests/saved_seeded_random/third_order_LOCALE0000.pq b/PROTO_tests/tests/saved_seeded_random/third_order_LOCALE0000.pq
diff --git a/PROTO_tests/tests/saved_seeded_random/third_order_LOCALE0001.pq b/PROTO_tests/tests/saved_seeded_random/third_order_LOCALE0001.pq
diff --git a/README.md b/README.md
@@ -222,7 +222,7 @@ This will start the server, run a few computations, and shut the server down. In
 against a running server by running the following Python command:
 
 ```bash
-python3 PROTO_tests/tests/check.py localhost 5555
+python3 tests/check.py localhost 5555
 ```
 
 <a id="run-ak-token-auth"></a>

diff --git a/pydoc/quickstart.rst b/pydoc/quickstart.rst
@@ -53,7 +53,7 @@ Install Arkouda
 
    .. substitution-code-block:: bash
 
-       make test-proto
+       make test
 
 **********************
 Launching the Server

diff --git a/pytest.ini b/pytest.ini
@@ -2,54 +2,53 @@
 filterwarnings =
     ignore:Version mismatch between client .*
 testpaths =
-    PROTO_tests/tests/alignment_test.py
-    PROTO_tests/tests/array_view_test.py
-    PROTO_tests/tests/bigint_agg_test.py
-    PROTO_tests/tests/bitops_test.py
-    PROTO_tests/tests/categorical_test.py
-    PROTO_tests/tests/check.py
-    PROTO_tests/tests/client_dtypes_test.py
-    PROTO_tests/tests/client_test.py
-    PROTO_tests/tests/coargsort_test.py
-    PROTO_tests/tests/compare_test.py
-    PROTO_tests/tests/dataframe_test.py
-    PROTO_tests/tests/datetime_test.py
-    PROTO_tests/tests/dtypes_test.py
-    PROTO_tests/tests/extrema_test.py
-    PROTO_tests/tests/groupby_test.py
-    PROTO_tests/tests/indexing_test.py
-    PROTO_tests/tests/index_test.py
-    PROTO_tests/tests/io_test.py
-    PROTO_tests/tests/io_util_test.py
-    PROTO_tests/tests/join_test.py
-    PROTO_tests/tests/logger_test.py
-    PROTO_tests/tests/message_test.py
-    PROTO_tests/tests/numeric_test.py
-    PROTO_tests/tests/numpy/numpy_numeric_test.py
-    PROTO_tests/tests/numpy/numpy_test.py
-    PROTO_tests/tests/operator_test.py
-    PROTO_tests/tests/pdarray_creation_test.py
-    PROTO_tests/tests/random_test.py
-    PROTO_tests/tests/regex_test.py
-    PROTO_tests/tests/scipy/scipy_test.py
-    PROTO_tests/tests/security_test.py
-    PROTO_tests/tests/segarray_test.py
-    PROTO_tests/tests/series_test.py
-    PROTO_tests/tests/setops_test.py
-    PROTO_tests/tests/sort_test.py
-    PROTO_tests/tests/stats_test.py
-    PROTO_tests/tests/string_test.py
-    PROTO_tests/tests/symbol_table_test.py
-    PROTO_tests/tests/testing/asserters_test.py
-    PROTO_tests/tests/util_test.py
-    PROTO_tests/tests/where_test.py
+    tests/alignment_test.py
+    tests/array_view_test.py
+    tests/bigint_agg_test.py
+    tests/bitops_test.py
+    tests/categorical_test.py
+    tests/check.py
+    tests/client_dtypes_test.py
+    tests/client_test.py
+    tests/coargsort_test.py
+    tests/compare_test.py
+    tests/dataframe_test.py
+    tests/datetime_test.py
+    tests/dtypes_test.py
+    tests/extrema_test.py
+    tests/groupby_test.py
+    tests/indexing_test.py
+    tests/index_test.py
+    tests/io_test.py
+    tests/io_util_test.py
+    tests/join_test.py
+    tests/logger_test.py
+    tests/message_test.py
+    tests/numeric_test.py
+    tests/numpy/numpy_numeric_test.py
+    tests/numpy/numpy_test.py
+    tests/operator_test.py
+    tests/pdarray_creation_test.py
+    tests/random_test.py
+    tests/regex_test.py
+    tests/scipy/scipy_test.py
+    tests/security_test.py
+    tests/segarray_test.py
+    tests/series_test.py
+    tests/setops_test.py
+    tests/sort_test.py
+    tests/stats_test.py
+    tests/string_test.py
+    tests/symbol_table_test.py
+    tests/testing/asserters_test.py
+    tests/util_test.py
+    tests/where_test.py
 norecursedirs =
     .git
     dist
     build
     *egg*
-    tests/deprecated/*
-    OLD_tests
+    tests/deprecated
     benchmark*
 python_functions =
     test_*

diff --git a/server_util/test/checkInstall b/server_util/test/checkInstall
@@ -13,7 +13,7 @@ from server_test_util import *
 logging.basicConfig(level=logging.INFO)
 
 start_arkouda_server(get_arkouda_numlocales())
-ret = run_client_live(os.path.join(get_arkouda_home(), "PROTO_tests", "tests", "check.py"))
+ret = run_client_live(os.path.join(get_arkouda_home(), "tests", "check.py"))
 stop_arkouda_server()
 print("{} running checks".format("Error" if ret else "Success"))
 sys.exit(ret)
diff --git a/server_util/test/runClient b/server_util/test/runClient
@@ -6,7 +6,7 @@ does not shut down the server. Any unknown arguments are passed to the client
 script. Example usage:
 
 # run checks wih 2 locales for CHPL_COMM!=none, 1 otherwise
-./runClient PROTO_tests/tests/check.py
+./runClient tests/check.py
 
 # run stream with 4 locales, passing size to stream
 ./server_util/test/runClient ./benchmarks/stream.py -nl 4 --size=100

diff --git a/setup.cfg b/setup.cfg
@@ -12,5 +12,5 @@ profile = black
 max-line-length = 105
 extend-ignore = E203
 per-file-ignores =
-    PROTO_tests/tests/operator_test.py: E501
-    PROTO_tests/tests/symbol_table_test.py: F841
+    tests/operator_test.py: E501
+    tests/symbol_table_test.py: F841
diff --git a/PROTO_tests/tests/alignment_test.py → tests/alignment_test.py b/PROTO_tests/tests/alignment_test.py → tests/alignment_test.py
diff --git a/...O_tests/tests/array_api/array_creation.py → tests/array_api/array_creation.py b/...O_tests/tests/array_api/array_creation.py → tests/array_api/array_creation.py
diff --git a/...sts/tests/array_api/array_manipulation.py → tests/array_api/array_manipulation.py b/...sts/tests/array_api/array_manipulation.py → tests/array_api/array_manipulation.py
diff --git a/PROTO_tests/tests/array_api/binary_ops.py → tests/array_api/binary_ops.py b/PROTO_tests/tests/array_api/binary_ops.py → tests/array_api/binary_ops.py
diff --git a/PROTO_tests/tests/array_api/indexing.py → tests/array_api/indexing.py b/PROTO_tests/tests/array_api/indexing.py → tests/array_api/indexing.py
diff --git a/...ts/tests/array_api/searching_functions.py → tests/array_api/searching_functions.py b/...ts/tests/array_api/searching_functions.py → tests/array_api/searching_functions.py
diff --git a/PROTO_tests/tests/array_api/set_functions.py → tests/array_api/set_functions.py b/PROTO_tests/tests/array_api/set_functions.py → tests/array_api/set_functions.py
diff --git a/PROTO_tests/tests/array_api/sorting.py → tests/array_api/sorting.py b/PROTO_tests/tests/array_api/sorting.py → tests/array_api/sorting.py
diff --git a/..._tests/tests/array_api/stats_functions.py → tests/array_api/stats_functions.py b/..._tests/tests/array_api/stats_functions.py → tests/array_api/stats_functions.py
diff --git a/...O_tests/tests/array_api/util_functions.py → tests/array_api/util_functions.py b/...O_tests/tests/array_api/util_functions.py → tests/array_api/util_functions.py
diff --git a/...O_tests/tests/array_manipulation_tests.py → tests/array_manipulation_tests.py b/...O_tests/tests/array_manipulation_tests.py → tests/array_manipulation_tests.py
diff --git a/PROTO_tests/tests/array_view_test.py → tests/array_view_test.py b/PROTO_tests/tests/array_view_test.py → tests/array_view_test.py
diff --git a/PROTO_tests/tests/bigint_agg_test.py → tests/bigint_agg_test.py b/PROTO_tests/tests/bigint_agg_test.py → tests/bigint_agg_test.py
diff --git a/PROTO_tests/tests/bitops_test.py → tests/bitops_test.py b/PROTO_tests/tests/bitops_test.py → tests/bitops_test.py
diff --git a/PROTO_tests/tests/categorical_test.py → tests/categorical_test.py b/PROTO_tests/tests/categorical_test.py → tests/categorical_test.py
diff --git a/PROTO_tests/tests/check.py → tests/check.py b/PROTO_tests/tests/check.py → tests/check.py
diff --git a/PROTO_tests/tests/client_dtypes_test.py → tests/client_dtypes_test.py b/PROTO_tests/tests/client_dtypes_test.py → tests/client_dtypes_test.py
diff --git a/PROTO_tests/tests/client_test.py → tests/client_test.py b/PROTO_tests/tests/client_test.py → tests/client_test.py
diff --git a/PROTO_tests/tests/coargsort_test.py → tests/coargsort_test.py b/PROTO_tests/tests/coargsort_test.py → tests/coargsort_test.py
diff --git a/PROTO_tests/tests/compare_test.py → tests/compare_test.py b/PROTO_tests/tests/compare_test.py → tests/compare_test.py