From d7523e20e2f9d5f023592ed570298dadb836e8826c26e1488a4c06e8e2c8823e Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 25 Sep 2017 09:00:03 +0000
Subject: [PATCH] Accepting request 528574 from
 home:apersaud:branches:devel:languages:python

update to latest version

OBS-URL: https://build.opensuse.org/request/show/528574
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools_scm?expand=0&rev=18
---
 no-generic-python.patch       | 33 -------------------------------
 python-setuptools_scm.changes | 37 +++++++++++++++++++++++++++++++++++
 python-setuptools_scm.spec    |  5 +----
 setuptools_scm-1.15.0.tar.gz  |  3 ---
 setuptools_scm-1.15.6.tar.gz  |  3 +++
 5 files changed, 41 insertions(+), 40 deletions(-)
 delete mode 100644 no-generic-python.patch
 delete mode 100644 setuptools_scm-1.15.0.tar.gz
 create mode 100644 setuptools_scm-1.15.6.tar.gz

diff --git a/no-generic-python.patch b/no-generic-python.patch
deleted file mode 100644
index c4d3597..0000000
--- a/no-generic-python.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/testing/test_regressions.py b/testing/test_regressions.py
-index 4a067b3..9d24d61 100644
---- a/testing/test_regressions.py
-+++ b/testing/test_regressions.py
-@@ -18,16 +18,16 @@ def test_pkginfo_noscmroot(tmpdir, monkeypatch):
-         'from setuptools import setup;'
-         'setup(use_scm_version={"root": ".."})')
- 
--    _, stderr, ret = do_ex('python setup.py --version', p)
-+    _, stderr, ret = do_ex((sys.executable, 'setup.py', '--version'), p)
-     assert 'setuptools-scm was unable to detect version for' in stderr
-     assert ret == 1
- 
-     p.join("PKG-INFO").write('Version: 1.0')
--    res = do('python setup.py --version', p)
-+    res = do((sys.executable, 'setup.py', '--version'), p)
-     assert res == '1.0'
- 
-     do('git init', p.dirpath())
--    res = do('python setup.py --version', p)
-+    res = do((sys.executable, 'setup.py', '--version'), p)
-     assert res == '1.0'
- 
- 
-@@ -64,7 +64,7 @@ setup(use_scm_version=vcfg)
- ''')
-     p.join("PKG-INFO").write('Version: 1.0')
- 
--    res = do('python setup.py --version', p)
-+    res = do((sys.executable, 'setup.py', '--version'), p)
-     assert res == '1.0'
- 
- 
diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes
index 1c3c1af..b134532 100644
--- a/python-setuptools_scm.changes
+++ b/python-setuptools_scm.changes
@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Sun Sep 24 21:52:54 UTC 2017 - arun@gmx.de
+
+- specfile:
+  * removed no-generic-python.patch, included upstream
+
+- update to version 1.15.6:
+  * fix #174 by normalizing windows path using windows apis
+
+- changes from version 1.15.6:
+  * fix #171 by unpinning the py version to allow a fixed one to get
+    installed
+
+- changes from version 1.15.5:
+  * fix #167 by correctly respecting preformatted version metadata
+    from PKG-INFO/EGG-INFO
+
+- changes from version 1.15.4:
+  * fix issue #164: iterate all found entry points to avoid erros when
+    pip remakes egg-info
+  * enhance self-use to enable pip install from github again
+
+- changes from version 1.15.3:
+  * bring back correctly getting our version in the own sdist,
+    finalizes #114
+  * fix issue #150: strip local components of tags
+
+- changes from version 1.15.2:
+  * fix issue #128: return None when a scm specific parse fails in a
+    worktree to ease parse reuse
+
+- changes from version 1.15.1:
+  * fix issue #126: the local part of any tags is discarded when
+    guessing new versions
+  * minor performance optimization by doing fewer git calls in the
+    usual cases
+
 -------------------------------------------------------------------
 Mon Jun 26 14:09:51 UTC 2017 - jmatejek@suse.com
 
diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec
index f898fdd..37f25b2 100644
--- a/python-setuptools_scm.spec
+++ b/python-setuptools_scm.spec
@@ -19,15 +19,13 @@
 %bcond_with test
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-setuptools_scm
-Version:        1.15.0
+Version:        1.15.6
 Release:        0
 Summary:        Manage your versions by scm tags
 License:        MIT
 Group:          Development/Languages/Python
 Url:            https://github.com/pypa/setuptools_scm
 Source:         https://files.pythonhosted.org/packages/source/s/setuptools_scm/setuptools_scm-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM use sys.executable for running python in test_regressions.py
-Patch0:         no-generic-python.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  python-rpm-macros
@@ -51,7 +49,6 @@ in scm metadata. It also handles file finders for the supperted scm's.
 
 %prep
 %setup -q -n setuptools_scm-%{version}
-%patch0 -p1
 
 %build
 %python_build
diff --git a/setuptools_scm-1.15.0.tar.gz b/setuptools_scm-1.15.0.tar.gz
deleted file mode 100644
index 8466d26..0000000
--- a/setuptools_scm-1.15.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:daf12d05aa2155a46aa357453757ffdc47d87f839e62114f042bceac6a619e2f
-size 23677
diff --git a/setuptools_scm-1.15.6.tar.gz b/setuptools_scm-1.15.6.tar.gz
new file mode 100644
index 0000000..f7470b7
--- /dev/null
+++ b/setuptools_scm-1.15.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49ab4685589986a42da85706b3311a2f74f1af567d39fee6cb1e088d7a75fb5f
+size 25779