setuptools_scm: avoid misdetecting git repository

OpenIndiana · Aug 7, 2019 · 7d928fa · 7d928fa
1 parent 5087f2b
commit 7d928fa
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/components/python/setuptools_scm/Makefile b/components/python/setuptools_scm/Makefile
@@ -26,6 +26,7 @@ include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		setuptools_scm
 COMPONENT_VERSION=	3.3.3
+COMPONENT_REVISION=	1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\

diff --git a/components/python/setuptools_scm/patches/02-fix-build-inside-outer-git-tree.patch b/components/python/setuptools_scm/patches/02-fix-build-inside-outer-git-tree.patch
@@ -0,0 +1,34 @@
+Rude workaround for https://github.com/pypa/setuptools_scm/issues/353
+
+--- setuptools_scm-3.3.3/src/setuptools_scm/file_finder_git.py.1	2019-08-05 08:36:03.088367984 +0000
++++ setuptools_scm-3.3.3/src/setuptools_scm/file_finder_git.py	2019-08-05 08:40:05.468435538 +0000
+@@ -18,7 +18,12 @@
+                 stderr=devnull,
+             )
+         trace("find files toplevel", out)
+-        return os.path.normcase(os.path.realpath(out.strip()))
++        toplevel_path = os.path.normcase(os.path.realpath(out.strip()))
++        setup_py_path = os.path.join(toplevel_path, "setup.py")
++        if os.path.exists(setup_py_path):
++            return toplevel_path
++        else:
++            return None
+     except subprocess.CalledProcessError:
+         # git returned error, we are not in a git repo
+         return None
+--- setuptools_scm-3.3.3/src/setuptools_scm/file_finder_hg.py.1	2019-08-05 08:42:09.647819292 +0000
++++ setuptools_scm-3.3.3/src/setuptools_scm/file_finder_hg.py	2019-08-05 08:42:30.538083187 +0000
+@@ -13,7 +13,12 @@
+                 universal_newlines=True,
+                 stderr=devnull,
+             )
+-        return os.path.normcase(os.path.realpath(out.strip()))
++        toplevel_path = os.path.normcase(os.path.realpath(out.strip()))
++        setup_py_path = os.path.join(toplevel_path, "setup.py")
++        if os.path.exists(setup_py_path):
++            return toplevel_path
++        else:
++            return None
+     except subprocess.CalledProcessError:
+         # hg returned error, we are not in a mercurial repo
+         return None