From 3ec831ed4fd1288fcbbdfe25847e2cf9f5db237d Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Tue, 5 Mar 2024 08:03:51 -0600
Subject: [PATCH 1/4] Switch `pytest-xdist` algorithm to `worksteal`

---
 ci/test_python.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/test_python.sh b/ci/test_python.sh
index 912b2c520..a54003a36 100755
--- a/ci/test_python.sh
+++ b/ci/test_python.sh
@@ -50,7 +50,7 @@ pytest \
   --cache-clear \
   --junitxml="${RAPIDS_TESTS_DIR}/junit-cuspatial.xml" \
   --numprocesses=8 \
-  --dist=loadscope \
+  --dist=worksteal \
   --cov-config=../.coveragerc \
   --cov=cuspatial \
   --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cuspatial-coverage.xml" \
@@ -65,7 +65,7 @@ pytest \
   --cache-clear \
   --junitxml="${RAPIDS_TESTS_DIR}/junit-cuproj.xml" \
   --numprocesses=8 \
-  --dist=loadscope \
+  --dist=worksteal \
   --cov-config=../.coveragerc \
   --cov=cuproj \
   --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cuproj-coverage.xml" \

From 9b865189ed4c233360e5c1d78d0be58568f05b34 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Tue, 5 Mar 2024 08:25:41 -0600
Subject: [PATCH 2/4] Use pytest-xdist worksteal in wheel tests.

---
 ci/test_wheel_cuproj.sh    | 10 +++++++++-
 ci/test_wheel_cuspatial.sh | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ci/test_wheel_cuproj.sh b/ci/test_wheel_cuproj.sh
index e89d1c650..1a86450e1 100755
--- a/ci/test_wheel_cuproj.sh
+++ b/ci/test_wheel_cuproj.sh
@@ -22,5 +22,13 @@ python -m pip install $(echo ./dist/cuproj*.whl)[test]
 if [[ "$(arch)" == "aarch64" && ${RAPIDS_BUILD_TYPE} == "pull-request" ]]; then
     python ./ci/wheel_smoke_test_cuproj.py
 else
-    python -m pytest -n 8 ./python/cuproj/cuproj/tests
+    rapids-logger "pytest cuproj"
+    pushd python/cuproj/cuproj
+    python -m pytest \
+      --cache-clear \
+      --junitxml="${RAPIDS_TESTS_DIR}/junit-cuproj.xml" \
+      --numprocesses=8 \
+      --dist=worksteal \
+      tests
+    popd
 fi
diff --git a/ci/test_wheel_cuspatial.sh b/ci/test_wheel_cuspatial.sh
index 13f30de2c..ffd11e47d 100755
--- a/ci/test_wheel_cuspatial.sh
+++ b/ci/test_wheel_cuspatial.sh
@@ -18,5 +18,13 @@ python -m pip install $(echo ./dist/cuspatial*.whl)[test]
 if [[ "$(arch)" == "aarch64" && ${RAPIDS_BUILD_TYPE} == "pull-request" ]]; then
     python ./ci/wheel_smoke_test_cuspatial.py
 else
-    python -m pytest -n 8 ./python/cuspatial/cuspatial/tests
+    rapids-logger "pytest cuspatial"
+    pushd python/cuspatial/cuspatial
+    python -m pytest \
+      --cache-clear \
+      --junitxml="${RAPIDS_TESTS_DIR}/junit-cuproj.xml" \
+      --numprocesses=8 \
+      --dist=worksteal \
+      tests
+    popd
 fi

From 11f15fef564eeb7c757ec6a0dec18bf707c729f1 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Tue, 5 Mar 2024 08:29:29 -0600
Subject: [PATCH 3/4] Update ci/test_wheel_cuspatial.sh

---
 ci/test_wheel_cuspatial.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/test_wheel_cuspatial.sh b/ci/test_wheel_cuspatial.sh
index ffd11e47d..b18a8c7cc 100755
--- a/ci/test_wheel_cuspatial.sh
+++ b/ci/test_wheel_cuspatial.sh
@@ -22,7 +22,7 @@ else
     pushd python/cuspatial/cuspatial
     python -m pytest \
       --cache-clear \
-      --junitxml="${RAPIDS_TESTS_DIR}/junit-cuproj.xml" \
+      --junitxml="${RAPIDS_TESTS_DIR}/junit-cuspatial.xml" \
       --numprocesses=8 \
       --dist=worksteal \
       tests

From eadeaff156717b2fdc97bddde4eda01300e91b86 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Wed, 6 Mar 2024 06:03:05 -0800
Subject: [PATCH 4/4] Update copyrights.

---
 ci/test_python.sh          | 2 +-
 ci/test_wheel_cuproj.sh    | 2 +-
 ci/test_wheel_cuspatial.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/test_python.sh b/ci/test_python.sh
index a54003a36..1967a685c 100755
--- a/ci/test_python.sh
+++ b/ci/test_python.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, NVIDIA CORPORATION.
+# Copyright (c) 2022-2024, NVIDIA CORPORATION.
 
 set -euo pipefail
 
diff --git a/ci/test_wheel_cuproj.sh b/ci/test_wheel_cuproj.sh
index 1a86450e1..e6888134d 100755
--- a/ci/test_wheel_cuproj.sh
+++ b/ci/test_wheel_cuproj.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2023, NVIDIA CORPORATION.
+# Copyright (c) 2023-2024, NVIDIA CORPORATION.
 
 set -eou pipefail
 
diff --git a/ci/test_wheel_cuspatial.sh b/ci/test_wheel_cuspatial.sh
index b18a8c7cc..ff4a2405f 100755
--- a/ci/test_wheel_cuspatial.sh
+++ b/ci/test_wheel_cuspatial.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2023, NVIDIA CORPORATION.
+# Copyright (c) 2023-2024, NVIDIA CORPORATION.
 
 set -eou pipefail