From 748666cc4a4b7bff262afbb57a9d6f378252c503e184ee9858cfae9a35b8eee0 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Sat, 4 Jul 2020 12:16:59 +0000 Subject: [PATCH 01/17] - update to version 5.0.2: - Ensured black profile was complete, adding missing line_length definition. - update to version 5.0.1: - Fixed a runtime error in a vendored dependency (toml). - update to version 5.0.0: - Breaking changes: - isort now requires Python 3.6+ to run but continues to support formatting on ALL versions of python including Python 2 code. - isort deprecates official support for Python 3.4, removing modules only in this release from known_standard_library: - user - Config files are no longer composed on-top of each-other. Instead the first config file found is used. - Since there is no longer composition negative form settings (such as --dont-skip) are no longer required and have been removed. - Two-letter shortened setting names (like ac for atomic) now require two dashes to avoid ambiguity: --ac. - For consistency with other tools -v now is shorthand for verbose and -V is shorthand for version. See Issue: #1067. - length_sort_{section_name} config usage has been deprecated. Instead length_sort_sections list can be used to specify a list of sections that need to be length sorted. - safety_excludes and unsafe have been deprecated - Config now includes as default full set of safety directories defined by safety excludes. - --recursive option has been removed. Directories passed in are now automatically sorted recursive. - --apply option has been removed as it is the default behaviour. - isort now does nothing, beyond giving instructions and exiting status code 0, when ran with no arguments. - a new --interactive flag has been added to enable the old style behaviour. - isort now works on contiguous sections of imports, instead of one whole file at a time. - isort now formats all nested "as" imports in the "from" form. import x.y as a becomes from x import y as a. - keep_direct_and_as_imports option now defaults to True. - appdirs is no longer supported. Unless manually specified, config should be project config only. - toml is now installed as a vendorized module, meaning pyproject.toml based config is always supported. - Completely new Python API, old version is removed and no longer accessible. - New module placement logic and module fully replaces old finders. Old approach is still available via --old-finders. - Internal: - isort now utilizes mypy and typing to filter out typing related issues before deployment. - isort now utilizes black internally to ensure more consistent formatting. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=38 --- isort-4.3.21.tar.gz | 3 --- isort-5.0.2.tar.gz | 3 +++ python-isort.changes | 36 ++++++++++++++++++++++++++++++++++++ python-isort.spec | 2 +- 4 files changed, 40 insertions(+), 4 deletions(-) delete mode 100644 isort-4.3.21.tar.gz create mode 100644 isort-5.0.2.tar.gz diff --git a/isort-4.3.21.tar.gz b/isort-4.3.21.tar.gz deleted file mode 100644 index 4fd0f25..0000000 --- a/isort-4.3.21.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1 -size 69546 diff --git a/isort-5.0.2.tar.gz b/isort-5.0.2.tar.gz new file mode 100644 index 0000000..f0329b1 --- /dev/null +++ b/isort-5.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba8e494fc13974ec02a623c4aaead306bb86a3102a1df8d399748445f32a78f2 +size 78980 diff --git a/python-isort.changes b/python-isort.changes index 9694aab..a7652aa 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Sat Jul 4 12:16:25 UTC 2020 - Sebastian Wagner + +- update to version 5.0.2: + - Ensured black profile was complete, adding missing line_length definition. +- update to version 5.0.1: + - Fixed a runtime error in a vendored dependency (toml). +- update to version 5.0.0: + - Breaking changes: + - isort now requires Python 3.6+ to run but continues to support formatting on ALL versions of python including Python 2 code. + - isort deprecates official support for Python 3.4, removing modules only in this release from known_standard_library: + - user + - Config files are no longer composed on-top of each-other. Instead the first config file found is used. + - Since there is no longer composition negative form settings (such as --dont-skip) are no longer required and have been removed. + - Two-letter shortened setting names (like ac for atomic) now require two dashes to avoid ambiguity: --ac. + - For consistency with other tools -v now is shorthand for verbose and -V is shorthand for version. See Issue: #1067. + - length_sort_{section_name} config usage has been deprecated. Instead length_sort_sections list can be used to specify a list of sections that need to be length sorted. + - safety_excludes and unsafe have been deprecated + - Config now includes as default full set of safety directories defined by safety excludes. + - --recursive option has been removed. Directories passed in are now automatically sorted recursive. + - --apply option has been removed as it is the default behaviour. + - isort now does nothing, beyond giving instructions and exiting status code 0, when ran with no arguments. + - a new --interactive flag has been added to enable the old style behaviour. + - isort now works on contiguous sections of imports, instead of one whole file at a time. + - isort now formats all nested "as" imports in the "from" form. import x.y as a becomes from x import y as a. + - keep_direct_and_as_imports option now defaults to True. + - appdirs is no longer supported. Unless manually specified, config should be project config only. + - toml is now installed as a vendorized module, meaning pyproject.toml based config is always supported. + - Completely new Python API, old version is removed and no longer accessible. + - New module placement logic and module fully replaces old finders. Old approach is still available via --old-finders. + - Internal: + - isort now utilizes mypy and typing to filter out typing related issues before deployment. + - isort now utilizes black internally to ensure more consistent formatting. + - profile support for common project types (black, django, google, etc) + - Much much more. There is some difficulty in fully capturing the extent of changes in this release - just because of how all encompassing the release is. See: Github Issues for more. + ------------------------------------------------------------------- Mon May 25 10:59:30 UTC 2020 - Petr Gajdos diff --git a/python-isort.spec b/python-isort.spec index 0d9c42f..f6057e9 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -27,7 +27,7 @@ %endif %bcond_without python2 Name: python-isort%{psuffix} -Version: 4.3.21 +Version: 5.0.2 Release: 0 Summary: A Python utility / library to sort Python imports License: MIT From 34bd277513860adee5ec474a7beb8ce362b9304ce73de70e8c2ddc217dfdf80d Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Sun, 5 Jul 2020 11:37:24 +0000 Subject: [PATCH 02/17] - Update to version 5.0.3: - Fixed setup.py command incorrectly passing check=True as a configuration parameter (see: https://github.com/timothycrosley/isort/issues/1258) - Fixed missing patch version - Fixed issue #1253: Atomic fails when passed in not readable output stream OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=39 --- isort-5.0.2.tar.gz | 3 --- isort-5.0.3.tar.gz | 3 +++ python-isort.changes | 8 ++++++++ python-isort.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 isort-5.0.2.tar.gz create mode 100644 isort-5.0.3.tar.gz diff --git a/isort-5.0.2.tar.gz b/isort-5.0.2.tar.gz deleted file mode 100644 index f0329b1..0000000 --- a/isort-5.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba8e494fc13974ec02a623c4aaead306bb86a3102a1df8d399748445f32a78f2 -size 78980 diff --git a/isort-5.0.3.tar.gz b/isort-5.0.3.tar.gz new file mode 100644 index 0000000..16be6c8 --- /dev/null +++ b/isort-5.0.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c48d4cd773a6226baaaa176839e6f7ff82ef7c7842f6c54374fe2b14df4024b +size 79012 diff --git a/python-isort.changes b/python-isort.changes index a7652aa..7adb135 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Jul 5 11:36:46 UTC 2020 - Sebastian Wagner + +- Update to version 5.0.3: + - Fixed setup.py command incorrectly passing check=True as a configuration parameter (see: https://github.com/timothycrosley/isort/issues/1258) + - Fixed missing patch version + - Fixed issue #1253: Atomic fails when passed in not readable output stream + ------------------------------------------------------------------- Sat Jul 4 12:16:25 UTC 2020 - Sebastian Wagner diff --git a/python-isort.spec b/python-isort.spec index f6057e9..88f243e 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -27,7 +27,7 @@ %endif %bcond_without python2 Name: python-isort%{psuffix} -Version: 5.0.2 +Version: 5.0.3 Release: 0 Summary: A Python utility / library to sort Python imports License: MIT From 56f1a4bec7589ece6b033ef011a0f3691d9dabea018c81e2bbcc8e1d0e581174 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Sun, 12 Jul 2020 15:15:00 +0000 Subject: [PATCH 03/17] - Update to version 5.0.9: - Fixed #1301: Import headings in nested sections leads to check errors - Update to version 5.0.8: - Fixed #1277 & #1278: New line detection issues on Windows. - Fixed #1294: Fix bundled git hook. - Update to version 5.0.7: - Fixed #1306: unexpected --diff behavior. - Fixed #1279: Fixed NOQA comment regression. - Update to version 5.0.6: - Fixed #1302: comments and --trailing-comma can generate invalid code. - Fixed #1293: extra new line in indented imports, when immediately followed by a comment. - Fixed #1304: isort 5 no longer recognises sre_parse as a stdlib module. - Fixed #1300: add_imports moves comments following import section. - Fixed #1276: Fix a bug that creates only one line after triple quotes. - Update to version 5.0.5: - Fixed #1285: packaging issue with bundling tests via poetry. - Fixed #1284: Regression when sorting .pyi files from CLI using black profile. - Fixed #1275 & #1283: Blank line after docstring removed. - Fixed #1298: CLI Help out of date with isort 5. - Fixed #1290: Unecessary blank lines above nested imports when import comments turned on. - Fixed #1297: Usage of --add-imports alongside --check is broken. - Fixed #1289: Stream usage no longer auto picking up config file from current working directory. - Fixed #1296: Force_single_line setting removes immediately following comment line. - Fixed #1295: ensure_newline_before_comments doesnt work with force_sort_within_sections. - Setting not_skip will no longer immediately fail but instead give user a warning and direct to upgrade docs. - Update to version 5.0.4: - Fixed #1264: a regression with comment handling and force_sort_within_sections config option - Added warning for deprecated CLI flags and linked to upgrade guide. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=40 --- isort-5.0.3.tar.gz | 3 --- isort-5.0.9.tar.gz | 3 +++ python-isort.changes | 32 ++++++++++++++++++++++++++++++++ python-isort.spec | 2 +- 4 files changed, 36 insertions(+), 4 deletions(-) delete mode 100644 isort-5.0.3.tar.gz create mode 100644 isort-5.0.9.tar.gz diff --git a/isort-5.0.3.tar.gz b/isort-5.0.3.tar.gz deleted file mode 100644 index 16be6c8..0000000 --- a/isort-5.0.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c48d4cd773a6226baaaa176839e6f7ff82ef7c7842f6c54374fe2b14df4024b -size 79012 diff --git a/isort-5.0.9.tar.gz b/isort-5.0.9.tar.gz new file mode 100644 index 0000000..4a03ccc --- /dev/null +++ b/isort-5.0.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:639b8084644ceb13a806f42d690273b9d844793ac2f515fbc575ba65dc044de0 +size 77522 diff --git a/python-isort.changes b/python-isort.changes index 7adb135..0e7c89e 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Sun Jul 12 15:01:26 UTC 2020 - Sebastian Wagner + +- Update to version 5.0.9: + - Fixed #1301: Import headings in nested sections leads to check errors +- Update to version 5.0.8: + - Fixed #1277 & #1278: New line detection issues on Windows. + - Fixed #1294: Fix bundled git hook. +- Update to version 5.0.7: + - Fixed #1306: unexpected --diff behavior. + - Fixed #1279: Fixed NOQA comment regression. +- Update to version 5.0.6: + - Fixed #1302: comments and --trailing-comma can generate invalid code. + - Fixed #1293: extra new line in indented imports, when immediately followed by a comment. + - Fixed #1304: isort 5 no longer recognises sre_parse as a stdlib module. + - Fixed #1300: add_imports moves comments following import section. + - Fixed #1276: Fix a bug that creates only one line after triple quotes. +- Update to version 5.0.5: + - Fixed #1285: packaging issue with bundling tests via poetry. + - Fixed #1284: Regression when sorting .pyi files from CLI using black profile. + - Fixed #1275 & #1283: Blank line after docstring removed. + - Fixed #1298: CLI Help out of date with isort 5. + - Fixed #1290: Unecessary blank lines above nested imports when import comments turned on. + - Fixed #1297: Usage of --add-imports alongside --check is broken. + - Fixed #1289: Stream usage no longer auto picking up config file from current working directory. + - Fixed #1296: Force_single_line setting removes immediately following comment line. + - Fixed #1295: ensure_newline_before_comments doesnt work with force_sort_within_sections. + - Setting not_skip will no longer immediately fail but instead give user a warning and direct to upgrade docs. +- Update to version 5.0.4: + - Fixed #1264: a regression with comment handling and force_sort_within_sections config option + - Added warning for deprecated CLI flags and linked to upgrade guide. + ------------------------------------------------------------------- Sun Jul 5 11:36:46 UTC 2020 - Sebastian Wagner diff --git a/python-isort.spec b/python-isort.spec index 88f243e..3c25a2a 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -27,7 +27,7 @@ %endif %bcond_without python2 Name: python-isort%{psuffix} -Version: 5.0.3 +Version: 5.0.9 Release: 0 Summary: A Python utility / library to sort Python imports License: MIT From be652da2d955742c3a6a74a8ffbd501bbd0ba10c6679524372f4bbf33c7d4d86 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 13 Jul 2020 19:54:31 +0000 Subject: [PATCH 04/17] Accepting request 820730 from home:bnavigator:branches:devel:languages:python - the tests are not packaged on PyPI. Use github sources. (Need to reference commit directly (gh#timothycrosley/isort#1316) - update test requirements - reenable most passing tests except one (gh#timothycrosley/isort#1317) - update package description - new version does not build/test on Python 2 (define skip for older distros) OBS-URL: https://build.opensuse.org/request/show/820730 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=41 --- isort-5.0.9-gh.tar.gz | 3 +++ python-isort.changes | 10 ++++++++ python-isort.spec | 58 +++++++++++++++++++++++-------------------- 3 files changed, 44 insertions(+), 27 deletions(-) create mode 100644 isort-5.0.9-gh.tar.gz diff --git a/isort-5.0.9-gh.tar.gz b/isort-5.0.9-gh.tar.gz new file mode 100644 index 0000000..b7d16bd --- /dev/null +++ b/isort-5.0.9-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da05b6cfa4107d71c0fddee8e58a55cbd02d0dd1e2145ad2ccae6c4faf92da34 +size 570386 diff --git a/python-isort.changes b/python-isort.changes index 0e7c89e..03cbb22 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jul 13 17:03:27 UTC 2020 - Benjamin Greiner + +- the tests are not packaged on PyPI. Use github sources. (Need to + reference commit directly (gh#timothycrosley/isort#1316) +- update test requirements +- reenable most passing tests except one (gh#timothycrosley/isort#1317) +- update package description +- new version does not build/test on Python 2 (define skip for older distros) + ------------------------------------------------------------------- Sun Jul 12 15:01:26 UTC 2020 - Sebastian Wagner diff --git a/python-isort.spec b/python-isort.spec index 3c25a2a..64a8bfa 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -25,73 +25,76 @@ %define psuffix %{nil} %bcond_with test %endif -%bcond_without python2 +%define skip_python2 1 +# commit for release 5.0.9, tag is invalid. gh#timothycrosley/isort#1316 +%define gitref b49aba99b919473b66f05b663588cfac2472c601 Name: python-isort%{psuffix} Version: 5.0.9 Release: 0 Summary: A Python utility / library to sort Python imports License: MIT -URL: https://github.com/timothycrosley/isort +URL: https://timothycrosley.github.io/isort/ Source: https://files.pythonhosted.org/packages/source/i/isort/isort-%{version}.tar.gz +# tests are not packaged for PyPI, get them from git sources +Source1: https://github.com/timothycrosley/isort/archive/%{gitref}.tar.gz#/isort-%{version}-gh.tar.gz BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-setuptools Requires(post): update-alternatives Requires(postun): update-alternatives -Recommends: python-appdirs >= 1.4.0 -Recommends: python-pip +Recommends: python-pip-api Recommends: python-pipreqs Recommends: python-requirementslib -Recommends: python-toml +Recommends: python-tomlkit BuildArch: noarch -%if %{with python2} -BuildRequires: python-backports.functools_lru_cache -BuildRequires: python-futures -%endif %if %{with test} -BuildRequires: %{python_module appdirs >= 1.4.0} +BuildRequires: %{python_module hypothesis-auto} +BuildRequires: %{python_module isort = %{version}} BuildRequires: %{python_module mock} +BuildRequires: %{python_module pip-api} BuildRequires: %{python_module pipreqs} -BuildRequires: %{python_module pip} BuildRequires: %{python_module pylama} BuildRequires: %{python_module pytest} BuildRequires: %{python_module requirementslib} -BuildRequires: %{python_module toml} -%endif -%ifpython2 -Requires: python-backports.functools_lru_cache -Requires: python-futures +BuildRequires: %{python_module tomlkit} %endif %python_subpackages %description isort your python imports for you so you don’t have to. -isort is a Python utility / library to sort imports alphabetically, -and automatically separated into sections. It provides a command line -utility, Python library and plugins for various editors to quickly -sort all your imports. It currently cleanly supports Python 2.7 - 3.6 without -any dependencies. +isort is a Python utility / library to sort imports alphabetically, and +automatically separated into sections and by type. It provides a command line +utility, Python library and plugins for various editors to quickly sort all your +imports. It requires Python 3.6+ to run but supports formatting Python 2 code +too. %prep +%if !%{with test} %setup -q -n isort-%{version} chmod -x LICENSE +%else +%setup -q -n isort-%{gitref} -b 1 +%endif +%if !%{with test} %build %python_build %install -%if !%{with test} %python_install %python_clone -a %{buildroot}%{_bindir}/isort %python_expand %fdupes %{buildroot}%{$python_sitelib} %endif -%check -# test_pipfile_finder - broken upstrem in tomlkit %if %{with test} -%pytest -k 'not (test_settings_path_skip_issue_909 or test_standard_library_deprecates_user_issue_778 or test_skip_paths_issue_938 or test_requirements_finder or test_pipfile_finder)' +%check +# test_pipfile_finder: gh#timothycrosley/isort#1317 +%{pytest -v -W "ignore::UserWarning" \ + -W "ignore::DeprecationWarning" \ + -k "not test_pipfile_finder" +} %endif %if !%{with test} @@ -102,9 +105,10 @@ chmod -x LICENSE %python_uninstall_alternative isort %files %{python_files} -%{python_sitelib}/isort* -%python_alternative %{_bindir}/isort %license LICENSE +%python_alternative %{_bindir}/isort +%{python_sitelib}/isort +%{python_sitelib}/isort-%{version}-py*.egg-info %endif %changelog From 8497d09f33cc358d3f2a1596ccce67ca80fa9549dbe320213022a88d927ee84f Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Tue, 14 Jul 2020 15:51:34 +0000 Subject: [PATCH 05/17] Accepting request 820947 from home:bnavigator:branches:devel:languages:python - reenable test_pipfile_finder needs updated requirementslib gh#timothycrosley/isort#1317 (according to requirementslib changelog probably by fix in 1.5.4) - upstream git tag has been updated OBS-URL: https://build.opensuse.org/request/show/820947 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=42 --- isort-5.0.9-gh.tar.gz | 4 ++-- python-isort.changes | 8 ++++++++ python-isort.spec | 16 +++++----------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/isort-5.0.9-gh.tar.gz b/isort-5.0.9-gh.tar.gz index b7d16bd..4278901 100644 --- a/isort-5.0.9-gh.tar.gz +++ b/isort-5.0.9-gh.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da05b6cfa4107d71c0fddee8e58a55cbd02d0dd1e2145ad2ccae6c4faf92da34 -size 570386 +oid sha256:e6db7a74c53307c1fa7912216fa576ef1108bdae81f8d7cea287bd58ba6989b1 +size 570148 diff --git a/python-isort.changes b/python-isort.changes index 03cbb22..3ffb3e9 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jul 14 13:53:34 UTC 2020 - Benjamin Greiner + +- reenable test_pipfile_finder + needs updated requirementslib gh#timothycrosley/isort#1317 + (according to requirementslib changelog probably by fix in 1.5.4) +- upstream git tag has been updated + ------------------------------------------------------------------- Mon Jul 13 17:03:27 UTC 2020 - Benjamin Greiner diff --git a/python-isort.spec b/python-isort.spec index 64a8bfa..124678f 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -26,8 +26,6 @@ %bcond_with test %endif %define skip_python2 1 -# commit for release 5.0.9, tag is invalid. gh#timothycrosley/isort#1316 -%define gitref b49aba99b919473b66f05b663588cfac2472c601 Name: python-isort%{psuffix} Version: 5.0.9 Release: 0 @@ -36,7 +34,7 @@ License: MIT URL: https://timothycrosley.github.io/isort/ Source: https://files.pythonhosted.org/packages/source/i/isort/isort-%{version}.tar.gz # tests are not packaged for PyPI, get them from git sources -Source1: https://github.com/timothycrosley/isort/archive/%{gitref}.tar.gz#/isort-%{version}-gh.tar.gz +Source1: https://github.com/timothycrosley/isort/archive/%{version}.tar.gz#/isort-%{version}-gh.tar.gz BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -45,7 +43,7 @@ Requires(post): update-alternatives Requires(postun): update-alternatives Recommends: python-pip-api Recommends: python-pipreqs -Recommends: python-requirementslib +Recommends: python-requirementslib >= 1.5.4 Recommends: python-tomlkit BuildArch: noarch %if %{with test} @@ -56,7 +54,7 @@ BuildRequires: %{python_module pip-api} BuildRequires: %{python_module pipreqs} BuildRequires: %{python_module pylama} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module requirementslib} +BuildRequires: %{python_module requirementslib >= 1.5.4} BuildRequires: %{python_module tomlkit} %endif %python_subpackages @@ -75,7 +73,7 @@ too. %setup -q -n isort-%{version} chmod -x LICENSE %else -%setup -q -n isort-%{gitref} -b 1 +%setup -q -n isort-%{version} -b 1 %endif %if !%{with test} @@ -90,11 +88,7 @@ chmod -x LICENSE %if %{with test} %check -# test_pipfile_finder: gh#timothycrosley/isort#1317 -%{pytest -v -W "ignore::UserWarning" \ - -W "ignore::DeprecationWarning" \ - -k "not test_pipfile_finder" -} +%pytest -v -W "ignore::UserWarning" -W "ignore::DeprecationWarning" %endif %if !%{with test} From 01f3c6af969610a87f5291dc2d1a346e698dc8322e66df420a23ee9ff4f041ac Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 15 Jul 2020 20:23:05 +0000 Subject: [PATCH 06/17] - update to version 5.1.0: - isort now throws an exception if an invalid settings path is given (issue #1174). - Implemented support for automatic redundant alias removal (issue #1281). - Implemented experimental support for floating all imports to the top of a file (issue #1228) - Fixed #1178: support for semicolons in decorators. - Fixed #1315: Extra newline before comment with -n + --fss. - Fixed #1192: -k or --keep-direct-and-as-imports option has been deprecated as it is now always on. - Formatting changes implied: - Fixed #1280: rewrite of as imports changes the behavior of the imports. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=43 --- isort-5.0.9-gh.tar.gz | 3 --- isort-5.0.9.tar.gz | 3 --- isort-5.1.0-gh.tar.gz | 3 +++ isort-5.1.0.tar.gz | 3 +++ python-isort.changes | 13 +++++++++++++ python-isort.spec | 3 ++- 6 files changed, 21 insertions(+), 7 deletions(-) delete mode 100644 isort-5.0.9-gh.tar.gz delete mode 100644 isort-5.0.9.tar.gz create mode 100644 isort-5.1.0-gh.tar.gz create mode 100644 isort-5.1.0.tar.gz diff --git a/isort-5.0.9-gh.tar.gz b/isort-5.0.9-gh.tar.gz deleted file mode 100644 index 4278901..0000000 --- a/isort-5.0.9-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6db7a74c53307c1fa7912216fa576ef1108bdae81f8d7cea287bd58ba6989b1 -size 570148 diff --git a/isort-5.0.9.tar.gz b/isort-5.0.9.tar.gz deleted file mode 100644 index 4a03ccc..0000000 --- a/isort-5.0.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:639b8084644ceb13a806f42d690273b9d844793ac2f515fbc575ba65dc044de0 -size 77522 diff --git a/isort-5.1.0-gh.tar.gz b/isort-5.1.0-gh.tar.gz new file mode 100644 index 0000000..98ac047 --- /dev/null +++ b/isort-5.1.0-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b51a38cf1c3831ba90471bdcac968e45744f2eaa140bd8b04c4c76d8b45c70ca +size 573445 diff --git a/isort-5.1.0.tar.gz b/isort-5.1.0.tar.gz new file mode 100644 index 0000000..961367c --- /dev/null +++ b/isort-5.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b19b7ebce5e292507afa8fab30dd666011dd5ae8f4ef2a2d431751dc84c22140 +size 115672 diff --git a/python-isort.changes b/python-isort.changes index 3ffb3e9..3dfbbee 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Jul 15 20:21:55 UTC 2020 - Sebastian Wagner + +- update to version 5.1.0: + - isort now throws an exception if an invalid settings path is given (issue #1174). + - Implemented support for automatic redundant alias removal (issue #1281). + - Implemented experimental support for floating all imports to the top of a file (issue #1228) + - Fixed #1178: support for semicolons in decorators. + - Fixed #1315: Extra newline before comment with -n + --fss. + - Fixed #1192: -k or --keep-direct-and-as-imports option has been deprecated as it is now always on. + - Formatting changes implied: + - Fixed #1280: rewrite of as imports changes the behavior of the imports. + ------------------------------------------------------------------- Tue Jul 14 13:53:34 UTC 2020 - Benjamin Greiner diff --git a/python-isort.spec b/python-isort.spec index 124678f..02d98bc 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -27,7 +27,7 @@ %endif %define skip_python2 1 Name: python-isort%{psuffix} -Version: 5.0.9 +Version: 5.1.0 Release: 0 Summary: A Python utility / library to sort Python imports License: MIT @@ -82,6 +82,7 @@ chmod -x LICENSE %install %python_install +%python_expand rm -r %{buildroot}%{$python_sitelib}/tests/ %python_clone -a %{buildroot}%{_bindir}/isort %python_expand %fdupes %{buildroot}%{$python_sitelib} %endif From 38b1aa47e1d8b81c40061370331d20c3c4a97865d26250b7f089bd7de3009cc4 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Sat, 18 Jul 2020 10:17:45 +0000 Subject: [PATCH 07/17] - update to version 5.1.2: - Fixed issue #1219 / #1326: Comments not wrapped for long lines - Fixed issue #1156: Bug related to isort:skip usage followed by a multiline comment block - update to version 5.1.1: - Fixed issue #1322: Occasionally two extra newlines before comment with `-n` & `--fss`. - Fixed issue #1189: `--diff` broken when reading from standard input. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=44 --- isort-5.1.0-gh.tar.gz | 3 --- isort-5.1.0.tar.gz | 3 --- isort-5.1.2-gh.tar.gz | 3 +++ isort-5.1.2.tar.gz | 3 +++ python-isort.changes | 10 ++++++++++ python-isort.spec | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 isort-5.1.0-gh.tar.gz delete mode 100644 isort-5.1.0.tar.gz create mode 100644 isort-5.1.2-gh.tar.gz create mode 100644 isort-5.1.2.tar.gz diff --git a/isort-5.1.0-gh.tar.gz b/isort-5.1.0-gh.tar.gz deleted file mode 100644 index 98ac047..0000000 --- a/isort-5.1.0-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b51a38cf1c3831ba90471bdcac968e45744f2eaa140bd8b04c4c76d8b45c70ca -size 573445 diff --git a/isort-5.1.0.tar.gz b/isort-5.1.0.tar.gz deleted file mode 100644 index 961367c..0000000 --- a/isort-5.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b19b7ebce5e292507afa8fab30dd666011dd5ae8f4ef2a2d431751dc84c22140 -size 115672 diff --git a/isort-5.1.2-gh.tar.gz b/isort-5.1.2-gh.tar.gz new file mode 100644 index 0000000..c717ae4 --- /dev/null +++ b/isort-5.1.2-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60d4bc187ad3890e7223aa3d6d2bfebd295d8354e208a881e7f38b5e05176931 +size 574225 diff --git a/isort-5.1.2.tar.gz b/isort-5.1.2.tar.gz new file mode 100644 index 0000000..cbc8421 --- /dev/null +++ b/isort-5.1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64022dea6a06badfa09b300b4dfe8ba968114a737919e8ed50aea1c288f078aa +size 116458 diff --git a/python-isort.changes b/python-isort.changes index 3dfbbee..822c42a 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Jul 18 10:11:56 UTC 2020 - Sebastian Wagner + +- update to version 5.1.2: + - Fixed issue #1219 / #1326: Comments not wrapped for long lines + - Fixed issue #1156: Bug related to isort:skip usage followed by a multiline comment block +- update to version 5.1.1: + - Fixed issue #1322: Occasionally two extra newlines before comment with `-n` & `--fss`. + - Fixed issue #1189: `--diff` broken when reading from standard input. + ------------------------------------------------------------------- Wed Jul 15 20:21:55 UTC 2020 - Sebastian Wagner diff --git a/python-isort.spec b/python-isort.spec index 02d98bc..8641e8c 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -27,7 +27,7 @@ %endif %define skip_python2 1 Name: python-isort%{psuffix} -Version: 5.1.0 +Version: 5.1.2 Release: 0 Summary: A Python utility / library to sort Python imports License: MIT From d95d54a857d66f2a6c611910a39fa62f316e82b10dc467b57ada3b801d7d303a Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 19 Jul 2020 13:44:18 +0000 Subject: [PATCH 08/17] - update to version 5.1.3 * Fixed issue #1329: Fix comments duplicated when --fass option is set. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=45 --- isort-5.1.2-gh.tar.gz | 3 --- isort-5.1.2.tar.gz | 3 --- isort-5.1.3-gh.tar.gz | 3 +++ isort-5.1.3.tar.gz | 3 +++ python-isort.changes | 6 ++++++ python-isort.spec | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 isort-5.1.2-gh.tar.gz delete mode 100644 isort-5.1.2.tar.gz create mode 100644 isort-5.1.3-gh.tar.gz create mode 100644 isort-5.1.3.tar.gz diff --git a/isort-5.1.2-gh.tar.gz b/isort-5.1.2-gh.tar.gz deleted file mode 100644 index c717ae4..0000000 --- a/isort-5.1.2-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60d4bc187ad3890e7223aa3d6d2bfebd295d8354e208a881e7f38b5e05176931 -size 574225 diff --git a/isort-5.1.2.tar.gz b/isort-5.1.2.tar.gz deleted file mode 100644 index cbc8421..0000000 --- a/isort-5.1.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64022dea6a06badfa09b300b4dfe8ba968114a737919e8ed50aea1c288f078aa -size 116458 diff --git a/isort-5.1.3-gh.tar.gz b/isort-5.1.3-gh.tar.gz new file mode 100644 index 0000000..b88fd3a --- /dev/null +++ b/isort-5.1.3-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d6ffb6bf3e1dd7f151337c3d70d96b4f5a013049ff2c6a856314cafdccd6377 +size 574378 diff --git a/isort-5.1.3.tar.gz b/isort-5.1.3.tar.gz new file mode 100644 index 0000000..43e7d84 --- /dev/null +++ b/isort-5.1.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9be41d107294ddf25ef6af83979cb3dfa1b5752311b6d50611c8f8d321d4a4eb +size 116609 diff --git a/python-isort.changes b/python-isort.changes index 822c42a..272c9fc 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jul 19 13:39:26 UTC 2020 - Benjamin Greiner + +- update to version 5.1.3 + * Fixed issue #1329: Fix comments duplicated when --fass option is set. + ------------------------------------------------------------------- Sat Jul 18 10:11:56 UTC 2020 - Sebastian Wagner diff --git a/python-isort.spec b/python-isort.spec index 8641e8c..b5c4aae 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -27,7 +27,7 @@ %endif %define skip_python2 1 Name: python-isort%{psuffix} -Version: 5.1.2 +Version: 5.1.3 Release: 0 Summary: A Python utility / library to sort Python imports License: MIT From 84d8df981c9f19273aa1025e14aa20d0c5b5c1670d4450fdddbd176dc63907ca Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 20 Jul 2020 18:46:07 +0000 Subject: [PATCH 09/17] - update to version 5.1.4: - Fixed issue #1333: Use of wrap_length raises an exception about it not being lower or equal to line_length. - Fixed issue #1330: Ensure stdout can be stubbed dynamically for `show_unified_diff` function. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=46 --- isort-5.1.3-gh.tar.gz | 3 --- isort-5.1.3.tar.gz | 3 --- isort-5.1.4-gh.tar.gz | 3 +++ isort-5.1.4.tar.gz | 3 +++ python-isort.changes | 7 +++++++ python-isort.spec | 2 +- 6 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 isort-5.1.3-gh.tar.gz delete mode 100644 isort-5.1.3.tar.gz create mode 100644 isort-5.1.4-gh.tar.gz create mode 100644 isort-5.1.4.tar.gz diff --git a/isort-5.1.3-gh.tar.gz b/isort-5.1.3-gh.tar.gz deleted file mode 100644 index b88fd3a..0000000 --- a/isort-5.1.3-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d6ffb6bf3e1dd7f151337c3d70d96b4f5a013049ff2c6a856314cafdccd6377 -size 574378 diff --git a/isort-5.1.3.tar.gz b/isort-5.1.3.tar.gz deleted file mode 100644 index 43e7d84..0000000 --- a/isort-5.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9be41d107294ddf25ef6af83979cb3dfa1b5752311b6d50611c8f8d321d4a4eb -size 116609 diff --git a/isort-5.1.4-gh.tar.gz b/isort-5.1.4-gh.tar.gz new file mode 100644 index 0000000..0632cbb --- /dev/null +++ b/isort-5.1.4-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd83dee45b732f0e046165126f16988af70585559f509c1a649e845c3aa83aad +size 575483 diff --git a/isort-5.1.4.tar.gz b/isort-5.1.4.tar.gz new file mode 100644 index 0000000..c421374 --- /dev/null +++ b/isort-5.1.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:145072eedc4927cc9c1f9478f2d83b2fc1e6469df4129c02ef4e8c742207a46c +size 116848 diff --git a/python-isort.changes b/python-isort.changes index 272c9fc..635b6e6 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jul 20 18:44:08 UTC 2020 - Sebastian Wagner + +- update to version 5.1.4: + - Fixed issue #1333: Use of wrap_length raises an exception about it not being lower or equal to line_length. + - Fixed issue #1330: Ensure stdout can be stubbed dynamically for `show_unified_diff` function. + ------------------------------------------------------------------- Sun Jul 19 13:39:26 UTC 2020 - Benjamin Greiner diff --git a/python-isort.spec b/python-isort.spec index b5c4aae..32a4270 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -27,7 +27,7 @@ %endif %define skip_python2 1 Name: python-isort%{psuffix} -Version: 5.1.3 +Version: 5.1.4 Release: 0 Summary: A Python utility / library to sort Python imports License: MIT From 03cf85a92a4b91918407c632bd20fb575fe38c339b31e8e4402164d9e4d22989 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 27 Jul 2020 20:36:16 +0000 Subject: [PATCH 10/17] - update to version 5.2.0: - Implemented #1335: Official API for diff capturing. - Implemented #1331: Warn when sections don't match up. - Implemented #1261: By popular demand, `filter_files` can now be set in the config option. - Implemented #960: Support for respecting git ignore via "--gitignore" or "skip_gitignore=True". - Implemented #727: Ability to only add imports if existing imports exist. - Implemented #970: Support for custom sharable isort profiles. - Implemented #1214: Added support for git_hook lazy option (Thanks @sztamas!) - Implemented #941: Added an additional `multi_line_output` mode for more compact formatting (Thanks @sztamas!) - Implemented #1020: Option for LOCALFOLDER. - Implemented #1353: Added support for output formatting plugins. - `# isort: split` can now be used at the end of an import line. - Fixed #1339: Extra indent is not preserved when isort:skip is used in nested imports. - Fixed #1348: `--diff` works incorrectly with files that have CRLF line endings. - Improved code repositories usage of pylint tags (#1350). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=47 --- isort-5.1.4-gh.tar.gz | 3 --- isort-5.1.4.tar.gz | 3 --- isort-5.2.0-gh.tar.gz | 3 +++ isort-5.2.0.tar.gz | 3 +++ python-isort.changes | 19 +++++++++++++++++++ python-isort.spec | 2 +- 6 files changed, 26 insertions(+), 7 deletions(-) delete mode 100644 isort-5.1.4-gh.tar.gz delete mode 100644 isort-5.1.4.tar.gz create mode 100644 isort-5.2.0-gh.tar.gz create mode 100644 isort-5.2.0.tar.gz diff --git a/isort-5.1.4-gh.tar.gz b/isort-5.1.4-gh.tar.gz deleted file mode 100644 index 0632cbb..0000000 --- a/isort-5.1.4-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd83dee45b732f0e046165126f16988af70585559f509c1a649e845c3aa83aad -size 575483 diff --git a/isort-5.1.4.tar.gz b/isort-5.1.4.tar.gz deleted file mode 100644 index c421374..0000000 --- a/isort-5.1.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:145072eedc4927cc9c1f9478f2d83b2fc1e6469df4129c02ef4e8c742207a46c -size 116848 diff --git a/isort-5.2.0-gh.tar.gz b/isort-5.2.0-gh.tar.gz new file mode 100644 index 0000000..fc2fd40 --- /dev/null +++ b/isort-5.2.0-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4234c258f3967c5b414a1dd10bc831166b662d8e0e45cf533d6f096ad73b65dd +size 588556 diff --git a/isort-5.2.0.tar.gz b/isort-5.2.0.tar.gz new file mode 100644 index 0000000..6f0faa7 --- /dev/null +++ b/isort-5.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27c7f27adc4b1a6afde1b66c8af46d42da03671d68648e2a8ab2166df03b668e +size 120854 diff --git a/python-isort.changes b/python-isort.changes index 635b6e6..83b22a0 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Jul 27 20:34:29 UTC 2020 - Sebastian Wagner + +- update to version 5.2.0: + - Implemented #1335: Official API for diff capturing. + - Implemented #1331: Warn when sections don't match up. + - Implemented #1261: By popular demand, `filter_files` can now be set in the config option. + - Implemented #960: Support for respecting git ignore via "--gitignore" or "skip_gitignore=True". + - Implemented #727: Ability to only add imports if existing imports exist. + - Implemented #970: Support for custom sharable isort profiles. + - Implemented #1214: Added support for git_hook lazy option (Thanks @sztamas!) + - Implemented #941: Added an additional `multi_line_output` mode for more compact formatting (Thanks @sztamas!) + - Implemented #1020: Option for LOCALFOLDER. + - Implemented #1353: Added support for output formatting plugins. + - `# isort: split` can now be used at the end of an import line. + - Fixed #1339: Extra indent is not preserved when isort:skip is used in nested imports. + - Fixed #1348: `--diff` works incorrectly with files that have CRLF line endings. + - Improved code repositories usage of pylint tags (#1350). + ------------------------------------------------------------------- Mon Jul 20 18:44:08 UTC 2020 - Sebastian Wagner diff --git a/python-isort.spec b/python-isort.spec index 32a4270..4cbfee3 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -27,7 +27,7 @@ %endif %define skip_python2 1 Name: python-isort%{psuffix} -Version: 5.1.4 +Version: 5.2.0 Release: 0 Summary: A Python utility / library to sort Python imports License: MIT From b1a682d120ab6f8c5b00745ed679a08965358c87c74408ed01d9154d2b552c9c Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 28 Jul 2020 19:26:39 +0000 Subject: [PATCH 11/17] - add git as build dependency, fixes a test issue. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=48 --- python-isort.changes | 5 +++++ python-isort.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/python-isort.changes b/python-isort.changes index 83b22a0..61499ca 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 28 19:01:37 UTC 2020 - Sebastian Wagner + +- add git as build dependency, fixes a test issue. + ------------------------------------------------------------------- Mon Jul 27 20:34:29 UTC 2020 - Sebastian Wagner diff --git a/python-isort.spec b/python-isort.spec index 4cbfee3..44dd74a 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -56,6 +56,7 @@ BuildRequires: %{python_module pylama} BuildRequires: %{python_module pytest} BuildRequires: %{python_module requirementslib >= 1.5.4} BuildRequires: %{python_module tomlkit} +BuildRequires: git %endif %python_subpackages From 5fdf9d6ac06c4d53c96496659b5d7d1c18936a68f777a7b6c09c588e6446fe90 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Tue, 28 Jul 2020 20:21:49 +0000 Subject: [PATCH 12/17] Accepting request 823224 from home:bnavigator:branches:devel:languages:python - use poetry to install example projects. fixes the two remaining test issues needs SR 823222 and SR 823223 OBS-URL: https://build.opensuse.org/request/show/823224 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=49 --- python-isort.changes | 6 ++++++ python-isort.spec | 24 +++++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/python-isort.changes b/python-isort.changes index 61499ca..8e1ca9a 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 28 20:09:25 UTC 2020 - Benjamin Greiner + +- use poetry to install example projects. fixes the two remaining + test issues + ------------------------------------------------------------------- Tue Jul 28 19:01:37 UTC 2020 - Sebastian Wagner diff --git a/python-isort.spec b/python-isort.spec index 44dd74a..4d16f45 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -33,7 +33,7 @@ Summary: A Python utility / library to sort Python imports License: MIT URL: https://timothycrosley.github.io/isort/ Source: https://files.pythonhosted.org/packages/source/i/isort/isort-%{version}.tar.gz -# tests are not packaged for PyPI, get them from git sources +# tests and 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 BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -45,13 +45,16 @@ Recommends: python-pip-api Recommends: python-pipreqs Recommends: python-requirementslib >= 1.5.4 Recommends: python-tomlkit +Suggests: git BuildArch: noarch %if %{with test} +BuildRequires: %{python_module black} BuildRequires: %{python_module hypothesis-auto} BuildRequires: %{python_module isort = %{version}} BuildRequires: %{python_module mock} BuildRequires: %{python_module pip-api} BuildRequires: %{python_module pipreqs} +BuildRequires: %{python_module poetry} BuildRequires: %{python_module pylama} BuildRequires: %{python_module pytest} BuildRequires: %{python_module requirementslib >= 1.5.4} @@ -74,13 +77,15 @@ too. %setup -q -n isort-%{version} chmod -x LICENSE %else -%setup -q -n isort-%{version} -b 1 +%setup -q -n isort-%{version} -T -b 1 %endif %if !%{with test} %build %python_build +%endif +%if !%{with test} %install %python_install %python_expand rm -r %{buildroot}%{$python_sitelib}/tests/ @@ -90,7 +95,20 @@ chmod -x LICENSE %if %{with test} %check -%pytest -v -W "ignore::UserWarning" -W "ignore::DeprecationWarning" +%{python_expand # create egg-info for example projects +for exampledir in example_shared_isort_profile example_isort_formatting_plugin; do + pushd $exampledir + # no exact environment as upstreams devel project + rm poetry.lock + # no dependency download, we have it by BuildRequires + sed -i '/tool.poetry.dependencies/,/^$/ d' pyproject.toml + poetry-%{$python_bin_suffix} install + # append current dir, only use colon if not empty + export PYTHONPATH="${PYTHONPATH:+$PYTHONPATH:}$(pwd)" + popd +done +} +%pytest -v -W "ignore::UserWarning" -W "ignore::DeprecationWarning" %endif %if !%{with test} From 8aae2ead799c8bfc6d4db7aaf08ebe14bdfb11cb0e21595440c1f62d504cc020 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Wed, 29 Jul 2020 10:42:13 +0000 Subject: [PATCH 13/17] Accepting request 823366 from home:bnavigator:branches:devel:languages:python - update to version 5.2.1 * Update precommit to default to filtering files that are defined in skip. * Improved relative path detection for skip config usage. * Added recursive symbolic link protection. * Implemented #1177: Support for color output using --color. * Implemented recursive symlink detection support. OBS-URL: https://build.opensuse.org/request/show/823366 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=50 --- isort-5.2.0-gh.tar.gz | 3 --- isort-5.2.0.tar.gz | 3 --- isort-5.2.1-gh.tar.gz | 3 +++ isort-5.2.1.tar.gz | 3 +++ python-isort.changes | 10 ++++++++++ python-isort.spec | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 isort-5.2.0-gh.tar.gz delete mode 100644 isort-5.2.0.tar.gz create mode 100644 isort-5.2.1-gh.tar.gz create mode 100644 isort-5.2.1.tar.gz diff --git a/isort-5.2.0-gh.tar.gz b/isort-5.2.0-gh.tar.gz deleted file mode 100644 index fc2fd40..0000000 --- a/isort-5.2.0-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4234c258f3967c5b414a1dd10bc831166b662d8e0e45cf533d6f096ad73b65dd -size 588556 diff --git a/isort-5.2.0.tar.gz b/isort-5.2.0.tar.gz deleted file mode 100644 index 6f0faa7..0000000 --- a/isort-5.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27c7f27adc4b1a6afde1b66c8af46d42da03671d68648e2a8ab2166df03b668e -size 120854 diff --git a/isort-5.2.1-gh.tar.gz b/isort-5.2.1-gh.tar.gz new file mode 100644 index 0000000..d8b926b --- /dev/null +++ b/isort-5.2.1-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce0bb15f1823192dcbcbf5dfc09822377f454b353e2b974320204ad9662bbbfb +size 589593 diff --git a/isort-5.2.1.tar.gz b/isort-5.2.1.tar.gz new file mode 100644 index 0000000..b6aa617 --- /dev/null +++ b/isort-5.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:761a8f490d8bbcd3549b5618ed423468bbdece603cce44b290ee274c9a360893 +size 121608 diff --git a/python-isort.changes b/python-isort.changes index 8e1ca9a..74fc6f7 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jul 29 10:39:20 UTC 2020 - Benjamin Greiner + +- update to version 5.2.1 + * Update precommit to default to filtering files that are defined in skip. + * Improved relative path detection for skip config usage. + * Added recursive symbolic link protection. + * Implemented #1177: Support for color output using --color. + * Implemented recursive symlink detection support. + ------------------------------------------------------------------- Tue Jul 28 20:09:25 UTC 2020 - Benjamin Greiner diff --git a/python-isort.spec b/python-isort.spec index 4d16f45..0766255 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -27,7 +27,7 @@ %endif %define skip_python2 1 Name: python-isort%{psuffix} -Version: 5.2.0 +Version: 5.2.1 Release: 0 Summary: A Python utility / library to sort Python imports License: MIT From a98607eee9fb02ecf2bda19f45bd1e44d0029b00ed1873731d397498aa7bd01b Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Thu, 30 Jul 2020 11:51:30 +0000 Subject: [PATCH 14/17] - update to version 5.2.2: - Fixed #1356: return status when arguments are passed in without files or a content stream. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=51 --- isort-5.2.1-gh.tar.gz | 3 --- isort-5.2.1.tar.gz | 3 --- isort-5.2.2-gh.tar.gz | 3 +++ isort-5.2.2.tar.gz | 3 +++ python-isort.changes | 6 ++++++ python-isort.spec | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 isort-5.2.1-gh.tar.gz delete mode 100644 isort-5.2.1.tar.gz create mode 100644 isort-5.2.2-gh.tar.gz create mode 100644 isort-5.2.2.tar.gz diff --git a/isort-5.2.1-gh.tar.gz b/isort-5.2.1-gh.tar.gz deleted file mode 100644 index d8b926b..0000000 --- a/isort-5.2.1-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce0bb15f1823192dcbcbf5dfc09822377f454b353e2b974320204ad9662bbbfb -size 589593 diff --git a/isort-5.2.1.tar.gz b/isort-5.2.1.tar.gz deleted file mode 100644 index b6aa617..0000000 --- a/isort-5.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:761a8f490d8bbcd3549b5618ed423468bbdece603cce44b290ee274c9a360893 -size 121608 diff --git a/isort-5.2.2-gh.tar.gz b/isort-5.2.2-gh.tar.gz new file mode 100644 index 0000000..d33ea0f --- /dev/null +++ b/isort-5.2.2-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c11b106017bd8fa14862e955c4fbff0901a2dca75cc0cfb56c0308f3c0c0020 +size 590181 diff --git a/isort-5.2.2.tar.gz b/isort-5.2.2.tar.gz new file mode 100644 index 0000000..8821bf3 --- /dev/null +++ b/isort-5.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96b27045e3187b9bdde001143b79f9b10a462f372bff7062302818013b6c86f3 +size 121770 diff --git a/python-isort.changes b/python-isort.changes index 74fc6f7..643d835 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 30 10:22:55 UTC 2020 - Sebastian Wagner + +- update to version 5.2.2: + - Fixed #1356: return status when arguments are passed in without files or a content stream. + ------------------------------------------------------------------- Wed Jul 29 10:39:20 UTC 2020 - Benjamin Greiner diff --git a/python-isort.spec b/python-isort.spec index 0766255..873115f 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -27,7 +27,7 @@ %endif %define skip_python2 1 Name: python-isort%{psuffix} -Version: 5.2.1 +Version: 5.2.2 Release: 0 Summary: A Python utility / library to sort Python imports License: MIT From ad75e06e02497082ec47dea343f222b11ad70e6705f16d2027b5fcbcf1f50235 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Thu, 6 Aug 2020 09:26:05 +0000 Subject: [PATCH 15/17] - Update to 5.3.0 * Implemented ability to treat all or select comments as code (issue #1357) * Implemented ability to use different configs for different file extensions (issue #1162) * Implemented ability to specify the types of imports (issue #1181) * Implemented ability to dedup import headings (issue #953) * Added experimental support for sorting literals (issue #1358) * Added experimental support for sorting and deduping groupings of assignments. * Improved handling of deprecated single line variables for usage with Visual Studio Code (issue #1363) * Improved handling of mixed newline forms within same source file. * Improved error handling for known sections. * Improved API consistency, returning a boolean value for all modification API calls to indicate if changes were made. * Fixed #1366: spurious errors when combining skip with --gitignore. * Fixed #1359: --skip-gitignore does not honor ignored symlink Internal Development: * Initial hypothesmith powered test to help catch unexpected syntax parsing and output errors (thanks @Zac-HD!) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=52 --- isort-5.2.2-gh.tar.gz | 3 --- isort-5.2.2.tar.gz | 3 --- isort-5.3.0-gh.tar.gz | 3 +++ isort-5.3.0.tar.gz | 3 +++ python-isort.changes | 28 ++++++++++++++++++++++++++++ python-isort.spec | 2 +- 6 files changed, 35 insertions(+), 7 deletions(-) delete mode 100644 isort-5.2.2-gh.tar.gz delete mode 100644 isort-5.2.2.tar.gz create mode 100644 isort-5.3.0-gh.tar.gz create mode 100644 isort-5.3.0.tar.gz diff --git a/isort-5.2.2-gh.tar.gz b/isort-5.2.2-gh.tar.gz deleted file mode 100644 index d33ea0f..0000000 --- a/isort-5.2.2-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c11b106017bd8fa14862e955c4fbff0901a2dca75cc0cfb56c0308f3c0c0020 -size 590181 diff --git a/isort-5.2.2.tar.gz b/isort-5.2.2.tar.gz deleted file mode 100644 index 8821bf3..0000000 --- a/isort-5.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96b27045e3187b9bdde001143b79f9b10a462f372bff7062302818013b6c86f3 -size 121770 diff --git a/isort-5.3.0-gh.tar.gz b/isort-5.3.0-gh.tar.gz new file mode 100644 index 0000000..4d3ca8d --- /dev/null +++ b/isort-5.3.0-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:244bb89c6a0e65f7f5f1b0b5c5a4a52f520b8c2da239d9c5f1b9f01b2aeadec7 +size 598040 diff --git a/isort-5.3.0.tar.gz b/isort-5.3.0.tar.gz new file mode 100644 index 0000000..cde8ef1 --- /dev/null +++ b/isort-5.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cdca22530d093ed16983ba52c41560fa0219d1b958e44fd2ae2995dcc7b785be +size 127597 diff --git a/python-isort.changes b/python-isort.changes index 643d835..0646226 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Thu Aug 6 09:21:42 UTC 2020 - Benjamin Greiner + +- Update to 5.3.0 + * Implemented ability to treat all or select comments as code + (issue #1357) + * Implemented ability to use different configs for different file + extensions (issue #1162) + * Implemented ability to specify the types of imports + (issue #1181) + * Implemented ability to dedup import headings (issue #953) + * Added experimental support for sorting literals (issue #1358) + * Added experimental support for sorting and deduping groupings + of assignments. + * Improved handling of deprecated single line variables for usage + with Visual Studio Code (issue #1363) + * Improved handling of mixed newline forms within same source + file. + * Improved error handling for known sections. + * Improved API consistency, returning a boolean value for all + modification API calls to indicate if changes were made. + * Fixed #1366: spurious errors when combining skip with + --gitignore. + * Fixed #1359: --skip-gitignore does not honor ignored symlink + Internal Development: + * Initial hypothesmith powered test to help catch unexpected + syntax parsing and output errors (thanks @Zac-HD!) + ------------------------------------------------------------------- Thu Jul 30 10:22:55 UTC 2020 - Sebastian Wagner diff --git a/python-isort.spec b/python-isort.spec index 873115f..b68ca56 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -27,7 +27,7 @@ %endif %define skip_python2 1 Name: python-isort%{psuffix} -Version: 5.2.2 +Version: 5.3.0 Release: 0 Summary: A Python utility / library to sort Python imports License: MIT From 29259fe636ad27609232f8266aca6eaee52d6dbb02197c7a2d11a2cd1cca9f3c Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Thu, 6 Aug 2020 13:54:40 +0000 Subject: [PATCH 16/17] - do not test hypothesmith integration because we lack python-libcst OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=53 --- 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 0646226..a8ead8b 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 6 13:53:40 UTC 2020 - Benjamin Greiner + +- do not test hypothesmith integration because we lack python-libcst + ------------------------------------------------------------------- Thu Aug 6 09:21:42 UTC 2020 - Benjamin Greiner diff --git a/python-isort.spec b/python-isort.spec index b68ca56..5ddb2fd 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -108,7 +108,8 @@ for exampledir in example_shared_isort_profile example_isort_formatting_plugin; popd done } -%pytest -v -W "ignore::UserWarning" -W "ignore::DeprecationWarning" +# no test_hypothesmith because no libcst because no pyre-check +%pytest -W "ignore::UserWarning" -W "ignore::DeprecationWarning" --ignore tests/test_hypothesmith.py %endif %if !%{with test} From c0ef1cbcaa758eaee99ddd209e049a539c439131c896deabbc430fadaec68949 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Sat, 8 Aug 2020 12:22:26 +0000 Subject: [PATCH 17/17] - update to version 5.3.2: - Fixed incorrect warning code (W503->W0503). - update to version 5.3.1: - Improve upgrade warnings to be less noisy and point to error codes for easy interoperability with Visual Studio Code (see: #1363). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=54 --- isort-5.3.0-gh.tar.gz | 3 --- isort-5.3.0.tar.gz | 3 --- isort-5.3.2-gh.tar.gz | 3 +++ isort-5.3.2.tar.gz | 3 +++ python-isort.changes | 8 ++++++++ python-isort.spec | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 isort-5.3.0-gh.tar.gz delete mode 100644 isort-5.3.0.tar.gz create mode 100644 isort-5.3.2-gh.tar.gz create mode 100644 isort-5.3.2.tar.gz diff --git a/isort-5.3.0-gh.tar.gz b/isort-5.3.0-gh.tar.gz deleted file mode 100644 index 4d3ca8d..0000000 --- a/isort-5.3.0-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:244bb89c6a0e65f7f5f1b0b5c5a4a52f520b8c2da239d9c5f1b9f01b2aeadec7 -size 598040 diff --git a/isort-5.3.0.tar.gz b/isort-5.3.0.tar.gz deleted file mode 100644 index cde8ef1..0000000 --- a/isort-5.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdca22530d093ed16983ba52c41560fa0219d1b958e44fd2ae2995dcc7b785be -size 127597 diff --git a/isort-5.3.2-gh.tar.gz b/isort-5.3.2-gh.tar.gz new file mode 100644 index 0000000..c8e5d1e --- /dev/null +++ b/isort-5.3.2-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e9a020da3f7c7658019a2f5ffb62f28ba71f0b4e1900c5d7c691541d1384d24 +size 598171 diff --git a/isort-5.3.2.tar.gz b/isort-5.3.2.tar.gz new file mode 100644 index 0000000..73f3434 --- /dev/null +++ b/isort-5.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba83762132a8661d3525f87a86549712fb7d8da79eeb452e01f327ada9e87920 +size 127789 diff --git a/python-isort.changes b/python-isort.changes index a8ead8b..a83db9b 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Aug 8 12:21:14 UTC 2020 - Sebastian Wagner + +- update to version 5.3.2: + - Fixed incorrect warning code (W503->W0503). +- update to version 5.3.1: + - Improve upgrade warnings to be less noisy and point to error codes for easy interoperability with Visual Studio Code (see: #1363). + ------------------------------------------------------------------- Thu Aug 6 13:53:40 UTC 2020 - Benjamin Greiner diff --git a/python-isort.spec b/python-isort.spec index 5ddb2fd..7db0f31 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -27,7 +27,7 @@ %endif %define skip_python2 1 Name: python-isort%{psuffix} -Version: 5.3.0 +Version: 5.3.2 Release: 0 Summary: A Python utility / library to sort Python imports License: MIT