From 800ccca3bbf4996237b03ecde4641662a35541e7 Mon Sep 17 00:00:00 2001 From: Ray Douglass <3107146+raydouglass@users.noreply.github.com> Date: Wed, 18 Dec 2024 17:03:16 -0500 Subject: [PATCH] Allow test package uploads (#128) --- tests/test_rapids-find-anaconda-uploads.py | 18 ++++-------------- tools/rapids-find-anaconda-uploads.py | 10 ---------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/tests/test_rapids-find-anaconda-uploads.py b/tests/test_rapids-find-anaconda-uploads.py index 2ab92cf..a7c884c 100644 --- a/tests/test_rapids-find-anaconda-uploads.py +++ b/tests/test_rapids-find-anaconda-uploads.py @@ -36,20 +36,6 @@ def test_get_pkg_name_from_filename(filename, pkg_name): assert mod.get_pkg_name_from_filename(filename) == pkg_name -@pytest.mark.parametrize( - "pkg_name, result", - [ - ("custreamz", False), - ("strings_udf", False), - ("dask-cudf", False), - ("", False), - ("libcudf-tests", True), - ], -) -def test_is_test_pkg(pkg_name, result): - assert mod.is_test_pkg(pkg_name) == result - - @pytest.mark.parametrize( "env_var, pkg_name, result", [ @@ -113,7 +99,9 @@ def test_file_filter_fn(): "./cudf_conda_python_cuda11_39_aarch64/linux-aarch64/some-pkg-23.02.00a-cuda11_py39_g10bab945_72.tar.bz2", "./cudf_conda_python_cuda11_38_aarch64/linux-aarch64/some-pkg-private-23.02.00a-cuda11_py38_g10bab945_72.tar.bz2", "./cudf_conda_python_cuda11_38_aarch64/linux-aarch64/some-pkg-23.02.00a-cuda11_py38_g10bab945_72.tar.bz2", + "./cudf_conda_cpp_cuda11_aarch64/linux-aarch64/libcudf-tests-23.02.00a-cuda11_g10bab945_72.tar.bz2", "./cudf_conda_cpp_cuda11_aarch64/linux-aarch64/libcudf-23.02.00a-cuda11_g10bab945_72.tar.bz2", + "./cudf_conda_cpp_cuda11_x86_64/linux-64/libcudf-tests-23.02.00a-cuda11_g10bab945_72.tar.bz2", "./cudf_conda_cpp_cuda11_x86_64/linux-64/libcudf-23.02.00a-cuda11_g10bab945_72.tar.bz2", ] @@ -128,6 +116,8 @@ def test_file_filter_fn(): "./cudf_conda_python_cuda11_39_aarch64/linux-aarch64/some-pkg-23.02.00a-cuda11_py39_g10bab945_72.tar.bz2", "./cudf_conda_python_cuda11_38_aarch64/linux-aarch64/some-pkg-private-23.02.00a-cuda11_py38_g10bab945_72.tar.bz2", "./cudf_conda_python_cuda11_38_aarch64/linux-aarch64/some-pkg-23.02.00a-cuda11_py38_g10bab945_72.tar.bz2", + "./cudf_conda_cpp_cuda11_aarch64/linux-aarch64/libcudf-tests-23.02.00a-cuda11_g10bab945_72.tar.bz2", "./cudf_conda_cpp_cuda11_aarch64/linux-aarch64/libcudf-23.02.00a-cuda11_g10bab945_72.tar.bz2", + "./cudf_conda_cpp_cuda11_x86_64/linux-64/libcudf-tests-23.02.00a-cuda11_g10bab945_72.tar.bz2", "./cudf_conda_cpp_cuda11_x86_64/linux-64/libcudf-23.02.00a-cuda11_g10bab945_72.tar.bz2", ] diff --git a/tools/rapids-find-anaconda-uploads.py b/tools/rapids-find-anaconda-uploads.py index f62ee27..155201f 100755 --- a/tools/rapids-find-anaconda-uploads.py +++ b/tools/rapids-find-anaconda-uploads.py @@ -29,14 +29,6 @@ def get_pkg_name_from_filename(filename): return "-".join(filename.split("-")[:-2]) -def is_test_pkg(pkg_name): - """ - Returns true if the package name matches the pattern we use for - gtest packages. - """ - return pkg_name.endswith("-tests") - - def is_skip_pkg(pkg_name): """ Returns true if the package name is in the "SKIP_UPLOAD_PKGS" @@ -54,8 +46,6 @@ def file_filter_fn(file_path): filename = path.basename(file_path) pkg_name = get_pkg_name_from_filename(filename) - if is_test_pkg(pkg_name): - return False if is_skip_pkg(pkg_name): return False