From ab75fb8bfa7c5a829fae774e2e3a401ad90c0f46 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Wed, 8 Aug 2018 09:10:02 +0300
Subject: [PATCH] python-setuptools-scm: Update to 2.1.0

---
 ...-setuptools-scm-2.1.0-fix-path-error.patch | 25 +++++++++++++++++++
 python-setuptools-scm/PKGBUILD                | 12 ++++++---
 2 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 python-setuptools-scm/0001-python-setuptools-scm-2.1.0-fix-path-error.patch

diff --git a/python-setuptools-scm/0001-python-setuptools-scm-2.1.0-fix-path-error.patch b/python-setuptools-scm/0001-python-setuptools-scm-2.1.0-fix-path-error.patch
new file mode 100644
index 00000000..26b984dd
--- /dev/null
+++ b/python-setuptools-scm/0001-python-setuptools-scm-2.1.0-fix-path-error.patch
@@ -0,0 +1,25 @@
+unchanged:
+--- setuptools_scm-2.1.0.orig/setuptools_scm/file_finder_git.py	2018-05-20 21:10:53.786520000 -0400
++++ setuptools_scm-2.1.0/setuptools_scm/file_finder_git.py	2018-05-20 21:12:10.709621400 -0400
+@@ -10,7 +10,7 @@
+         with open(os.devnull, 'wb') as devnull:
+             out = subprocess.check_output([
+                 'git', 'rev-parse', '--show-toplevel',
+-            ], cwd=(path or '.'), universal_newlines=True, stderr=devnull)
++            ], cwd=(path), universal_newlines=True, stderr=devnull)
+         return os.path.normcase(os.path.realpath(out.strip()))
+     except subprocess.CalledProcessError:
+         # git returned error, we are not in a git repo
+only in patch2:
+unchanged:
+--- setuptools_scm-2.1.0/setuptools_scm/file_finder_hg.py.orig	2018-05-20 21:17:07.794217600 -0400
++++ setuptools_scm-2.1.0/setuptools_scm/file_finder_hg.py	2018-05-20 21:17:15.727334000 -0400
+@@ -9,7 +9,7 @@
+         with open(os.devnull, 'wb') as devnull:
+             out = subprocess.check_output([
+                 'hg', 'root',
+-            ], cwd=(path or '.'), universal_newlines=True, stderr=devnull)
++            ], cwd=(path), universal_newlines=True, stderr=devnull)
+         return os.path.normcase(os.path.realpath(out.strip()))
+     except subprocess.CalledProcessError:
+         # hg returned error, we are not in a mercurial repo
diff --git a/python-setuptools-scm/PKGBUILD b/python-setuptools-scm/PKGBUILD
index d1ac288f..b04c82e4 100644
--- a/python-setuptools-scm/PKGBUILD
+++ b/python-setuptools-scm/PKGBUILD
@@ -3,18 +3,22 @@
 _realname=setuptools-scm
 pkgbase="python-${_realname}"
 pkgname=("python3-${_realname}" "python2-${_realname}")
-pkgver=1.15.6
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="Handles managing your python package versions in scm metadata"
 arch=('any')
 license=('MIT')
 url='https://github.com/pypa/setuptools_scm'
 makedepends=('python3-setuptools' 'python2-setuptools')
-source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname/-/_}-${pkgver}.tar.gz")
-sha256sums=('49ab4685589986a42da85706b3311a2f74f1af567d39fee6cb1e088d7a75fb5f')
+source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname/-/_}-${pkgver}.tar.gz"
+        0001-python-setuptools-scm-2.1.0-fix-path-error.patch)
+sha256sums=('a767141fecdab1c0b3c8e4c788ac912d7c94a0d6c452d40777ba84f918316379'
+            'ea9971a42f5f9debd8e37f587ed5c6d416316a835c0b94ff1da6e818dc26ef28')
 
 prepare() {
-  cd ${srcdir}
+  cd ${srcdir}/${_realname/-/_}-${pkgver}
+  patch -p1 -i ${srcdir}/0001-python-setuptools-scm-2.1.0-fix-path-error.patch
+  cd ..
 
   for pver in {2,3}; do 
     rm -rf python${pver}-build-${CARCH} | true