Add a __revision__ variable to pytest_dependency.py.

Author: RKrahl

.gitignore

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

Makefile

@@ -8,7 +8,7 @@ build:
 test: build
 	PYTHONPATH=$(BUILDDIR)/lib $(PYTHON) -m pytest tests
 
-sdist: python2_6.patch doc-html
+sdist: python2_6.patch .gitrevision doc-html
 	$(PYTHON) setup.py sdist
 
 doc-html:
@@ -37,9 +37,11 @@ distclean: clean
 	rm -f python2_6.patch
 	$(MAKE) -C doc distclean
 
+.gitrevision:
+	git describe --always --dirty > .gitrevision
 
 python2_6.patch:
 	git diff `git merge-base master python2_6` python2_6 > $@
 
 
-.PHONY: build test sdist doc-html doc-pdf doc-dist clean distclean
+.PHONY: build test sdist doc-html doc-pdf doc-dist clean distclean .gitrevision

pytest_dependency.py

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

setup.py

@@ -39,9 +39,13 @@ def 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)