From 29f9d05da06996a8f2c7425cf6a93d59b28486171a24c8dc4e6e88e0b7e5cc7f Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <sebix+novell.com@sebix.at>
Date: Fri, 2 Feb 2018 20:53:14 +0000
Subject: [PATCH] - update to 4.3.1  * Fixed issue #654: Trailing comma count
 error  * Fixed issue #651: Add imports option is broken  * Fixed issue #650:
 Wrong error message displayed - update to 4.3.0  * Fixed #557:
 force_alphabetical_sort and force_sort_within_sections can now be utilized
 together without extra new lines  * Added --no-lines-before for more granular
 control over section output  * Fixed #493: Unwanted conversion to Windows
 line endings  * Implemented --version-number to retrieve just the version
 number without the isort logo - Remove patch-shebang.patch and replace it
 with a sed-call

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-isort?expand=0&rev=6
---
 4.2.15.tar.gz        |  3 ---
 4.3.1.tar.gz         |  3 +++
 isort-4.3.1.tar.gz   |  3 +++
 patch-shebang.patch  |  8 --------
 python-isort.changes | 14 ++++++++++++++
 python-isort.spec    | 20 +++++++++-----------
 6 files changed, 29 insertions(+), 22 deletions(-)
 delete mode 100644 4.2.15.tar.gz
 create mode 100644 4.3.1.tar.gz
 create mode 100644 isort-4.3.1.tar.gz
 delete mode 100644 patch-shebang.patch

diff --git a/4.2.15.tar.gz b/4.2.15.tar.gz
deleted file mode 100644
index bf8f8eb..0000000
--- a/4.2.15.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46c1ba5d7152822fe76e04ed571a1d97b25f5328bab547663e7480ead599c732
-size 301941
diff --git a/4.3.1.tar.gz b/4.3.1.tar.gz
new file mode 100644
index 0000000..7de99a2
--- /dev/null
+++ b/4.3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:608f73066c0c850e913b210ee87234413dad90ee136261d05d10693bd3913c03
+size 305044
diff --git a/isort-4.3.1.tar.gz b/isort-4.3.1.tar.gz
new file mode 100644
index 0000000..253375a
--- /dev/null
+++ b/isort-4.3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8b584d1223204a4948ba20d605d3e5421c5956455d8618feb5c2ccdae2b78ba
+size 59591
diff --git a/patch-shebang.patch b/patch-shebang.patch
deleted file mode 100644
index cb3c3f9..0000000
--- a/patch-shebang.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- isort/main.py	2016-07-30 15:12:33.516794135 +0200
-+++ isort/main.py	2016-03-30 13:08:30.000000000 +0200
-@@ -1,4 +1,3 @@
--#! /usr/bin/env python
- '''  Tool for sorting imports alphabetically, and automatically separated into sections.
- 
- Copyright (C) 2013  Timothy Edmund Crosley
-
diff --git a/python-isort.changes b/python-isort.changes
index ddec4c7..60428ea 100644
--- a/python-isort.changes
+++ b/python-isort.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Feb  2 20:20:10 UTC 2018 - sebix+novell.com@sebix.at
+
+- update to 4.3.1
+ * Fixed issue #654: Trailing comma count error
+ * Fixed issue #651: Add imports option is broken
+ * Fixed issue #650: Wrong error message displayed
+- update to 4.3.0
+ * Fixed #557: force_alphabetical_sort and force_sort_within_sections can now be utilized together without extra new lines
+ * Added --no-lines-before for more granular control over section output
+ * Fixed #493: Unwanted conversion to Windows line endings
+ * Implemented --version-number to retrieve just the version number without the isort logo
+- Remove patch-shebang.patch and replace it with a sed-call
+
 -------------------------------------------------------------------
 Wed Jun 21 15:28:33 UTC 2017 - sebix+novell.com@sebix.at
 
diff --git a/python-isort.spec b/python-isort.spec
index c29703e..948519d 100644
--- a/python-isort.spec
+++ b/python-isort.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-isort
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -16,22 +16,25 @@
 #
 
 
+%{!?license: %global license %doc}
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-isort
-Version:        4.2.15
+Version:        4.3.1
 Release:        0
 Summary:        A Python utility / library to sort Python imports
 License:        MIT
 Group:          Development/Languages/Python
 Url:            https://github.com/timothycrosley/isort
-# Tests are not included in pypi package
+# Tests included in pypi package fail
 Source:         https://github.com/timothycrosley/isort/archive/%{version}.tar.gz
-Patch0:         patch-shebang.patch
 BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  python-rpm-macros
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  python2-futures
+%ifpython2
+Requires:       python-futures
+%endif
 BuildArch:      noarch
 %python_subpackages
 
@@ -46,7 +49,7 @@ any dependencies.
 
 %prep
 %setup -q -n isort-%{version}
-%patch0
+sed -i '1s/^#!.*//' isort/main.py
 chmod -x LICENSE
 
 %build
@@ -62,11 +65,6 @@ chmod -x LICENSE
 %defattr(-,root,root,-)
 %{python_sitelib}/*
 %python3_only %{_bindir}/isort
-%doc README.rst
-%if 0%{?leap_version} >= 420200 || 0%{?suse_version} > 1320 
 %license LICENSE
-%else
-%doc LICENSE
-%endif
 
 %changelog