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.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 9694aab..a83db9b 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,220 @@ +------------------------------------------------------------------- +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 + +- do not test hypothesmith integration because we lack python-libcst + +------------------------------------------------------------------- +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 + +- 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 + +- 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 + +- use poetry to install example projects. fixes the two remaining + test issues + +------------------------------------------------------------------- +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 + +- 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 + +- 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 + +- 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 + +- 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 + +- 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 + +- 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 + +- 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 + +- 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 + +- 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 + +- 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..7db0f31 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -25,73 +25,91 @@ %define psuffix %{nil} %bcond_with test %endif -%bcond_without python2 +%define skip_python2 1 Name: python-isort%{psuffix} -Version: 4.3.21 +Version: 5.3.2 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 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 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-requirementslib >= 1.5.4 +Recommends: python-tomlkit +Suggests: git 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 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 pip} +BuildRequires: %{python_module poetry} 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 requirementslib >= 1.5.4} +BuildRequires: %{python_module tomlkit} +BuildRequires: git %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-%{version} -T -b 1 +%endif +%if !%{with test} %build %python_build +%endif -%install %if !%{with test} +%install %python_install +%python_expand rm -r %{buildroot}%{$python_sitelib}/tests/ %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 +%{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 +} +# 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} @@ -102,9 +120,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