From 17a0d14a63f3f09af2cbd4a03084c2f0e9f3f5fdaf44e73cd35564e03506b4ae Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 10 Aug 2022 14:37:09 +0000 Subject: [PATCH 1/5] - remove unnecessary pylama buildrequires OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=94 --- python-isort.changes | 5 +++++ python-isort.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/python-isort.changes b/python-isort.changes index 008ac2b..4959ae2 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 10 14:36:51 UTC 2022 - Dirk Müller + +- remove unnecessary pylama buildrequires + ------------------------------------------------------------------- Mon Mar 28 17:55:23 UTC 2022 - Ben Greiner diff --git a/python-isort.spec b/python-isort.spec index 8660847..0a8f5a7 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -57,7 +57,6 @@ BuildRequires: %{python_module numpy} BuildRequires: %{python_module pip-api} BuildRequires: %{python_module pipreqs} BuildRequires: %{python_module poetry} -BuildRequires: %{python_module pylama} BuildRequires: %{python_module pytest > 6.0} BuildRequires: %{python_module pytest-mock} BuildRequires: %{python_module toml >= 0.10.2} From 774f2a0c4b00f71ff35d6ab0552ac706b95bb850cb41261a32d5e17098efd70a Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Wed, 10 Aug 2022 14:45:07 +0000 Subject: [PATCH 2/5] ignore pylaman tests OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=95 --- python-isort.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-isort.spec b/python-isort.spec index 0a8f5a7..a40368f 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -109,6 +109,8 @@ sed -i 's/black = "^/black = ">=/' example_isort_formatting_plugin/pyproject.tom ignoretests="--ignore tests/integration/test_projects_using_isort.py" # don't run benchmarks ignoretests+=" --ignore tests/benchmark" +# no pylama +ignoretests+=" --ignore tests/unit/test_pylama_isort.py" # 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)" From 6cb1b0e1928e777c4b3e14a9246b6fe9ed133052a9481b005a91dc13ab4e03dc Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 10 Aug 2022 14:46:26 +0000 Subject: [PATCH 3/5] osc copypac from project:openSUSE:Factory package:python-isort revision:34, using keep-link, using expand OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=96 --- python-isort.changes | 5 ----- python-isort.spec | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/python-isort.changes b/python-isort.changes index 4959ae2..008ac2b 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Aug 10 14:36:51 UTC 2022 - Dirk Müller - -- remove unnecessary pylama buildrequires - ------------------------------------------------------------------- Mon Mar 28 17:55:23 UTC 2022 - Ben Greiner diff --git a/python-isort.spec b/python-isort.spec index a40368f..8660847 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -57,6 +57,7 @@ BuildRequires: %{python_module numpy} BuildRequires: %{python_module pip-api} BuildRequires: %{python_module pipreqs} BuildRequires: %{python_module poetry} +BuildRequires: %{python_module pylama} BuildRequires: %{python_module pytest > 6.0} BuildRequires: %{python_module pytest-mock} BuildRequires: %{python_module toml >= 0.10.2} @@ -109,8 +110,6 @@ sed -i 's/black = "^/black = ">=/' example_isort_formatting_plugin/pyproject.tom ignoretests="--ignore tests/integration/test_projects_using_isort.py" # don't run benchmarks ignoretests+=" --ignore tests/benchmark" -# no pylama -ignoretests+=" --ignore tests/unit/test_pylama_isort.py" # 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)" From a6eb6f18ec12878c3dd15ea9bdc0ae5b1eb49f5668d84d8f773d9dd5568b5be2 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Wed, 10 Aug 2022 15:09:00 +0000 Subject: [PATCH 4/5] remove pylama test import OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=97 --- python-isort.changes | 5 +++++ python-isort.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/python-isort.changes b/python-isort.changes index 008ac2b..4959ae2 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 10 14:36:51 UTC 2022 - Dirk Müller + +- remove unnecessary pylama buildrequires + ------------------------------------------------------------------- Mon Mar 28 17:55:23 UTC 2022 - Ben Greiner diff --git a/python-isort.spec b/python-isort.spec index 8660847..050c1dc 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -92,6 +92,8 @@ hypothesis.settings.register_profile( sed -i 's/natsort = "^/natsort = ">=/' example_isort_sorting_plugin/pyproject.toml # unpin black in example plugin sed -i 's/black = "^/black = ">=/' example_isort_formatting_plugin/pyproject.toml +# don't test pylama plugin +sed -i '/import isort.pylama_isort/d' tests/unit/test_importable.py %build %pyproject_wheel @@ -110,6 +112,8 @@ sed -i 's/black = "^/black = ">=/' example_isort_formatting_plugin/pyproject.tom ignoretests="--ignore tests/integration/test_projects_using_isort.py" # don't run benchmarks ignoretests+=" --ignore tests/benchmark" +# no pylama +ignoretests+=" --ignore tests/unit/test_pylama_isort.py" # 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)" From d799dc108b5b18c17b8bf7ab122fbb65c934fb71f76755802fffff8aa83888b0 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Wed, 10 Aug 2022 15:09:31 +0000 Subject: [PATCH 5/5] . OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=98 --- python-isort.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python-isort.spec b/python-isort.spec index 050c1dc..81bae4e 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -57,7 +57,6 @@ BuildRequires: %{python_module numpy} BuildRequires: %{python_module pip-api} BuildRequires: %{python_module pipreqs} BuildRequires: %{python_module poetry} -BuildRequires: %{python_module pylama} BuildRequires: %{python_module pytest > 6.0} BuildRequires: %{python_module pytest-mock} BuildRequires: %{python_module toml >= 0.10.2} @@ -112,7 +111,7 @@ sed -i '/import isort.pylama_isort/d' tests/unit/test_importable.py ignoretests="--ignore tests/integration/test_projects_using_isort.py" # don't run benchmarks ignoretests+=" --ignore tests/benchmark" -# no pylama +# no pylama in Ring1 desired ignoretests+=" --ignore tests/unit/test_pylama_isort.py" # test_setting_combinations.py::test_isort_is_idempotent # is flaky https://github.com/PyCQA/isort/issues/1466