From e1802083f856a5c88d8dd18c32677d5c72993b5c Mon Sep 17 00:00:00 2001 From: William Douglas Date: Sun, 27 Oct 2024 20:11:38 -0700 Subject: [PATCH] Remove %check for setup.py test setup.py test is gone in 3.13 and projects seem to be doing custom things for replacements. Until wider per project detection is in place, just remove the %check section for setup.py. Signed-off-by: William Douglas --- autospec/check.py | 10 ---------- tests/test_check.py | 20 -------------------- 2 files changed, 30 deletions(-) diff --git a/autospec/check.py b/autospec/check.py index 06259811..ab245703 100644 --- a/autospec/check.py +++ b/autospec/check.py @@ -80,19 +80,16 @@ def scan_for_tests(src_dir, config, requirements, content): "{} test || :\nmodule unload openmpi".format(make_command) perl_check = "{} TEST_VERBOSE=1 test".format(make_command) - setup_check = """PYTHONPATH=%{buildroot}$(python -c "import sys; print(sys.path[-1])") python setup.py test""" meson_check = "meson test -C builddir --print-errorlogs" if config.config_opts.get('allow_test_failures'): make_check += " || :" cmake_check += " || :" perl_check += " || :" - setup_check += " || :" meson_check += " || :" testsuites = { "makecheck": make_check, "perlcheck": perl_check, - "setup.py": setup_check, "cmake": "cd clr-build; " + cmake_check, "meson": meson_check, } @@ -145,13 +142,6 @@ def scan_for_tests(src_dir, config, requirements, content): elif config.default_pattern in ["cpan"] and "Makefile.PL" in files: tests_config = testsuites["perlcheck"] - elif config.default_pattern == "distutils3" and "setup.py" in files: - with util.open_auto(os.path.join(src_dir, "setup.py"), 'r') as setup_fp: - setup_contents = setup_fp.read() - - if "test_suite" in setup_contents or "pbr=True" in setup_contents: - tests_config = testsuites["setup.py"] - elif config.default_pattern == "R": tests_config = "export _R_CHECK_FORCE_SUGGESTS_=false\n" \ "R CMD check --no-manual --no-examples --no-codoc . " \ diff --git a/tests/test_check.py b/tests/test_check.py index 0d915f73..304029ba 100644 --- a/tests/test_check.py +++ b/tests/test_check.py @@ -152,26 +152,6 @@ def test_scan_for_tests_perlcheck_in(self): check.os.listdir = listdir_backup self.assertEqual(check.tests_config, 'make TEST_VERBOSE=1 test') - def test_scan_for_tests_setup(self): - """ - Test scan_for_tests with setup.py suite - """ - reqs = buildreq.Requirements("") - conf = config.Config("") - tcontent = tarball.Content("", "", "", [], conf, "") - listdir_backup = os.listdir - check.os.listdir = mock_generator(['setup.py']) - content = 'test_suite' - m_open = mock_open(read_data=content) - with patch(self.open_name, m_open, create=True): - conf.default_pattern = "distutils3" - check.scan_for_tests('pkgdir', conf, reqs, tcontent) - - check.os.listdir = listdir_backup - self.assertEqual(check.tests_config, - 'PYTHONPATH=%{buildroot}$(python -c "import sys; print(sys.path[-1])") ' - 'python setup.py test') - def test_scan_for_tests_cmake(self): """ Test scan_for_tests with cmake suite