From 2d52eab0d1a7155fa5e3a013067812bcd4a90f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 12 May 2025 23:41:12 +0200 Subject: [PATCH] Run more tests with setuptools 70.1+ But keep test_result_json_sequential skipped with bundled wheel. [skip changelog] --- python-tox.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-tox.spec b/python-tox.spec index fe30974..ce6f68e 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -152,11 +152,16 @@ k="${k-}${k+ and }not test_str_convert_ok_py39" %endif # https://github.com/tox-dev/tox/commit/698f1dd663 -# Until we have setuptools 70.1+ we skip those +# The tests fail with setuptools < 70.1 +%if v"%(%{python3} -c 'import importlib.metadata as im; print(im.version("setuptools"))' 2>/dev/null || echo 0)" < v"70.1" k="${k-}${k+ and }not test_result_json_sequential" k="${k-}${k+ and }not test_setuptools_package" k="${k-}${k+ and }not test_skip_develop_mode" k="${k-}${k+ and }not test_tox_install_pkg_sdist" +%else +# this test fails with virtualenv < 20.31 with bundled wheel +test -z $VIRTUALENV_WHEEL || k="${k-}${k+ and }not test_result_json_sequential" +%endif # The following tests either need internet connection or installed tox # so we only run them on the CI.