From 8497d09f33cc358d3f2a1596ccce67ca80fa9549dbe320213022a88d927ee84f Mon Sep 17 00:00:00 2001
From: Benjamin Greiner <code@bnavigator.de>
Date: Tue, 14 Jul 2020 15:51:34 +0000
Subject: [PATCH] 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 <code@bnavigator.de>
+
+- 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 <code@bnavigator.de>
 
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}