Merge branch 'release/0.5.0'

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

README.rst

@@ -24,6 +24,16 @@ System requirements
 + `setuptools`_.
 + `pytest`_ 3.6.0 or newer.
 
+Optional library packages:
+
++ `setuptools_scm`_
+
+  The version number is managed using this package.  All source
+  distributions add a static text file with the version number and
+  fall back using that if `setuptools_scm` is not available.  So this
+  package is only needed to build out of the plain development source
+  tree as cloned from GitHub.
+
 
 Installation
 ------------
@@ -79,3 +89,4 @@ permissions and limitations under the License.
 
 .. _setuptools: http://pypi.python.org/pypi/setuptools/
 .. _pytest: http://pytest.org/
+.. _setuptools_scm: https://github.com/pypa/setuptools_scm/

doc/examples/basic.out

@@ -1,15 +1,15 @@
-$ py.test -rsx basic.py
+$ pytest -rsx basic.py 
 ============================= test session starts ==============================
-platform linux -- Python 3.4.6, pytest-2.8.7, py-1.4.30, pluggy-0.3.1
-rootdir: /home/user/pytest-dependency-0.2, inifile: 
-plugins: dependency-0.2
-collected 5 items 
+platform linux -- Python 3.8.1, pytest-5.3.4, py-1.8.1, pluggy-0.13.1
+rootdir: /home/user/tests
+plugins: dependency-0.4.0
+collected 5 items                                                              
+
+basic.py x.s.s                                                           [100%]
 
-basic.py x.s.s
 =========================== short test summary info ============================
-SKIP [1] /usr/lib/python3.4/site-packages/pytest_dependency.py:65: test_e depends on test_c
-SKIP [1] /usr/lib/python3.4/site-packages/pytest_dependency.py:65: test_c depends on test_a
+SKIPPED [1] /usr/lib/python3.8/site-packages/pytest_dependency.py:87: test_c depends on test_a
+SKIPPED [1] /usr/lib/python3.8/site-packages/pytest_dependency.py:87: test_e depends on test_c
 XFAIL basic.py::test_a
   deliberate fail
-
-================ 2 passed, 2 skipped, 1 xfailed in 0.02 seconds ================
+=================== 2 passed, 2 skipped, 1 xfailed in 0.06s ====================

doc/examples/nodeid.out

@@ -0,0 +1,17 @@
+$ pytest --verbose
+============================= test session starts ==============================
+platform linux -- Python 3.8.1, pytest-5.3.4, py-1.8.1, pluggy-0.13.1 -- /usr/bin/python3
+cachedir: .pytest_cache
+rootdir: /home/user
+plugins: dependency-0.4.0
+collected 7 items                                                              
+
+tests/test_nodeid.py::test_a PASSED                                      [ 14%]
+tests/test_nodeid.py::test_b[7-True] PASSED                              [ 28%]
+tests/test_nodeid.py::test_b[0-False] PASSED                             [ 42%]
+tests/test_nodeid.py::test_b[-1-False] XFAIL                             [ 57%]
+tests/test_nodeid.py::TestClass::test_c PASSED                           [ 71%]
+tests/test_nodeid.py::TestClass::test_d[order] PASSED                    [ 85%]
+tests/test_nodeid.py::TestClass::test_d[disorder] PASSED                 [100%]
+
+========================= 6 passed, 1 xfailed in 0.08s =========================

doc/examples/nodeid.py

@@ -0,0 +1,26 @@
+import random
+import pytest
+
+def test_a():
+    pass
+
+@pytest.mark.parametrize("i,b", [
+    (7, True),
+    (0, False),
+    pytest.param(-1, False, marks=pytest.mark.xfail(reason="nonsense"))
+])
+def test_b(i, b):
+    assert bool(i) == b
+
+ordered = list(range(10))
+unordered = random.sample(ordered, k=len(ordered))
+
+class TestClass:
+
+    def test_c(self):
+        pass
+
+    @pytest.mark.parametrize("l,ll", [(ordered, 10), (unordered, 10)],
+                             ids=["order", "disorder"])
+    def test_d(self, l, ll):
+        assert len(l) == ll

doc/examples/scope_class.py

@@ -0,0 +1,32 @@
+import pytest
+
+@pytest.mark.dependency()
+@pytest.mark.xfail(reason="deliberate fail")
+def test_a():
+    assert False
+
+
+class TestClass1(object):
+
+    @pytest.mark.dependency()
+    def test_b(self):
+        pass
+
+
+class TestClass2(object):
+
+    @pytest.mark.dependency()
+    def test_a(self):
+        pass
+
+    @pytest.mark.dependency(depends=["test_a"])
+    def test_c(self):
+        pass
+
+    @pytest.mark.dependency(depends=["test_a"], scope='class')
+    def test_d(self):
+        pass
+
+    @pytest.mark.dependency(depends=["test_b"], scope='class')
+    def test_e(self):
+        pass

doc/examples/scope_module.py

@@ -0,0 +1,22 @@
+import pytest
+
+@pytest.mark.dependency()
+@pytest.mark.xfail(reason="deliberate fail")
+def test_a():
+    assert False
+
+@pytest.mark.dependency()
+def test_b():
+    pass
+
+@pytest.mark.dependency(depends=["test_a"], scope='module')
+def test_c():
+    pass
+
+@pytest.mark.dependency(depends=["test_b"], scope='module')
+def test_d():
+    pass
+
+@pytest.mark.dependency(depends=["test_b", "test_c"], scope='module')
+def test_e():
+    pass

doc/examples/scope_session_mod_01.py

@@ -0,0 +1,23 @@
+# test_mod_01.py
+
+import pytest
+
+@pytest.mark.dependency()
+def test_a():
+    pass
+
+@pytest.mark.dependency()
+@pytest.mark.xfail(reason="deliberate fail")
+def test_b():
+    assert False
+
+@pytest.mark.dependency(depends=["test_a"])
+def test_c():
+    pass
+
+
+class TestClass(object):
+
+    @pytest.mark.dependency()
+    def test_b(self):
+        pass

doc/examples/scope_session_mod_02.py

@@ -0,0 +1,29 @@
+# test_mod_02.py
+
+import pytest
+
+@pytest.mark.dependency()
+@pytest.mark.xfail(reason="deliberate fail")
+def test_a():
+    assert False
+
+@pytest.mark.dependency(
+    depends=["tests/test_mod_01.py::test_a", "tests/test_mod_01.py::test_c"],
+    scope='session'
+)
+def test_e():
+    pass
+
+@pytest.mark.dependency(
+    depends=["tests/test_mod_01.py::test_b", "tests/test_mod_02.py::test_e"],
+    scope='session'
+)
+def test_f():
+    pass
+
+@pytest.mark.dependency(
+    depends=["tests/test_mod_01.py::TestClass::test_b"],
+    scope='session'
+)
+def test_g():
+    pass

doc/examples/testclass.py

@@ -32,15 +32,15 @@ class TestClassNamed(object):
     def test_a(self):
         assert False
 
-    @pytest.mark.dependency(name="b", depends=["a"])
+    @pytest.mark.dependency(name="b")
     def test_b(self):
         pass
 
-    @pytest.mark.dependency(name="c")
+    @pytest.mark.dependency(name="c", depends=["a"])
     def test_c(self):
         pass
 
-    @pytest.mark.dependency(name="d", depends=["c"])
+    @pytest.mark.dependency(name="d", depends=["b"])
     def test_d(self):
         pass