From 287a71d29b3e28c3f99ccc9526fea4849b7063dad1726ada30e6a220062e9ef6 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 21 Nov 2024 12:02:25 +0000 Subject: [PATCH] - Skip over the tests which require network. 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="""