From 84e3eb1e46dbfc120f705ba5b9ca2139b9cb4f78 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Tue, 2 Apr 2024 14:39:28 -0700 Subject: [PATCH 1/2] Enable tests/windows/ in cudf.pandas tests --- python/cudf/cudf/pandas/scripts/run-pandas-tests.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/cudf/cudf/pandas/scripts/run-pandas-tests.sh b/python/cudf/cudf/pandas/scripts/run-pandas-tests.sh index 06df7b36f7d..cb2fdf976f3 100755 --- a/python/cudf/cudf/pandas/scripts/run-pandas-tests.sh +++ b/python/cudf/cudf/pandas/scripts/run-pandas-tests.sh @@ -23,11 +23,12 @@ set -euo pipefail PANDAS_VERSION=$(python -c "import pandas; print(pandas.__version__)") PYTEST_IGNORES="--ignore=tests/io/test_user_agent.py \ +<<<<<<< Updated upstream --ignore=tests/interchange/test_impl.py \ --ignore=tests/window/test_dtypes.py \ +======= +>>>>>>> Stashed changes --ignore=tests/strings/test_api.py \ ---ignore=tests/window/test_numba.py \ ---ignore=tests/window \ --ignore=tests/io/pytables \ --ignore=tests/plotting \ --ignore=tests/scalar \ From 4dc9a1a4d826b0cdef602be9c8cbff977b0bf5bd Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Tue, 2 Apr 2024 14:40:10 -0700 Subject: [PATCH 2/2] Undo git diff --- python/cudf/cudf/pandas/scripts/run-pandas-tests.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/python/cudf/cudf/pandas/scripts/run-pandas-tests.sh b/python/cudf/cudf/pandas/scripts/run-pandas-tests.sh index cb2fdf976f3..c664fa36670 100755 --- a/python/cudf/cudf/pandas/scripts/run-pandas-tests.sh +++ b/python/cudf/cudf/pandas/scripts/run-pandas-tests.sh @@ -23,11 +23,7 @@ set -euo pipefail PANDAS_VERSION=$(python -c "import pandas; print(pandas.__version__)") PYTEST_IGNORES="--ignore=tests/io/test_user_agent.py \ -<<<<<<< Updated upstream --ignore=tests/interchange/test_impl.py \ ---ignore=tests/window/test_dtypes.py \ -======= ->>>>>>> Stashed changes --ignore=tests/strings/test_api.py \ --ignore=tests/io/pytables \ --ignore=tests/plotting \