diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/add-editorconfig.patch b/add-editorconfig.patch deleted file mode 100644 index e4ef333..0000000 --- a/add-editorconfig.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur isort-4.3.4-pypi/.editorconfig isort-4.3.4-github/.editorconfig ---- isort-4.3.4-pypi/.editorconfig 1970-01-01 07:00:00.000000000 +0700 -+++ isort-4.3.4-github/.editorconfig 2018-02-12 22:12:28.000000000 +0700 -@@ -0,0 +1,20 @@ -+root = true -+ -+[*.py] -+max_line_length = 120 -+indent_style = space -+indent_size = 4 -+known_first_party = isort -+known_third_party = kate -+ignore_frosted_errors = E103 -+skip = runtests.py,build,.tox -+balanced_wrapping = true -+not_skip = __init__.py -+ -+[*.{rst,ini}] -+indent_style = space -+indent_size = 4 -+ -+[*.yml] -+indent_style = space -+indent_size = 2 diff --git a/isort-4.3.4.tar.gz b/isort-4.3.4.tar.gz deleted file mode 100644 index d61fd79..0000000 --- a/isort-4.3.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9c40e9750f3d77e6e4d441d8b0266cf555e7cdabdcff33c4fd06366ca761ef8 -size 56070 diff --git a/isort-4.3.9.tar.gz b/isort-4.3.9.tar.gz new file mode 100644 index 0000000..4f95dcd --- /dev/null +++ b/isort-4.3.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f19b23b22fb5a919a081bc31aabcc0991614c244d9215267e11abf2ca7b684ce +size 62076 diff --git a/python-isort.changes b/python-isort.changes index 69d96b8..be43909 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Fri Mar 1 14:43:42 UTC 2019 - Tomáš Chvátal + +- Switch to multibuild to avoid cycle with pylama + +------------------------------------------------------------------- +Thu Feb 28 06:07:17 UTC 2019 - John Vandenberg + +- Drop add-editorconfig.patch made redundant by new sdist +- Add fdupes +- Update to v4.3.9 + * Fixed a bug that led to an incompatibility with black: #831 +- from 4.3.8 + * Fixed a bug that led to the recursive option not always been available + from the command line. +- from 4.3.7 + * Expands the finder failsafe to occur on the creation of the finder objects. +- from 4.3.6 + * Fixes a fatal error that occurs if a single finder throws an exception. + Important as we add more finders that utilize third party libraries. +- from 4.3.5 + + Potentially Interface Breaking: + * The `-r` option for removing imports has been renamed `-rm` to avoid + accidental deletions and confusion with the `-rc` recursive option. + * `__init__.py` has been removed from the default ignore list. The default + ignore list is now empty - with all items needing to be explicitly ignored. + * Isort will now by default ignore .tox / venv folders in an effort to be "safe". + You can disable this behaviour by setting the "--unsafe" flag, this is + separate from any skip or not skip rules you may have in place. + * Isort now allows for files missing closing newlines in whitespace check + * `distutils` support has been removed to simplify setup.py + + New: + * Official Python 3.7 Compatibility. + * Support for using requirements files to auto determine third-paty + section if pipreqs & requirementslib are installed. + * Added support for using pyproject.toml if toml is installed. + * Added support for XDG_HOME if appdirs is installed. + * An option has been added to enable ignoring trailing comments + ('ignore_comments') defaulting to False. + * Added support to enable line length sorting for only specific sections + * Added a `correctly_sorted` property on the SortsImport to enable more + intuitive programmatic checking. + + Fixes: + * Improved black compatibility. + * Isort will no detect files in the CWD as first-party. + * Fixed several cases where '-ns' or 'not_skip' was being incorrectly + ignored. + * Fixed sorting of relative path imports ('.', '..', '...', etc). + * Fixed bugs caused by a failure to maintain order when loading iterables + from config files. + * Correctly handle CPython compiled imports and others that need EXT_SUFFIX + to correctly identify. + * Fixed handling of Symbolic Links to follow them when walking the path. + * Fixed handling of relative known_paths. + * Fixed lack of access to all wrap modes from the CLI. + * Fixed handling of FIFO files. + * Fixed a bug that could result in multiple imports being inserted on the + same line. + ------------------------------------------------------------------- Thu Feb 14 06:05:49 UTC 2019 - John Vandenberg diff --git a/python-isort.spec b/python-isort.spec index e77e625..377ae00 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -16,20 +16,30 @@ # -%{!?license: %global license %doc} %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif Name: python-isort -Version: 4.3.4 +Version: 4.3.9 Release: 0 Summary: A Python utility / library to sort Python imports License: MIT Group: Development/Languages/Python URL: https://github.com/timothycrosley/isort Source: https://files.pythonhosted.org/packages/source/i/isort/isort-%{version}.tar.gz -Patch0: add-editorconfig.patch +%if %{with test} BuildRequires: %{python_module mock} +BuildRequires: %{python_module pylama} BuildRequires: %{python_module pytest} +%endif BuildRequires: %{python_module setuptools} +BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python2-futures BuildArch: noarch @@ -49,22 +59,27 @@ any dependencies. %prep %setup -q -n isort-%{version} -%patch0 -p1 -sed -i '1s/^#!.*//' isort/main.py chmod -x LICENSE %build %python_build %install +%if !%{with test} %python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif %check -%python_exec setup.py test +%if %{with test} +%python_expand py.test-%{$python_bin_suffix} -v +%endif +%if !%{with test} %files %{python_files} %{python_sitelib}/isort* %python3_only %{_bindir}/isort %license LICENSE +%endif %changelog