From 338f5b768274fb5ad8576e0ebb89f58e1388e0cf836979fb5ea0d1037be0b95f Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Tue, 8 Sep 2020 12:27:21 +0000 Subject: [PATCH 1/2] Accepting request 832975 from home:bnavigator:branches:devel:languages:python - Update to 5.5.1 - Version 5.5.0 - Github repo moved to PyCQA/isort - URL moved to https://pycqa.github.io/isort/ OBS-URL: https://build.opensuse.org/request/show/832975 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=60 --- isort-5.4.2-gh.tar.gz | 3 --- isort-5.4.2.tar.gz | 3 --- isort-5.5.1-gh.tar.gz | 3 +++ isort-5.5.1.tar.gz | 3 +++ python-isort.changes | 55 +++++++++++++++++++++++++++++++++++++++++++ python-isort.spec | 14 +++++++---- 6 files changed, 71 insertions(+), 10 deletions(-) delete mode 100644 isort-5.4.2-gh.tar.gz delete mode 100644 isort-5.4.2.tar.gz create mode 100644 isort-5.5.1-gh.tar.gz create mode 100644 isort-5.5.1.tar.gz diff --git a/isort-5.4.2-gh.tar.gz b/isort-5.4.2-gh.tar.gz deleted file mode 100644 index 0160b33..0000000 --- a/isort-5.4.2-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98f3e9a421b98c08ea5bb7a09024c87f3840bb1d851f26bb694e232c159cb274 -size 600210 diff --git a/isort-5.4.2.tar.gz b/isort-5.4.2.tar.gz deleted file mode 100644 index 6f11a88..0000000 --- a/isort-5.4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d488ba1c5a2db721669cc180180d5acf84ebdc5af7827f7aaeaa75f73cf0e2b8 -size 129085 diff --git a/isort-5.5.1-gh.tar.gz b/isort-5.5.1-gh.tar.gz new file mode 100644 index 0000000..bd0a05f --- /dev/null +++ b/isort-5.5.1-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67242f7433db149413e9175eb88ada911ad8d131c0a42c75d2900ea90228f8fd +size 616959 diff --git a/isort-5.5.1.tar.gz b/isort-5.5.1.tar.gz new file mode 100644 index 0000000..5ff24b4 --- /dev/null +++ b/isort-5.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92533892058de0306e51c88f22ece002a209dc8e80288aa3cec6d443060d584f +size 144834 diff --git a/python-isort.changes b/python-isort.changes index 49540c2..267fcfc 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Tue Sep 8 10:45:42 UTC 2020 - Benjamin Greiner + +- Update to 5.5.1 + * Fixed #1454: Ensure indented import sections with import + heading and a preceding comment don't cause import sorting + loops. + * Fixed #1453: isort error when float to top on almost empty + file. + * Fixed #1456 and #1415: noqa comment moved to where flake8 cant + see it. + * Fixed #1460: .svn missing from default ignore list. +- Version 5.5.0 + * Fixed #1398: isort: off comment doesn't work, if it's the top + comment in the file. + * Fixed #1395: reverse_relative setting doesn't have any effect + when combined with force_sort_within_sections. + * Fixed #1399: --skip can error in the case of projects that + contain recursive symlinks. + * Fixed #1389: ensure_newline_before_comments doesn't work if + comment is at top of section and sections don't have lines + between them. + * Fixed #1396: comments in imports with ";" can keep isort from + recognizing import line. + * Fixed #1380: As imports removed when combine_star is set. + * Fixed #1382: --float-to-top has no effect if no import is + already at the top. + * Fixed #1420: isort never settles on module docstring + add + import. + * Fixed #1421: Error raised when repo contains circular symlinks. + * Fixed #1427: noqa comment is moved from star import to constant + import. + * Fixed #1444 & 1445: Incorrect placement of import additions. + * Fixed #1447: isort5 throws error when stdin used on Windows + with deprecated args. + * Implemented #1397: Added support for specifying config file + when using git hook (thanks @diseraluca!). + * Implemented #1405: Added support for coloring diff output. + * Implemented #1434: New multi-line grid mode without + parentheses. + * Goal Zero (Tickets related to aspirational goal of achieving 0 + regressions for remaining 5.0.0 lifespan): + * Implemented #1392: Extensive profile testing. + * Implemented #1393: Proprety based testing applied to code + snippets. + * Implemented #1391: Create automated integration test that + includes full code base of largest OpenSource isort users. + * Potentially breaking change: + Fixed #1429: --check doesn't print to stderr as the + documentation says. This means if you were looking for ERROR: + messages for files that contain incorrect imports within stdout + you will now need to look in stderr. +- Github repo moved to PyCQA/isort +- URL moved to https://pycqa.github.io/isort/ + ------------------------------------------------------------------- Wed Aug 19 17:27:27 UTC 2020 - Benjamin Greiner diff --git a/python-isort.spec b/python-isort.spec index cf2f964..2e22425 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -27,15 +27,15 @@ %endif %define skip_python2 1 Name: python-isort%{psuffix} -Version: 5.4.2 +Version: 5.5.1 Release: 0 Summary: A Python utility / library to sort Python imports License: MIT -URL: https://timothycrosley.github.io/isort/ +URL: https://pycqa.github.io/isort/ # only PyPI archive contains setup.py Source: https://files.pythonhosted.org/packages/source/i/isort/isort-%{version}.tar.gz # ... but test data are not packaged for PyPI, get them from git sources -Source1: https://github.com/timothycrosley/isort/archive/%{version}.tar.gz#/isort-%{version}-gh.tar.gz +Source1: https://github.com/PyCQA/isort/archive/%{version}.tar.gz#/isort-%{version}-gh.tar.gz BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -62,6 +62,7 @@ BuildRequires: %{python_module pip-api} BuildRequires: %{python_module pipreqs} BuildRequires: %{python_module poetry} BuildRequires: %{python_module pylama} +BuildRequires: %{python_module pytest-mock} BuildRequires: %{python_module pytest} BuildRequires: %{python_module requirementslib >= 1.5.4} BuildRequires: %{python_module tomlkit} @@ -117,7 +118,12 @@ for exampledir in example_shared_isort_profile example_isort_formatting_plugin; popd done } -%pytest -W "ignore::UserWarning" -W "ignore::DeprecationWarning" +# test_projects_using_isort.py: these tests try to clone from +# online git repositories. +%{pytest -W "ignore::UserWarning" \ + -W "ignore::DeprecationWarning" \ + --ignore tests/integration/test_projects_using_isort.py +} %endif %if !%{with test} From 846c856f958a495a98da8f28b1cf0098d539fa5f250a109924832a24c6be03d0 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Tue, 8 Sep 2020 14:15:58 +0000 Subject: [PATCH 2/2] - skip a flaky test gh#PyCQA/isort#1466 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=61 --- python-isort.changes | 5 +++++ python-isort.spec | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/python-isort.changes b/python-isort.changes index 267fcfc..b749b3b 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 8 14:08:11 UTC 2020 - Benjamin Greiner + +- skip a flaky test gh#PyCQA/isort#1466 + ------------------------------------------------------------------- Tue Sep 8 10:45:42 UTC 2020 - Benjamin Greiner diff --git a/python-isort.spec b/python-isort.spec index 2e22425..f1f4051 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -120,9 +120,12 @@ done } # test_projects_using_isort.py: these tests try to clone from # online git repositories. +# test_settung_combinations.py::test_isort_is_idempotent +# is flaky https://github.com/PyCQA/isort/issues/1466 %{pytest -W "ignore::UserWarning" \ -W "ignore::DeprecationWarning" \ - --ignore tests/integration/test_projects_using_isort.py + --ignore tests/integration/test_projects_using_isort.py \ + -k "not (test_setting_combinations and test_isort_is_idempotent)" } %endif