From 729fb80108fc55abf4998e83259d9545c8ed31d7c009dac4ab0cb24389539398 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 19 Dec 2021 18:10:33 +0000 Subject: [PATCH 1/3] - Skip the requirementslib tests on python310 too OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=86 --- python-isort.changes | 5 +++++ python-isort.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/python-isort.changes b/python-isort.changes index 21aea69..ac0e5d5 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Dec 19 17:58:05 UTC 2021 - Ben Greiner + +- Skip the requirementslib tests on python310 too + ------------------------------------------------------------------- Sun Nov 14 21:09:12 UTC 2021 - Sebastian Wagner diff --git a/python-isort.spec b/python-isort.spec index 45bd7c0..8f3ee22 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -110,9 +110,10 @@ ignoretests+=" --ignore tests/benchmark" # test_setting_combinations.py::test_isort_is_idempotent # is flaky https://github.com/PyCQA/isort/issues/1466 donttest="(test_setting_combinations and test_isort_is_idempotent)" -# requirementslib is not available yet for python39 +# requirementslib is not available yet for python39 or greater # https://github.com/sarugaku/requirementslib/issues/288 python39_donttest=" or (test_deprecated_finders and test_pipfile_finder)" +python310_donttest="${python39_donttest}" ORIGPATH=$PATH %{python_expand # install isort and required example projects into custom root From fecedaab516f7fb94cd15c689bc0800f4342ed8730c5fccd98676b969d0c5255 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 19 Dec 2021 20:18:00 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=87 --- python-isort.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python-isort.changes b/python-isort.changes index ac0e5d5..9298b6a 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Dec 19 20:17:31 UTC 2021 - Ben Greiner + +- Skip deprecated requirementslib for all flavors + ------------------------------------------------------------------- Sun Dec 19 17:58:05 UTC 2021 - Ben Greiner From 4b602977a48271f5836567f563166955b4541500a63a42b4f49474028542cb73 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 19 Dec 2021 20:19:59 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=88 --- python-isort.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/python-isort.spec b/python-isort.spec index 8f3ee22..7c05eab 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -44,7 +44,6 @@ Requires(postun):update-alternatives Recommends: python-colorama >= 0.4.3 Recommends: python-pip-api Recommends: python-pipreqs -Recommends: python-requirementslib Suggests: git BuildArch: noarch %if %{with test} @@ -60,8 +59,6 @@ BuildRequires: %{python_module poetry} BuildRequires: %{python_module pylama} BuildRequires: %{python_module pytest > 6.0} BuildRequires: %{python_module pytest-mock} -# requirementslib not ready for python 3.9 yet -- gh#sarugaku/requirementslib#288 -BuildRequires: %{python_module requirementslib >= 1.5 if %python-base < 3.9} BuildRequires: git BuildRequires: %{python_module numpy if (%python-base without python36-base)} %endif @@ -110,10 +107,10 @@ ignoretests+=" --ignore tests/benchmark" # test_setting_combinations.py::test_isort_is_idempotent # is flaky https://github.com/PyCQA/isort/issues/1466 donttest="(test_setting_combinations and test_isort_is_idempotent)" -# requirementslib is not available yet for python39 or greater +# requirementslib is not available yet for python 3.9 or greater, +# it's a deprecated finder for isort so we drop it # https://github.com/sarugaku/requirementslib/issues/288 -python39_donttest=" or (test_deprecated_finders and test_pipfile_finder)" -python310_donttest="${python39_donttest}" +donttest+=" or (test_deprecated_finders and test_pipfile_finder)" ORIGPATH=$PATH %{python_expand # install isort and required example projects into custom root