From 9e14eb3740d57f10e4e17b0578040022972789b9f2fb0fa9557304378c86397f Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 5 Nov 2024 22:29:43 +0000 Subject: [PATCH 1/8] Negations are poorly visible. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=271 --- python-setuptools.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python-setuptools.spec b/python-setuptools.spec index 474da70..ea608a9 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -91,7 +91,7 @@ the wheel needs to be used directly in test or install setups rm -f setuptools/*.exe %build -%if !%{with test} +%if %{without test} %{python_expand # bootstrap with built-in pip $python -m venv build/env build/env/bin/python -m ensurepip @@ -101,7 +101,7 @@ export PYTHONPATH=build/env/lib/python%{$python_bin_suffix}/site-packages %endif %install -%if !%{with test} +%if %{without test} %{python_expand # use pip bootstrapped above export PYTHONPATH=build/env/lib/python%{$python_bin_suffix}/site-packages %{$python_pyproject_install} @@ -133,7 +133,7 @@ donttest+=" or test_setup_requires_with_transitive_extra_dependency" %pytest -rfE -n auto -k "not ($donttest)" %endif -%if !%{with test} +%if %{without test} %files %{python_files} %if !%{with wheel} %license LICENSE From e48ac808eab29ac28dbc765b5b4f2ca15473f9632da110fb80fb07da160fe0c5 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 20 Nov 2024 17:30:51 +0000 Subject: [PATCH 2/8] - update to 75.5.0: * Removed support for SETUPTOOLS_DANGEROUSLY_SKIP_PYPROJECT_VALIDATION, as it is deemed prone to errors. * Added support for the environment variable SETUPTOOLS_DANGEROUSLY_SKIP_PYPROJECT_VALIDATION=true, allowing users to bypass the validation of pyproject.toml. This option should be used only as a last resort when resolving dependency issues, as it may lead to improper functioning. Users who enable this setting are responsible for ensuring that pyproject.toml complies with setuptools requirements. (#4611) Attention! This environment variable was removed in a later version of setuptools. * Require Python 3.9 or later. (#4718) * Remove dependency on importlib_resources and the vendored copy of the library. Instead, setuptools consistently rely on stdlib's importlib.resources (available on Python 3.9+). (#4718) * Setuptools' bdist_wheel implementation no longer produces wheels with the m SOABI flag (pymalloc-related). This flag was removed on Python 3.8+ (see :obj:`sys.abiflags`). (#4718) * Updated vendored packaging version to 24.2. (#4740) * Merge with pypa/distutils@251797602, including fix for dirutil.mkpath handling in pypa/distutils#304. * Allowed using dict as an ordered type in setuptools.dist.check_requirements -- by :user:`Avasam` * Ensured methods in setuptools.modified preferably raise a consistent distutils.errors.DistutilsError type (except in the deprecated use case of SETUPTOOLS_USE_DISTUTILS=stdlib) -- by :user:`Avasam` OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=272 --- python-setuptools.changes | 135 ++++++++++++++++++++++++++++++++++++++ python-setuptools.spec | 2 +- setuptools-72.1.0.tar.gz | 3 - setuptools-75.5.0.tar.gz | 3 + 4 files changed, 139 insertions(+), 4 deletions(-) delete mode 100644 setuptools-72.1.0.tar.gz create mode 100644 setuptools-75.5.0.tar.gz diff --git a/python-setuptools.changes b/python-setuptools.changes index 9fc6bcf..d9c60b5 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,138 @@ +------------------------------------------------------------------- +Wed Nov 20 17:30:46 UTC 2024 - Dirk Müller + +- update to 75.5.0: + * Removed support for + SETUPTOOLS_DANGEROUSLY_SKIP_PYPROJECT_VALIDATION, as it is + deemed prone to errors. + * Added support for the environment variable + SETUPTOOLS_DANGEROUSLY_SKIP_PYPROJECT_VALIDATION=true, + allowing users to bypass the validation of pyproject.toml. + This option should be used only as a last resort when + resolving dependency issues, as it may lead to improper + functioning. Users who enable this setting are responsible + for ensuring that pyproject.toml complies with setuptools + requirements. (#4611) Attention! This environment variable + was removed in a later version of setuptools. + * Require Python 3.9 or later. (#4718) + * Remove dependency on importlib_resources and the vendored + copy of the library. Instead, setuptools consistently rely on + stdlib's importlib.resources (available on Python 3.9+). + (#4718) + * Setuptools' bdist_wheel implementation no longer produces + wheels with the m SOABI flag (pymalloc-related). This flag + was removed on Python 3.8+ (see :obj:`sys.abiflags`). (#4718) + * Updated vendored packaging version to 24.2. (#4740) + * Merge with pypa/distutils@251797602, including fix for + dirutil.mkpath handling in pypa/distutils#304. + * Allowed using dict as an ordered type in + setuptools.dist.check_requirements -- by :user:`Avasam` + * Ensured methods in setuptools.modified preferably raise a + consistent distutils.errors.DistutilsError type (except in + the deprecated use case of SETUPTOOLS_USE_DISTUTILS=stdlib) + -- by :user:`Avasam` + * Fix the ABI tag when building a wheel using the debug build + of Python 3.13 on Windows. Previously, the ABI tag was + missing the "d" flag. + * Fix clashes for optional-dependencies in pyproject.toml and + extra_requires in setup.cfg/setup.py. As per PEP 621, + optional-dependencies have to be honoured and dynamic + behaviour is not allowed. + * #4560 + * Made errors when parsing Distribution data more explicit + about the expected type (tuple[str, ...] | list[str]) -- by + :user:`Avasam` + * Fix a TypeError when a Distribution's old included attribute + was a tuple -- by :user:`Avasam` + * Add workaround for bdist_wheel --dist-info-dir errors when + customisation does not inherit from setuptools. + * Re-use pre-existing .dist-info dir when creating wheels via + the build backend APIs (PEP 517) and the metadata_directory + argument is passed -- by :user:`pelson`. + * Changed egg_info command to avoid adding an empty .egg-info + directory while iterating over entry-points. This avoids + triggering integration problems with + importlib.metadata/importlib_metadata (reference: + pypa/pyproject-hooks#206). + * Deprecated bdist_wheel.universal configuration. + * Removed reference to upload_docs module in entry points. + * Declare also the dependencies used by distutils (adds + jaraco.collections). + * Removed upload_docs command. + * Merge with pypa/distutils@7283751. Removed the register and + upload commands and the config module that backs them + (pypa/distutils#294). Removed the borland compiler. Replaced + vendored dependencies with natural dependencies. Cygwin C + compiler now gets compilers from sysconfig + (pypa/distutils#296). + * Fix cross-platform compilation using + distutils._msvccompiler.MSVCCompiler -- by :user:`saschanaz` + and :user:`Avasam` + * Fixed TypeError in sdist filelist processing by adding + support for pathlib Paths for the build_base. + * Removed degraded and deprecated test_integration + (easy_install) from the test suite. + * Fixed TypeError in msvc.EnvironmentInfo.return_env when no + runtime redistributables are installed. + * Added support for defining ext-modules via pyproject.toml + (EXPERIMENTAL, may change in future releases). + * Merge with pypa/distutils@3dcdf8567, removing the duplicate + vendored copy of packaging. + * Restored setuptools.msvc.Environmentinfo as it is used + externally. + * Changed the type of error raised by + setuptools.command.easy_install.CommandSpec.from_param on + unsupported argument from AttributeError to TypeError -- by + :user:`Avasam` + * Added detection of ARM64 variant of MSVC -- by + :user:`saschanaz` + * Made setuptools.package_index.Credential a typing.NamedTuple + -- by :user:`Avasam` + * Reraise error from setuptools.command.easy_install.auto_chmod + instead of nonsensical TypeError: 'Exception' object is not + subscriptable -- by :user:`Avasam` + * Fully typed all collection attributes in pkg_resources -- by + :user:`Avasam` + * Automatically exclude .tox|.nox|.venv directories from sdist. + * Removed the monkeypatching of distutils._msvccompiler. Now + all compiler logic is consolidated in distutils. + * Synced with pypa/distutils@58fe058e4, including consolidating + Visual Studio 2017 support (#4600, pypa/distutils#289), + removal of deprecated legacy MSVC compiler modules + (pypa/distutils#287), suppressing of errors when the home + directory is missing (pypa/distutils#278), removal of wininst + binaries (pypa/distutils#282). + * #4592 + * Remove abc.ABCMeta metaclass from abstract classes. + pypa/setuptools#4503 had an unintended consequence of causing + potential TypeError: metaclass conflict: the metaclass of a + derived class must be a (non-strict) subclass of the + metaclasses of all its bases -- by :user:`Avasam` + * Mark abstract base classes and methods with abc.ABC and + abc.abstractmethod -- by :user:`Avasam` + * Changed the order of type checks in + setuptools.command.easy_install.CommandSpec.from_param to + support any collections.abc.Iterable of str param -- by + :user:`Avasam` + * Prevent an error in bdist_wheel if compression is set to a + str (even if valid) after finalizing options but before + running the command. -- by :user:`Avasam` + * Raises an exception when py_limited_api is used in a build + with Py_GIL_DISABLED. This is currently not supported + (python/cpython#111506). + * Synced with pypa/distutils@30b7331 including fix for modified + check on empty sources (pypa/distutils#284). + * setuptools is replacing the usages of :pypi:`ordered_set` + with simple instances of dict[Hashable, None]. This is done + to remove the extra dependency and it is possible because + since Python 3.7, dict maintain insertion order. + * #4534, #4546, #4554, #4559, #4565 + * Merged with pypa/distutils@b7ee725f3 including: Support for + Pathlike objects in data files and extensions + (pypa/distutils#272, pypa/distutils#237), native support for + C++ compilers (pypa/distuils#228) and removed unused + get_msvcr() (pypa/distutils#274). + ------------------------------------------------------------------- Fri Sep 13 04:01:00 UTC 2024 - Steve Kowalik diff --git a/python-setuptools.spec b/python-setuptools.spec index ea608a9..df87559 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -30,7 +30,7 @@ %define mypython python %{?sle15_python_module_pythons} Name: python-setuptools%{psuffix} -Version: 72.1.0 +Version: 75.5.0 Release: 0 Summary: Download, build, install, upgrade, and uninstall Python packages License: Apache-2.0 AND MIT AND BSD-2-Clause AND Python-2.0 diff --git a/setuptools-72.1.0.tar.gz b/setuptools-72.1.0.tar.gz deleted file mode 100644 index e7523f7..0000000 --- a/setuptools-72.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d243eff56d095e5817f796ede6ae32941278f542e0f941867cc05ae52b162ec -size 2419487 diff --git a/setuptools-75.5.0.tar.gz b/setuptools-75.5.0.tar.gz new file mode 100644 index 0000000..e5e8d64 --- /dev/null +++ b/setuptools-75.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c4ccb41111392671f02bb5f8436dfc5a9a7185e80500531b133f5775c4163ef +size 1336032 From 7d31f50030668509ec864bb857f301acc661a237146f416209d27a1bc6839cc8 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 21 Nov 2024 11:36:02 +0000 Subject: [PATCH 3/8] - update to 75.6.0: * Preserve original PKG-INFO into METADATA when creating wheel (instead of calling wheel.metadata.pkginfo_to_metadata). This helps to be more compliant with the flow specified in PEP 517. * Changed the WindowsSdkVersion, FrameworkVersion32 and FrameworkVersion64 properties of setuptools.msvc.PlatformInfo to return an empty tuple instead of None as a fallthrough case -- by :user:`Avasam` OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=273 --- python-setuptools.changes | 13 +++++++++++++ python-setuptools.spec | 12 ++++++------ setuptools-75.5.0.tar.gz | 3 --- setuptools-75.6.0.tar.gz | 3 +++ 4 files changed, 22 insertions(+), 9 deletions(-) delete mode 100644 setuptools-75.5.0.tar.gz create mode 100644 setuptools-75.6.0.tar.gz diff --git a/python-setuptools.changes b/python-setuptools.changes index d9c60b5..627ad91 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Nov 21 11:35:52 UTC 2024 - Dirk Müller + +- update to 75.6.0: + * Preserve original PKG-INFO into METADATA when creating wheel + (instead of calling wheel.metadata.pkginfo_to_metadata). This + helps to be more compliant with the flow specified in PEP + 517. + * Changed the WindowsSdkVersion, FrameworkVersion32 and + FrameworkVersion64 properties of setuptools.msvc.PlatformInfo + to return an empty tuple instead of None as a fallthrough + case -- by :user:`Avasam` + ------------------------------------------------------------------- Wed Nov 20 17:30:46 UTC 2024 - Dirk Müller diff --git a/python-setuptools.spec b/python-setuptools.spec index df87559..b357e9c 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -30,7 +30,7 @@ %define mypython python %{?sle15_python_module_pythons} Name: python-setuptools%{psuffix} -Version: 75.5.0 +Version: 75.6.0 Release: 0 Summary: Download, build, install, upgrade, and uninstall Python packages License: Apache-2.0 AND MIT AND BSD-2-Clause AND Python-2.0 @@ -48,19 +48,19 @@ BuildArch: noarch BuildRequires: %{python_module build} BuildRequires: %{python_module devel} BuildRequires: %{python_module filelock >= 3.4.0} -BuildRequires: %{python_module ini2toml-lite >= 0.9} +BuildRequires: %{python_module ini2toml-lite >= 0.14} BuildRequires: %{python_module jaraco.develop >= 7.21} BuildRequires: %{python_module jaraco.envs >= 2.2} -BuildRequires: %{python_module jaraco.packaging >= 10.0} BuildRequires: %{python_module jaraco.path >= 3.2.0} -BuildRequires: %{python_module jaraco.test} +BuildRequires: %{python_module jaraco.test >= 5.5} +BuildRequires: %{python_module packaging >= 24.2} BuildRequires: %{python_module pip >= 19.1} BuildRequires: %{python_module pip-run >= 8.8} BuildRequires: %{python_module pytest >= 6} -BuildRequires: %{python_module pytest-home} +BuildRequires: %{python_module pytest-home >= 0.5} BuildRequires: %{python_module pytest-subprocess} BuildRequires: %{python_module pytest-timeout} -BuildRequires: %{python_module pytest-xdist} +BuildRequires: %{python_module pytest-xdist >= 3} BuildRequires: %{python_module setuptools = %{version}} BuildRequires: %{python_module setuptools-wheel = %{version}} BuildRequires: %{python_module tomli-w >= 1.0.0} diff --git a/setuptools-75.5.0.tar.gz b/setuptools-75.5.0.tar.gz deleted file mode 100644 index e5e8d64..0000000 --- a/setuptools-75.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c4ccb41111392671f02bb5f8436dfc5a9a7185e80500531b133f5775c4163ef -size 1336032 diff --git a/setuptools-75.6.0.tar.gz b/setuptools-75.6.0.tar.gz new file mode 100644 index 0000000..713dfab --- /dev/null +++ b/setuptools-75.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8199222558df7c86216af4f84c30e9b34a61d8ba19366cc914424cdbd28252f6 +size 1337429 From fa95acb87fa9757388f172e53ce8e755fa674cf8a18d17886eda807ea6eaae8e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 21 Nov 2024 11:50:30 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=274 --- python-setuptools.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python-setuptools.spec b/python-setuptools.spec index b357e9c..36b5250 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -51,6 +51,7 @@ BuildRequires: %{python_module filelock >= 3.4.0} BuildRequires: %{python_module ini2toml-lite >= 0.14} BuildRequires: %{python_module jaraco.develop >= 7.21} BuildRequires: %{python_module jaraco.envs >= 2.2} +BuildRequires: %{python_module jaraco.packaging >= 9.3} BuildRequires: %{python_module jaraco.path >= 3.2.0} BuildRequires: %{python_module jaraco.test >= 5.5} BuildRequires: %{python_module packaging >= 24.2} @@ -121,15 +122,15 @@ export LANG=en_US.UTF-8 export PIP_FIND_LINKS=$PWD/dist # tests need imports from local source dir export PYTHONPATH=$(pwd) -# no online comparisons in obs -donttest="(test_apply_pyproject_equivalent_to_setupcfg and https)" # test_pbr_integration tries to install pbr from network using pip -donttest+=" or test_pbr_integration" +donttest=" test_pbr_integration" # looks for .exe files that we do not ship donttest+=" or test_wheel_includes_cli_scripts" # ignores environment variables donttest+=" or test_setup_requires_with_distutils_command_dep" donttest+=" or test_setup_requires_with_transitive_extra_dependency" +# skip tests that require network access +donttest+=" or uses_network" %pytest -rfE -n auto -k "not ($donttest)" %endif From 1452eaf54e168367676dfa249710455a6ebfe65c9a2f38fd1d36109388f0f203 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 21 Nov 2024 11:57:09 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=275 --- python-setuptools.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-setuptools.spec b/python-setuptools.spec index 36b5250..234e436 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -56,7 +56,6 @@ BuildRequires: %{python_module jaraco.path >= 3.2.0} BuildRequires: %{python_module jaraco.test >= 5.5} BuildRequires: %{python_module packaging >= 24.2} BuildRequires: %{python_module pip >= 19.1} -BuildRequires: %{python_module pip-run >= 8.8} BuildRequires: %{python_module pytest >= 6} BuildRequires: %{python_module pytest-home >= 0.5} BuildRequires: %{python_module pytest-subprocess} From 7de1b1f8382bbab251abe2b33c656c98da725a0ea2b82d1b026c02c39fa063ab Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 21 Nov 2024 12:02:25 +0000 Subject: [PATCH 6/8] Accepting request 1225583 from home:mcepl:branches:devel:languages:python:jupyter - Skip over the tests which require network. OBS-URL: https://build.opensuse.org/request/show/1225583 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=276 --- python-setuptools.changes | 5 +++++ python-setuptools.spec | 4 ++++ sort-for-reproducibility.patch | 19 ++++++------------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/python-setuptools.changes b/python-setuptools.changes index 627ad91..9e30761 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 21 12:01:23 UTC 2024 - Matej Cepl + +- Skip over the tests which require network. + ------------------------------------------------------------------- Thu Nov 21 11:35:52 UTC 2024 - Dirk Müller diff --git a/python-setuptools.spec b/python-setuptools.spec index 234e436..9fe669b 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -121,6 +121,10 @@ export LANG=en_US.UTF-8 export PIP_FIND_LINKS=$PWD/dist # tests need imports from local source dir export PYTHONPATH=$(pwd) +# no online comparisons in obs +donttest="(test_apply_pyproject_equivalent_to_setupcfg and https)" +# no network access +donttest+=" or uses_network" # test_pbr_integration tries to install pbr from network using pip donttest=" test_pbr_integration" # looks for .exe files that we do not ship diff --git a/sort-for-reproducibility.patch b/sort-for-reproducibility.patch index 6e74a88..bf50513 100644 --- a/sort-for-reproducibility.patch +++ b/sort-for-reproducibility.patch @@ -1,15 +1,10 @@ --- setuptools/command/easy_install.py | 2 +- - setuptools/command/egg_info.py | 2 +- - setuptools/dist.py | 2 +- - setuptools/tests/test_egg_info.py | 2 +- setuptools/tests/test_wheel.py | 8 ++++---- - 5 files changed, 8 insertions(+), 8 deletions(-) + 2 files changed, 5 insertions(+), 5 deletions(-) -Index: setuptools-70.0.0/setuptools/command/easy_install.py -=================================================================== ---- setuptools-70.0.0.orig/setuptools/command/easy_install.py -+++ setuptools-70.0.0/setuptools/command/easy_install.py +--- a/setuptools/command/easy_install.py ++++ b/setuptools/command/easy_install.py @@ -436,7 +436,7 @@ class easy_install(Command): for spec in self.args: self.easy_install(spec, not self.no_deps) @@ -19,11 +14,9 @@ Index: setuptools-70.0.0/setuptools/command/easy_install.py if self.root: # strip any package prefix root_len = len(self.root) for counter in range(len(outputs)): -Index: setuptools-70.0.0/setuptools/tests/test_wheel.py -=================================================================== ---- setuptools-70.0.0.orig/setuptools/tests/test_wheel.py -+++ setuptools-70.0.0/setuptools/tests/test_wheel.py -@@ -411,30 +411,30 @@ WHEEL_INSTALL_TESTS = ( +--- a/setuptools/tests/test_wheel.py ++++ b/setuptools/tests/test_wheel.py +@@ -417,30 +417,30 @@ WHEEL_INSTALL_TESTS: tuple[dict[str, Any dict( id='requires_ensure_order', install_requires=""" From ca83fe27abd45ffb7fc1ae218a1c47327dd6f4ada06c0e3f690abc09941877d1 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 21 Nov 2024 15:56:40 +0000 Subject: [PATCH 7/8] Accepting request 1225618 from home:mcepl:branches:devel:languages:python:jupyter fix typo OBS-URL: https://build.opensuse.org/request/show/1225618 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=277 --- python-setuptools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-setuptools.spec b/python-setuptools.spec index 9fe669b..d3de1dd 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -126,7 +126,7 @@ donttest="(test_apply_pyproject_equivalent_to_setupcfg and https)" # no network access donttest+=" or uses_network" # test_pbr_integration tries to install pbr from network using pip -donttest=" test_pbr_integration" +donttest+=" test_pbr_integration" # looks for .exe files that we do not ship donttest+=" or test_wheel_includes_cli_scripts" # ignores environment variables From 01a2998ddb4b9ecc0543b2d5fe531779ec45f03089efe92f6c3a321981675573 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 21 Nov 2024 22:31:57 +0000 Subject: [PATCH 8/8] Accepting request 1225675 from home:mcepl:branches:devel:languages:python:jupyter - Don't use pytest-xdist, it breaks test suite. OBS-URL: https://build.opensuse.org/request/show/1225675 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=278 --- python-setuptools.changes | 1 + python-setuptools.spec | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/python-setuptools.changes b/python-setuptools.changes index 9e30761..11e1223 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -2,6 +2,7 @@ Thu Nov 21 12:01:23 UTC 2024 - Matej Cepl - Skip over the tests which require network. +- Don't use pytest-xdist, it breaks test suite. ------------------------------------------------------------------- Thu Nov 21 11:35:52 UTC 2024 - Dirk Müller diff --git a/python-setuptools.spec b/python-setuptools.spec index d3de1dd..a49f305 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -60,7 +60,7 @@ BuildRequires: %{python_module pytest >= 6} BuildRequires: %{python_module pytest-home >= 0.5} BuildRequires: %{python_module pytest-subprocess} BuildRequires: %{python_module pytest-timeout} -BuildRequires: %{python_module pytest-xdist >= 3} +# BuildRequires: %%{python_module pytest-xdist >= 3} BuildRequires: %{python_module setuptools = %{version}} BuildRequires: %{python_module setuptools-wheel = %{version}} BuildRequires: %{python_module tomli-w >= 1.0.0} @@ -126,7 +126,7 @@ donttest="(test_apply_pyproject_equivalent_to_setupcfg and https)" # no network access donttest+=" or uses_network" # test_pbr_integration tries to install pbr from network using pip -donttest+=" test_pbr_integration" +donttest+=" or test_pbr_integration" # looks for .exe files that we do not ship donttest+=" or test_wheel_includes_cli_scripts" # ignores environment variables @@ -134,7 +134,7 @@ donttest+=" or test_setup_requires_with_distutils_command_dep" donttest+=" or test_setup_requires_with_transitive_extra_dependency" # skip tests that require network access donttest+=" or uses_network" -%pytest -rfE -n auto -k "not ($donttest)" +%pytest -rfE -k "not ($donttest)" %endif %if %{without test}