From f2cc4634a5cd35160c88925bc39ee561f3d6cf83 Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Fri, 15 Nov 2024 13:54:16 +0100 Subject: [PATCH] python/setuptools: update to 75.5.0 --- components/python/setuptools/.gitignore | 2 +- components/python/setuptools/Makefile | 4 +- .../setuptools/patches/01-unixccompiler.patch | 4 +- .../python/setuptools/patches/02-no-ruff.patch | 4 +- .../setuptools/patches/03-no-pytest-perf.patch | 4 +- .../patches/04-test-disable-failing.patch | 56 +++++++++++----------- .../python/setuptools/test/results-all.master | 9 ++-- 7 files changed, 41 insertions(+), 42 deletions(-) diff --git a/components/python/setuptools/.gitignore b/components/python/setuptools/.gitignore index dffa34109b..f7ce8fea1b 100644 --- a/components/python/setuptools/.gitignore +++ b/components/python/setuptools/.gitignore @@ -1 +1 @@ -/setuptools-75.4.0/ +/setuptools-75.5.0/ diff --git a/components/python/setuptools/Makefile b/components/python/setuptools/Makefile index 79147ec9bc..93a9fdb94e 100644 --- a/components/python/setuptools/Makefile +++ b/components/python/setuptools/Makefile @@ -19,10 +19,10 @@ BUILD_STYLE = pyproject include ../../../make-rules/shared-macros.mk COMPONENT_NAME = setuptools -HUMAN_VERSION = 75.4.0 +HUMAN_VERSION = 75.5.0 COMPONENT_SUMMARY = Easily download, build, install, upgrade, and uninstall Python packages COMPONENT_ARCHIVE_HASH = \ - sha256:1dc484f5cf56fd3fe7216d7b8df820802e7246cfb534a1db2aa64f14fcb9cdcb + sha256:5c4ccb41111392671f02bb5f8436dfc5a9a7185e80500531b133f5775c4163ef COMPONENT_LICENSE = MIT COMPONENT_LICENSE_FILE = LICENSE diff --git a/components/python/setuptools/patches/01-unixccompiler.patch b/components/python/setuptools/patches/01-unixccompiler.patch index 220303515f..ab05fce7da 100644 --- a/components/python/setuptools/patches/01-unixccompiler.patch +++ b/components/python/setuptools/patches/01-unixccompiler.patch @@ -1,5 +1,5 @@ ---- setuptools-75.4.0/setuptools/_distutils/unixccompiler.py.orig -+++ setuptools-75.4.0/setuptools/_distutils/unixccompiler.py +--- setuptools-75.5.0/setuptools/_distutils/unixccompiler.py.orig ++++ setuptools-75.5.0/setuptools/_distutils/unixccompiler.py @@ -116,14 +116,14 @@ # Python extensions). executables = { diff --git a/components/python/setuptools/patches/02-no-ruff.patch b/components/python/setuptools/patches/02-no-ruff.patch index c4b96bdcae..3b4506fd05 100644 --- a/components/python/setuptools/patches/02-no-ruff.patch +++ b/components/python/setuptools/patches/02-no-ruff.patch @@ -1,8 +1,8 @@ We have no pytest-ruff support yet. see https://github.com/tikv/jemallocator/issues/58 ---- setuptools-75.4.0/pyproject.toml.orig -+++ setuptools-75.4.0/pyproject.toml +--- setuptools-75.5.0/pyproject.toml.orig ++++ setuptools-75.5.0/pyproject.toml @@ -110,12 +110,8 @@ check = [ # upstream diff --git a/components/python/setuptools/patches/03-no-pytest-perf.patch b/components/python/setuptools/patches/03-no-pytest-perf.patch index 92696a94ed..8cc4289700 100644 --- a/components/python/setuptools/patches/03-no-pytest-perf.patch +++ b/components/python/setuptools/patches/03-no-pytest-perf.patch @@ -1,7 +1,7 @@ https://github.com/pypa/setuptools/issues/4050 ---- setuptools-75.4.0/pyproject.toml.orig -+++ setuptools-75.4.0/pyproject.toml +--- setuptools-75.5.0/pyproject.toml.orig ++++ setuptools-75.5.0/pyproject.toml @@ -50,7 +50,6 @@ "ini2toml[lite]>=0.14", "tomli-w>=1.0.0", diff --git a/components/python/setuptools/patches/04-test-disable-failing.patch b/components/python/setuptools/patches/04-test-disable-failing.patch index 9ea85c2d50..2d5a0cfac6 100644 --- a/components/python/setuptools/patches/04-test-disable-failing.patch +++ b/components/python/setuptools/patches/04-test-disable-failing.patch @@ -1,5 +1,5 @@ ---- setuptools-75.4.0/setuptools/tests/config/test_setupcfg.py.orig -+++ setuptools-75.4.0/setuptools/tests/config/test_setupcfg.py +--- setuptools-75.5.0/setuptools/tests/config/test_setupcfg.py.orig ++++ setuptools-75.5.0/setuptools/tests/config/test_setupcfg.py @@ -77,6 +77,7 @@ @@ -24,8 +24,8 @@ def test_cmdclass(self, tmpdir): module_path = Path(tmpdir, "src/custom_build.py") # auto discovery for src module_path.parent.mkdir(parents=True, exist_ok=True) ---- setuptools-75.4.0/setuptools/tests/config/test_apply_pyprojecttoml.py.orig -+++ setuptools-75.4.0/setuptools/tests/config/test_apply_pyprojecttoml.py +--- setuptools-75.5.0/setuptools/tests/config/test_apply_pyprojecttoml.py.orig ++++ setuptools-75.5.0/setuptools/tests/config/test_apply_pyprojecttoml.py @@ -37,6 +37,7 @@ @pytest.mark.parametrize("url", urls_from_file(HERE / EXAMPLES_FILE)) @pytest.mark.filterwarnings("ignore") @@ -58,8 +58,8 @@ def test_warning_overwritten_dependencies(self, tmp_path): src = "[project]\nname='pkg'\nversion='0.1'\ndependencies=['click']\n" pyproject = tmp_path / "pyproject.toml" ---- setuptools-75.4.0/setuptools/tests/test_easy_install.py.orig -+++ setuptools-75.4.0/setuptools/tests/test_easy_install.py +--- setuptools-75.5.0/setuptools/tests/test_easy_install.py.orig ++++ setuptools-75.5.0/setuptools/tests/test_easy_install.py @@ -820,6 +820,7 @@ run_setup(test_setup_py, ['--version']) assert len(mock_index.requests) == 0 @@ -68,8 +68,8 @@ def test_setup_requires_with_allow_hosts(self, mock_index): """The `allow-hosts` option in not supported anymore.""" files = { ---- setuptools-75.4.0/setuptools/tests/test_editable_install.py.orig -+++ setuptools-75.4.0/setuptools/tests/test_editable_install.py +--- setuptools-75.5.0/setuptools/tests/test_editable_install.py.orig ++++ setuptools-75.5.0/setuptools/tests/test_editable_install.py @@ -611,6 +611,7 @@ three = import_module("parent.child.three") assert three.x == 3 @@ -78,8 +78,8 @@ def test_no_recursion(self, tmp_path): # See issue #3550 files = { ---- setuptools-75.4.0/setuptools/tests/test_extern.py.orig -+++ setuptools-75.4.0/setuptools/tests/test_extern.py +--- setuptools-75.5.0/setuptools/tests/test_extern.py.orig ++++ setuptools-75.5.0/setuptools/tests/test_extern.py @@ -5,11 +5,14 @@ from setuptools import Distribution @@ -95,8 +95,8 @@ +@pytest.mark.skip(reason="fails with tox-current-env") def test_distribution_picklable(): pickle.loads(pickle.dumps(Distribution())) ---- setuptools-75.4.0/setuptools/tests/test_build_py.py.orig -+++ setuptools-75.4.0/setuptools/tests/test_build_py.py +--- setuptools-75.5.0/setuptools/tests/test_build_py.py.orig ++++ setuptools-75.5.0/setuptools/tests/test_build_py.py @@ -157,6 +157,7 @@ } @@ -105,8 +105,8 @@ def test_excluded_subpackages(tmpdir_cwd): jaraco.path.build(EXAMPLE_WITH_MANIFEST) dist = Distribution({"script_name": "%PEP 517%"}) ---- setuptools-75.4.0/setuptools/tests/test_develop.py.orig -+++ setuptools-75.4.0/setuptools/tests/test_develop.py +--- setuptools-75.5.0/setuptools/tests/test_develop.py.orig ++++ setuptools-75.5.0/setuptools/tests/test_develop.py @@ -83,6 +83,7 @@ # assert '0.0' not in foocmd_text @@ -115,8 +115,8 @@ def test_egg_link_filename(self): settings = dict( name='Foo $$$ Bar_baz-bing', ---- setuptools-75.4.0/setuptools/tests/test_core_metadata.py.orig -+++ setuptools-75.4.0/setuptools/tests/test_core_metadata.py +--- setuptools-75.5.0/setuptools/tests/test_core_metadata.py.orig ++++ setuptools-75.5.0/setuptools/tests/test_core_metadata.py @@ -155,6 +155,7 @@ @@ -125,8 +125,8 @@ def test_read_metadata(name, attrs): dist = Distribution(attrs) metadata_out = dist.metadata ---- setuptools-75.4.0/setuptools/_distutils/tests/test_dist.py.orig -+++ setuptools-75.4.0/setuptools/_distutils/tests/test_dist.py +--- setuptools-75.5.0/setuptools/_distutils/tests/test_dist.py.orig ++++ setuptools-75.5.0/setuptools/_distutils/tests/test_dist.py @@ -296,6 +296,7 @@ {"name": "package", "version": "1.0", "provides": ["my.pkg (splat)"]}, ) @@ -135,8 +135,8 @@ def test_requires(self): attrs = { "name": "package", ---- setuptools-75.4.0/setuptools/tests/test_egg_info.py.orig -+++ setuptools-75.4.0/setuptools/tests/test_egg_info.py +--- setuptools-75.5.0/setuptools/tests/test_egg_info.py.orig ++++ setuptools-75.5.0/setuptools/tests/test_egg_info.py @@ -180,6 +180,7 @@ with pytest.raises(distutils.errors.DistutilsFileError, match=msg): ei.run() @@ -153,8 +153,8 @@ def test_requires( self, tmpdir_cwd, ---- setuptools-75.4.0/setuptools/tests/test_bdist_deprecations.py.orig -+++ setuptools-75.4.0/setuptools/tests/test_bdist_deprecations.py +--- setuptools-75.5.0/setuptools/tests/test_bdist_deprecations.py.orig ++++ setuptools-75.5.0/setuptools/tests/test_bdist_deprecations.py @@ -12,6 +12,7 @@ @pytest.mark.skipif(sys.platform == 'win32', reason='non-Windows only') @pytest.mark.xfail(reason="bdist_rpm is long deprecated, should we remove it? #1988") @@ -163,8 +163,8 @@ def test_bdist_rpm_warning(distutils_cmd, tmpdir_cwd): dist = Distribution( dict( ---- setuptools-75.4.0/setuptools/tests/test_virtualenv.py.orig -+++ setuptools-75.4.0/setuptools/tests/test_virtualenv.py +--- setuptools-75.5.0/setuptools/tests/test_virtualenv.py.orig ++++ setuptools-75.5.0/setuptools/tests/test_virtualenv.py @@ -83,6 +83,7 @@ ), ], @@ -173,8 +173,8 @@ def test_pip_upgrade_from_source( pip_version, venv_without_setuptools, setuptools_wheel, setuptools_sdist ): ---- setuptools-75.4.0/setuptools/tests/test_build_clib.py.orig -+++ setuptools-75.4.0/setuptools/tests/test_build_clib.py +--- setuptools-75.5.0/setuptools/tests/test_build_clib.py.orig ++++ setuptools-75.5.0/setuptools/tests/test_build_clib.py @@ -11,6 +11,7 @@ class TestBuildCLib: @@ -191,8 +191,8 @@ def test_build_libraries_reproducible(self, mock_newer): dist = Distribution() cmd = build_clib(dist) ---- setuptools-75.4.0/setuptools/tests/test_build_ext.py.orig -+++ setuptools-75.4.0/setuptools/tests/test_build_ext.py +--- setuptools-75.5.0/setuptools/tests/test_build_ext.py.orig ++++ setuptools-75.5.0/setuptools/tests/test_build_ext.py @@ -103,6 +103,7 @@ "package_dir": {"": "src"}, }) diff --git a/components/python/setuptools/test/results-all.master b/components/python/setuptools/test/results-all.master index 84920e11a1..7c5396aa29 100644 --- a/components/python/setuptools/test/results-all.master +++ b/components/python/setuptools/test/results-all.master @@ -5,7 +5,7 @@ platform sunos5 -- Python $(PYTHON_VERSION).X -- $(@D)/.tox/py$(PYV)/bin/python cachedir: .tox/py$(PYV)/.pytest_cache rootdir: $(@D) configfile: pytest.ini -X workers [1375 items] +X workers [1374 items] scheduling tests via LoadScheduling @@ -370,7 +370,6 @@ setuptools/tests/config/test_pyprojecttoml.py::test_include_package_data_by_defa setuptools/tests/config/test_pyprojecttoml.py::test_include_package_data_in_setuppy PASSED setuptools/tests/config/test_pyprojecttoml.py::test_invalid_example[\n [project]\n name = "myproj"\n version = "1.2"\n requires = ['pywin32; platform_system=="Windows"' ]\n -configuration error: .project. must not contain ..requires.. properties] PASSED setuptools/tests/config/test_pyprojecttoml.py::test_read_configuration PASSED -setuptools/tests/config/test_pyprojecttoml.py::test_warn_skipping_validation PASSED setuptools/tests/config/test_pyprojecttoml.py::test_warn_tools_typo PASSED setuptools/tests/config/test_pyprojecttoml_dynamic_deps.py::mypy PASSED setuptools/tests/config/test_pyprojecttoml_dynamic_deps.py::test_dynamic_dependencies PASSED @@ -1366,11 +1365,11 @@ setuptools/tests/test_wheel.py::test_wheel_install[script] PASSED setuptools/tests/test_wheel.py::test_wheel_install[utf-8] PASSED setuptools/tests/test_wheel.py::test_wheel_install_pep_503 PASSED setuptools/tests/test_wheel.py::test_wheel_is_compatible PASSED -setuptools/tests/test_wheel.py::test_wheel_mode PASSED +setuptools/tests/test_wheel.py::test_wheel_mode $(PYTHON_DIR)/vendor-packages/coverage/report_core.py:116: CoverageWarning: Couldn't parse '/tmp/easy_install-_1si0xwq/setup.py': No source for code: '/tmp/easy_install-_1si0xwq/setup.py'. (couldnt-parse) PASSED setuptools/tests/test_wheel.py::test_wheel_no_dist_dir PASSED setuptools/tests/test_windows_wrappers.py::TestCLI::test_basic SKIPPED setuptools/tests/test_windows_wrappers.py::TestCLI::test_symlink SKIPPED -setuptools/tests/test_windows_wrappers.py::TestCLI::test_with_options $(PYTHON_DIR)/vendor-packages/coverage/report_core.py:116: CoverageWarning: Couldn't parse '/tmp/easy_install-c6nzg67h/setup.py': No source for code: '/tmp/easy_install-c6nzg67h/setup.py'. (couldnt-parse) SKIPPED +setuptools/tests/test_windows_wrappers.py::TestCLI::test_with_options SKIPPED setuptools/tests/test_windows_wrappers.py::TestGUI::test_basic SKIPPED setuptools/tests/test_windows_wrappers.py::mypy PASSED setuptools/tests/text.py::mypy PASSED @@ -1389,6 +1388,6 @@ tools/vendored.py::mypy PASSED ===================================== mypy ===================================== Success: no issues found in 141 source files -======== 1259 passed, 111 skipped, 4 xfailed, 1 xpassed ======== +======== 1258 passed, 111 skipped, 4 xfailed, 1 xpassed ======== py$(PYV): OK congratulations :) -- 2.11.4.GIT