Manage the version number with setuptools_scm.

Author: RKrahl

.gitignore

@@ -2,7 +2,7 @@
 *~
 .cache/
 __pycache__/
-/.gitrevision
+/.version
 /MANIFEST
 /build/
 /dist/

MANIFEST.in

@@ -1,3 +1,4 @@
+include .version
 include LICENSE.txt
 include MANIFEST.in
 include README.rst

Makefile

@@ -8,7 +8,7 @@ build:
 test: build
 	PYTHONPATH=$(BUILDDIR)/lib $(PYTHON) -m pytest tests
 
-sdist: .gitrevision
+sdist:
 	$(PYTHON) setup.py sdist
 
 doc-html:
@@ -23,13 +23,10 @@ distclean: clean
 	rm -rf .cache tests/.cache .pytest_cache tests/.pytest_cache
 	rm -f *.pyc tests/*.pyc
 	rm -rf __pycache__ tests/__pycache__
-	rm -f MANIFEST
+	rm -f MANIFEST .version
 	rm -rf dist
 	rm -rf pytest_dependency.egg-info
 	$(MAKE) -C doc distclean
 
-.gitrevision:
-	git describe --always --dirty > .gitrevision
 
-
-.PHONY: build test sdist doc-html clean distclean .gitrevision
+.PHONY: build test sdist doc-html clean distclean

pytest_dependency.py

@@ -1,7 +1,6 @@
 """$DOC"""
 
 __version__ = "$VERSION"
-__revision__ = "$REVISION"
 
 import pytest
 

setup.py

@@ -6,47 +6,43 @@
 skipped if any of the dependencies did fail or has been skipped.
 """
 
-__version__ = "0.4.0"
-
+import distutils.log
 import os
 import os.path
 import re
+import string
 from setuptools import setup
 import setuptools.command.sdist as st_sdist
+try:
+    import setuptools_scm
+    version = setuptools_scm.get_version()
+    with open(".version", "wt") as f:
+        f.write(version)
+except (ImportError, LookupError):
+    try:
+        with open(".version", "rt") as f:
+            version = f.read()
+    except (OSError, IOError):
+        distutils.log.warn("warning: cannot determine version number")
+        version = "UNKNOWN"
 
 
-def _filter_file(src, dest, subst):
-    """Copy src to dest doing substitutions on the fly.
-    """
-    substre = re.compile(r'\$(%s)' % '|'.join(subst.keys()))
-    def repl(m):
-        return subst[m.group(1)]
-    with open(src, "rt") as sf, open(dest, "wt") as df:
-        while True:
-            l = sf.readline()
-            if not l:
-                break
-            df.write(re.sub(substre, repl, l))
-
 class sdist(st_sdist.sdist):
     def make_release_tree(self, base_dir, files):
         st_sdist.sdist.make_release_tree(self, base_dir, files)
         if not self.dry_run:
             src = "pytest_dependency.py"
             dest = os.path.join(base_dir, src)
-            gitrevfile = ".gitrevision"
             if hasattr(os, 'link') and os.path.exists(dest):
                 os.unlink(dest)
-            subst = {'DOC': __doc__, 'VERSION': __version__}
-            if os.path.exists(gitrevfile):
-                with open(gitrevfile, "rt") as f:
-                    subst['REVISION'] = f.readline().strip()
-            _filter_file(src, dest, subst)
+            subst = {'DOC': __doc__, 'VERSION': version}
+            with open(src, "rt") as sf, open(dest, "wt") as df:
+                df.write(string.Template(sf.read()).substitute(subst))
 
 
 setup(
     name='pytest-dependency',
-    version=__version__,
+    version=version,
     description='Manage dependencies of tests',
     author='Rolf Krahl',
     author_email='[email protected]',