From 84362c586f4514a4ae159d7d9ae87a92fcff27ba441ae8e229446e9b1269254e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 14 Feb 2019 21:12:20 +0000 Subject: [PATCH] Accepting request 676235 from home:jayvdb:coala:python3-bears - Revert to using PyPI release by adding add-editorconfig.patch, which is needed to allow the test suite to pass. https://github.com/timothycrosley/isort/issues/814 OBS-URL: https://build.opensuse.org/request/show/676235 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=11 --- 4.3.4.tar.gz | 3 --- add-editorconfig.patch | 24 ++++++++++++++++++++++++ isort-4.3.4.tar.gz | 3 +++ python-isort.changes | 7 +++++++ python-isort.spec | 9 +++++---- 5 files changed, 39 insertions(+), 7 deletions(-) delete mode 100644 4.3.4.tar.gz create mode 100644 add-editorconfig.patch create mode 100644 isort-4.3.4.tar.gz diff --git a/4.3.4.tar.gz b/4.3.4.tar.gz deleted file mode 100644 index 95ef5b2..0000000 --- a/4.3.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0fa470f580e62982e5983fae03120e57df96a74733e53d3ae2ad47ec0047610 -size 305764 diff --git a/add-editorconfig.patch b/add-editorconfig.patch new file mode 100644 index 0000000..e4ef333 --- /dev/null +++ b/add-editorconfig.patch @@ -0,0 +1,24 @@ +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 new file mode 100644 index 0000000..d61fd79 --- /dev/null +++ b/isort-4.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9c40e9750f3d77e6e4d441d8b0266cf555e7cdabdcff33c4fd06366ca761ef8 +size 56070 diff --git a/python-isort.changes b/python-isort.changes index 5382088..69d96b8 100644 --- a/python-isort.changes +++ b/python-isort.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 14 06:05:49 UTC 2019 - John Vandenberg + +- Revert to using PyPI release by adding add-editorconfig.patch, + which is needed to allow the test suite to pass. + https://github.com/timothycrosley/isort/issues/814 + ------------------------------------------------------------------- Sat Jul 21 04:35:40 UTC 2018 - arun@gmx.de diff --git a/python-isort.spec b/python-isort.spec index fe18383..e77e625 100644 --- a/python-isort.spec +++ b/python-isort.spec @@ -1,7 +1,7 @@ # # spec file for package python-isort # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,8 +25,8 @@ Summary: A Python utility / library to sort Python imports License: MIT Group: Development/Languages/Python URL: https://github.com/timothycrosley/isort -# Tests included in pypi package fail -Source: https://github.com/timothycrosley/isort/archive/%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/i/isort/isort-%{version}.tar.gz +Patch0: add-editorconfig.patch BuildRequires: %{python_module mock} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} @@ -49,6 +49,7 @@ any dependencies. %prep %setup -q -n isort-%{version} +%patch0 -p1 sed -i '1s/^#!.*//' isort/main.py chmod -x LICENSE