FIX: Calling git if there is no repo

pyscaffold · Mar 4, 2015 · 67d9d24 · 67d9d24
1 parent 96810fd
commit 67d9d24
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/pyscaffold/_version.py b/pyscaffold/_version.py
@@ -77,7 +77,10 @@ def version_from_vcs(tag_prefix, root, verbose=False):
     if not git:
         print("no git found")
         return None
-    tag = next(git("describe", "--tags", "--dirty", "--always"))
+    try:
+        tag = next(git("describe", "--tags", "--dirty", "--always"))
+    except subprocess.CalledProcessError:
+        return None
     if not tag.startswith(tag_prefix):
         if verbose:
             print("tag '{}' doesn't start with prefix '{}'".format(tag,

diff --git a/pyscaffold/data/_version.template b/pyscaffold/data/_version.template
@@ -77,7 +77,10 @@ def version_from_vcs(tag_prefix, root, verbose=False):
     if not git:
         print("no git found")
         return None
-    tag = next(git("describe", "--tags", "--dirty", "--always"))
+    try:
+        tag = next(git("describe", "--tags", "--dirty", "--always"))
+    except subprocess.CalledProcessError:
+        return None
     if not tag.startswith(tag_prefix):
         if verbose:
             print("tag '{}' doesn't start with prefix '{}'".format(tag,

diff --git a/pyscaffold/data/setup_py.template b/pyscaffold/data/setup_py.template
@@ -520,7 +520,7 @@ def setup_package():
           data_files=[('.', metadata['data_files'])],
           command_options=command_options,
           entry_points={'console_scripts': console_scripts},
-          zip_safe=False)  # do not zip egg files after setup.py install
+          zip_safe=False)  # do not zip egg file after setup.py install
 
 
 if __name__ == "__main__":

diff --git a/setup.py b/setup.py
@@ -520,7 +520,7 @@ def setup_package():
           data_files=[('.', metadata['data_files'])],
           command_options=command_options,
           entry_points={'console_scripts': console_scripts},
-          zip_safe=False)  # Do not zip egg file after setup.py install
+          zip_safe=False)  # do not zip egg file after setup.py install
 
 
 if __name__ == "__main__":