From 513a306aa5e370404ec2561db6e987e3315d416c208c4ae190fdc4c8af97ccbb Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 7 Oct 2024 14:45:14 +0000 Subject: [PATCH 1/3] WIP OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tox?expand=0&rev=123 --- ...quire-network-access.patch => mark-network-tests.patch | 0 ...process-optional.patch => optional_devpi_process.patch | 0 python-tox.spec | 8 ++++++-- 3 files changed, 6 insertions(+), 2 deletions(-) rename 0002-skip-test-which-require-network-access.patch => mark-network-tests.patch (100%) rename 0001-Make-use-of-devpi_process-optional.patch => optional_devpi_process.patch (100%) diff --git a/0002-skip-test-which-require-network-access.patch b/mark-network-tests.patch similarity index 100% rename from 0002-skip-test-which-require-network-access.patch rename to mark-network-tests.patch diff --git a/0001-Make-use-of-devpi_process-optional.patch b/optional_devpi_process.patch similarity index 100% rename from 0001-Make-use-of-devpi_process-optional.patch rename to optional_devpi_process.patch diff --git a/python-tox.spec b/python-tox.spec index 4e1f54e..ce6a915 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -29,8 +29,12 @@ Summary: Virtualenv-based automation of test activities License: MIT URL: https://github.com/tox-dev/tox Source: https://files.pythonhosted.org/packages/source/t/tox/tox-%{version}.tar.gz -Patch0: 0001-Make-use-of-devpi_process-optional.patch -Patch1: 0002-skip-test-which-require-network-access.patch +# PATCH-FIX-OPENSUSE optional_devpi_process.patch mcepl@suse.com +# Make use devpi_process optional +Patch0: optional_devpi_process.patch +# PATCH-FEATURE-UPSTREAM mark-network-tests.patch mcepl@suse.com +# to skip test which require network access +Patch1: mark-network-tests.patch BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module build >= 0.10.0} BuildRequires: %{python_module cachetools >= 5.3.2} From 1d057c1d8bda08435a78403eae6f05846ad0746574fe3662f6bd6af414b8f0c9 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 8 Oct 2024 19:21:09 +0000 Subject: [PATCH 2/3] - Skip test_skip_develop_mode (gh#tox-dev/tox#3399) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tox?expand=0&rev=124 --- python-tox.changes | 5 +++++ python-tox.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/python-tox.changes b/python-tox.changes index d1f35df..c8c2582 100644 --- a/python-tox.changes +++ b/python-tox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 8 19:20:42 UTC 2024 - Matej Cepl + +- Skip test_skip_develop_mode (gh#tox-dev/tox#3399) + ------------------------------------------------------------------- Wed Mar 27 16:33:24 UTC 2024 - ecsos diff --git a/python-tox.spec b/python-tox.spec index ce6a915..ee444a9 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -151,6 +151,8 @@ donttest+=" or test_python_generate_hash_seed" donttest+=" or test_bad_env_var" # this test doesn't work on Leap donttest+=" or test_package_cmd_builder" +# gh#tox-dev/tox#3399 +donttest+=" or test_skip_develop_mode" %{python_expand # tests expect an active virtualenv with a clean python name as sys.executable virtualenv-%{$python_bin_suffix} --system-site-packages testenv-%{$python_bin_suffix} From d536d4ea8ab175163c98f0c456103b9d3d0a55d9165f45a49032aba3d77aa1f9 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 8 Oct 2024 21:13:46 +0000 Subject: [PATCH 3/3] Record renaming of patches OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tox?expand=0&rev=125 --- python-tox.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/python-tox.changes b/python-tox.changes index c8c2582..e92ff03 100644 --- a/python-tox.changes +++ b/python-tox.changes @@ -2,6 +2,12 @@ Tue Oct 8 19:20:42 UTC 2024 - Matej Cepl - Skip test_skip_develop_mode (gh#tox-dev/tox#3399) +- Rename patches: + - 0001-Make-use-of-devpi_process-optional.patch to optional_devpi_process.patch + - 0002-skip-test-which-require-network-access.patch to mark-network-tests.patch + which removes these two patches: + - 0001-Make-use-of-devpi_process-optional.patch + - 0002-skip-test-which-require-network-access.patch ------------------------------------------------------------------- Wed Mar 27 16:33:24 UTC 2024 - ecsos