Merge branch pipenv. Close #13.

Author: RKrahl

.gitignore

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

CHANGES

@@ -41,6 +41,9 @@
 
  + PR #11: show the name of the skipped test (thanks asteriogonzalez).
 
+ + Issue #13: Do not import pytest in setup.py to make it compatible
+   with pipenv.
+
 * Version 0.2 (2017-05-28)
 
 ** New features

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,14 +1,10 @@
-"""pytest-dependency - Manage dependencies of tests
+"""$DOC"""
 
-This pytest plugin manages dependencies of tests.  It allows to mark
-some tests as dependent from other tests.  These tests will then be
-skipped if any of the dependencies did fail or has been skipped.
-"""
+__version__ = "$VERSION"
+__revision__ = "$REVISION"
 
 import pytest
 
-__version__   = "0.2"
-
 
 class DependencyItemStatus(object):
     """Status of a test item in a dependency manager.

setup.py

@@ -1,25 +1,65 @@
 #! /usr/bin/python
+"""pytest-dependency - Manage dependencies of tests
+
+This pytest plugin manages dependencies of tests.  It allows to mark
+some tests as dependent from other tests.  These tests will then be
+skipped if any of the dependencies did fail or has been skipped.
+"""
+
+__version__ = "0.2"
 
 import sys
 if sys.version_info < (2, 7):
     raise RuntimeError("You are using Python %s.\n"
                        "Please apply python2_6.patch first." 
                        % sys.version.split()[0])
+import os
+import os.path
+import re
 from setuptools import setup
-import pytest_dependency
+import setuptools.command.sdist as st_sdist
+
+
+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)
 
 
 setup(
     name='pytest-dependency',
-    version=pytest_dependency.__version__,
+    version=__version__,
     description='Manage dependencies of tests',
     author='Rolf Krahl',
     author_email='[email protected]',
     maintainer='Rolf Krahl',
     maintainer_email='[email protected]',
     url='https://github.com/RKrahl/pytest-dependency',
     license='Apache Software License 2.0',
-    long_description=pytest_dependency.__doc__,
+    long_description=__doc__,
     py_modules=['pytest_dependency'],
     install_requires=['pytest >= 2.8.0'],
     classifiers=[
@@ -46,4 +86,5 @@
             'dependency = pytest_dependency',
         ],
     },
+    cmdclass = {'sdist': sdist},
 )