Merge branch 'master' into scope

Author: RKrahl

.travis.yml

@@ -1,8 +1,6 @@
 language: python
 python:
   - "2.7"
-  - "3.2"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"

CHANGES

@@ -1,9 +1,7 @@
-include CHANGES
 include LICENSE.txt
 include MANIFEST.in
 include README.rst
 include doc/examples/*.py
-include python2_6.patch
 include tests/conftest.py
 include tests/pytest.ini
 include tests/test_*.py

MANIFEST.in

@@ -8,13 +8,12 @@ build:
 test: build
 	PYTHONPATH=$(BUILDDIR)/lib $(PYTHON) -m pytest tests
 
-sdist: python2_6.patch .gitrevision
+sdist: .gitrevision
 	$(PYTHON) setup.py sdist
 
 doc-html:
 	$(MAKE) -C doc html
 
-
 clean:
 	rm -f *~ tests/*~
 	rm -rf build
@@ -27,15 +26,11 @@ distclean: clean
 	rm -rf __pycache__ tests/__pycache__
 	rm -rf dist
 	rm -rf pytest_dependency.egg-info
-	rm -f python2_6.patch
+	rm -rf .pytest_cache
 	$(MAKE) -C doc distclean
 
 .gitrevision:
 	git describe --always --dirty > .gitrevision
 
-python2_6.patch:
-	git diff `git merge-base master python2_6` python2_6 \
-	    -- . ':(exclude).travis.yml' > $@
-
 
 .PHONY: build test sdist doc-html clean distclean .gitrevision

Makefile

@@ -20,12 +20,9 @@ The latest release version can be found at PyPI, see
 System requirements
 -------------------
 
-+ Python 2.6, 2.7, or 3.2 and newer.
-  Python 2.6 requires patching the sources, see below.
++ Python 2.7 or 3.4 and newer.
 + `setuptools`_.
-+ `pytest`_ 2.8.0 or newer.
-
-(Python 3.1 is not supported by pytest 2.8.0 itself.)
++ `pytest`_ 3.6.0 or newer.
 
 
 Installation
@@ -48,16 +45,6 @@ Installation
 The last step might require admin privileges in order to write into
 the site-packages directory of your Python installation.
 
-If you are using Python 2.6, apply python2_6.patch after the first
-step:
-
-1a. Patch::
-
-     $ patch -p1 < python2_6.patch
-
-It removes the use of certain language features (dict comprehensions)
-that were introduced in Python 2.7.
-
 
 Documentation
 -------------

README.rst

@@ -24,7 +24,7 @@ def test_a(x):
 def test_b():
     pass
 
-params_c = zip(range(0,8,2), range(2,6))
+params_c = list(zip(range(0,8,2), range(2,6)))
 
 @pytest.mark.parametrize("x,y", params_c)
 @pytest.mark.dependency()

doc/examples/all_params.py

@@ -26,13 +26,14 @@ def __str__(self):
 # Create enriched parameter lists, decorated with the dependency marker.
 
 childparam = [ 
-    pytest.mark.dependency(name="test_child[%s]" % c)(c) for c in childs
+    pytest.param(c, marks=pytest.mark.dependency(name="test_child[%s]" % c)) 
+    for c in childs
 ]
 parentparam = [
-    pytest.mark.dependency(
+    pytest.param(p, marks=pytest.mark.dependency(
         name="test_parent[%s]" % p, 
         depends=["test_child[%s]" % c for c in p.children]
-    )(p) for p in parents
+    )) for p in parents
 ]
 
 @pytest.mark.parametrize("c", childparam)

doc/examples/dyn-parametrized.py

@@ -1,29 +1,39 @@
 import pytest
 
 @pytest.mark.parametrize("x,y", [
-    pytest.mark.dependency(name="a1")((0,0)),
-    pytest.mark.dependency(name="a2")(pytest.mark.xfail((0,1))),
-    pytest.mark.dependency(name="a3")((1,0)),
-    pytest.mark.dependency(name="a4")((1,1))
+    pytest.param(0, 0, marks=pytest.mark.dependency(name="a1")),
+    pytest.param(0, 1, marks=[pytest.mark.dependency(name="a2"),
+                              pytest.mark.xfail]),
+    pytest.param(1, 0, marks=pytest.mark.dependency(name="a3")),
+    pytest.param(1, 1, marks=pytest.mark.dependency(name="a4"))
 ])
 def test_a(x,y):
     assert y <= x
 
 @pytest.mark.parametrize("u,v", [
-    pytest.mark.dependency(name="b1", depends=["a1", "a2"])((1,2)),
-    pytest.mark.dependency(name="b2", depends=["a1", "a3"])((1,3)),
-    pytest.mark.dependency(name="b3", depends=["a1", "a4"])((1,4)),
-    pytest.mark.dependency(name="b4", depends=["a2", "a3"])((2,3)),
-    pytest.mark.dependency(name="b5", depends=["a2", "a4"])((2,4)),
-    pytest.mark.dependency(name="b6", depends=["a3", "a4"])((3,4))
+    pytest.param(1, 2, marks=pytest.mark.dependency(name="b1", 
+                                                    depends=["a1", "a2"])),
+    pytest.param(1, 3, marks=pytest.mark.dependency(name="b2", 
+                                                    depends=["a1", "a3"])),
+    pytest.param(1, 4, marks=pytest.mark.dependency(name="b3", 
+                                                    depends=["a1", "a4"])),
+    pytest.param(2, 3, marks=pytest.mark.dependency(name="b4", 
+                                                    depends=["a2", "a3"])),
+    pytest.param(2, 4, marks=pytest.mark.dependency(name="b5", 
+                                                    depends=["a2", "a4"])),
+    pytest.param(3, 4, marks=pytest.mark.dependency(name="b6", 
+                                                    depends=["a3", "a4"]))
 ])
 def test_b(u,v):
     pass
 
 @pytest.mark.parametrize("w", [
-    pytest.mark.dependency(name="c1", depends=["b1", "b2", "b6"])(1),
-    pytest.mark.dependency(name="c2", depends=["b2", "b3", "b6"])(2),
-    pytest.mark.dependency(name="c3", depends=["b2", "b4", "b6"])(3)
+    pytest.param(1, marks=pytest.mark.dependency(name="c1", 
+                                                 depends=["b1", "b2", "b6"])),
+    pytest.param(2, marks=pytest.mark.dependency(name="c2", 
+                                                 depends=["b2", "b3", "b6"])),
+    pytest.param(3, marks=pytest.mark.dependency(name="c3", 
+                                                 depends=["b2", "b4", "b6"]))
 ])
 def test_c(w):
     pass

doc/examples/parametrized.py

@@ -71,7 +71,7 @@ Copyright and License
 
 - Copyright 2013-2015
   Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
-- Copyright 2016-2017 Rolf Krahl
+- Copyright 2016-2018 Rolf Krahl
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You may

doc/src/about.rst

@@ -0,0 +1,96 @@
+History of changes to pytest-dependency
+=======================================
+
+dev (not yet released)
+    Bug fixes and minor changes
+      + Issue #34: failing test with pytest 4.2.0 and newer.
+
+0.4 (2018-12-02)
+    Incompatible changes
+      + Require pytest version 3.6.0 or newer.  This implicitly drops
+	support for Python 2.6 and for Python 3.3 and older.
+
+    Bug fixes and minor changes
+      + Issue #24: get_marker no longer available in pytest 4.0.0.
+	(Thanks to Rogdham for the PR.)
+      + Issue #28: Applying markers directly in parametrize is no
+	longer available in 4.0.
+
+0.3.2 (2018-01-17)
+    Bug fixes and minor changes
+      + Issue #5: properly register the dependency marker.
+      + Do not add the documentation to the source distribution.
+
+0.3.1 (2017-12-26)
+    Bug fixes and minor changes
+      + Issue #17: Move the online documentation to Read the Docs
+      + Some improvements in the documentation.
+
+0.3 (2017-12-26)
+    New features
+      + Issue #7: Add a configuration switch to implicitly mark all
+	tests.
+      + Issue #10: Add an option to ignore unknown dependencies.
+
+    Incompatible changes
+      + Prepend the class name to the default test name for test class
+	methods.  This fixes a potential name conflict, see Issue #6.
+
+        If your code uses test classes and you reference test methods
+        by their default name, you must add the class name.  E.g. if
+        you have something like:
+
+	.. code-block:: python
+
+          class TestClass(object):
+
+              @pytest.mark.dependency()
+              def test_a():
+                  pass
+
+              @pytest.mark.dependency(depends=["test_a"])
+              def test_b():
+                  pass
+
+        you need to change this to:
+
+	.. code-block:: python
+
+          class TestClass(object):
+
+              @pytest.mark.dependency()
+              def test_a():
+                  pass
+
+              @pytest.mark.dependency(depends=["TestClass::test_a"])
+              def test_b():
+                  pass
+
+        If you override the test name in the pytest.mark.dependency()
+        marker, nothing need to be changed.
+
+    Bug fixes and minor changes
+      + 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.
+      + Issue #15: tests fail with pytest 3.3.0.
+      + Issue #8: document incompatibility with parallelization in
+        pytest-xdist.
+      + Clarify in the documentation that Python 3.1 is not officially
+	supported because pytest 2.8 does not support it.  There is no
+	known issue with Python 3.1 though.
+
+0.2 (2017-05-28)
+    New features
+      + Issue #2: Add documentation.
+      + Issue #4: Add a depend() function to add a dependency to a
+        test at runtime.
+
+0.1 (2017-01-29)
+    + Initial release as an independent Python module.
+
+      This code was first developed as part of a larger package,
+      python-icat, at Helmholtz-Zentrum Berlin für Materialien und
+      Energie, see
+      https://icatproject.org/user-documentation/python-icat/