From 01b3ebe23ce87d8a5434f88b2a417fcb0b0a7bc7 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 20 Jun 2024 23:09:54 -0400 Subject: [PATCH] Simplify s390x conditional testing [skip changelog] --- python-dask.spec | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/python-dask.spec b/python-dask.spec index 6a21e8d..9eda715 100644 --- a/python-dask.spec +++ b/python-dask.spec @@ -148,6 +148,15 @@ pytest_args=( -k "${k-}" +# arrow tests all fail on s390x, it's not at all BE-safe +# the exclusion of arrow as a build dep on s390x above is meant to +# ensure these tests get skipped, but dask-expr requires arrow, so it +# it gets pulled into the build env anyway +# https://github.com/dask/dask/issues/11186 +%ifarch s390x + --ignore %{buildroot}%{python3_sitelib}/%{srcname}/dataframe/io/tests/test_parquet.py +%endif + # Upstream uses 'thread' for Windows, but that kills the whole session, and # we'd like to see exactly which tests fail. --timeout_method=signal @@ -155,23 +164,9 @@ pytest_args=( --pyargs dask ) -%ifarch s390x -# arrow tests all fail on s390x, it's not at all BE-safe -# the exclusion of arrow as a build dep on s390x above is meant to -# ensure these tests get skipped, but dask-expr requires arrow, so it -# it gets pulled into the build env anyway -# https://github.com/dask/dask/issues/11186 -mv %{buildroot}%{python3_sitelib}/%{srcname}/dataframe/io/tests/test_parquet.py %{buildroot}%{python3_sitelib}/%{srcname}/dataframe/io/tests/XXparquetXX -%endif - cd docs %{pytest} "${pytest_args[@]}" -%ifarch s390x -mv %{buildroot}%{python3_sitelib}/%{srcname}/dataframe/io/tests/XXparquetXX %{buildroot}%{python3_sitelib}/%{srcname}/dataframe/io/tests/test_parquet.py -%endif - - %files -n python3-%{srcname} -f %{pyproject_files} %doc README.rst %license dask/array/NUMPY_LICENSE.txt