Merge branch 'deprecated_get_marker'. Fix #24.

Author: RKrahl

.travis.yml

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

README.rst

@@ -20,12 +20,12 @@ 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, 2.7, or 3.3 and newer.
   Python 2.6 requires patching the sources, see below.
 + `setuptools`_.
-+ `pytest`_ 2.8.0 or newer.
++ `pytest`_ 3.6.0 or newer.
 
-(Python 3.1 is not supported by pytest 2.8.0 itself.)
+(Python 3.2 is not supported by pytest 3.6.0 itself.)
 
 
 Installation

doc/src/configuration.rst

@@ -21,8 +21,8 @@ Configuration file options can be set in the `ini file`.
 
 minversion
    This is a builtin configuration option of pytest itself.  Since
-   pytest-dependency requires pytest 2.8.0 or newer, it is recommended
-   to set this option accordingly, either to 2.8.0 or to a newer
+   pytest-dependency requires pytest 3.6.0 or newer, it is recommended
+   to set this option accordingly, either to 3.6.0 or to a newer
    version, if required by your test code.
 
 automark_dependency

doc/src/install.rst

@@ -4,12 +4,12 @@ Installation instructions
 System requirements
 -------------------
 
-+ Python 2.6, 2.7, or 3.2 and newer.
++ Python 2.6, 2.7, or 3.3 and newer.
   Python 2.6 requires patching the sources, see below.
 + `setuptools`_.
-+ `pytest`_ 2.8.0 or newer.
++ `pytest`_ 3.6.0 or newer.
 
-(Python 3.1 is not supported by pytest 2.8.0 itself.)
+(Python 3.2 is not supported by pytest 3.6.0 itself.)
 
 
 .. _install-other-packages:

pytest_dependency.py

@@ -128,7 +128,7 @@ def pytest_runtest_makereport(item, call):
     """Store the test outcome if this item is marked "dependency".
     """
     outcome = yield
-    marker = item.get_marker("dependency")
+    marker = item.get_closest_marker("dependency")
     if marker is not None or _automark:
         rep = outcome.get_result()
         name = marker.kwargs.get('name') if marker is not None else None
@@ -140,7 +140,7 @@ def pytest_runtest_setup(item):
     """Check dependencies if this item is marked "dependency".
     Skip if any of the dependencies has not been run successfully.
     """
-    marker = item.get_marker("dependency")
+    marker = item.get_closest_marker("dependency")
     if marker is not None:
         depends = marker.kwargs.get('depends')
         if depends:

requirements.txt

@@ -1,3 +1 @@
-pytest >=2.8.0 ; python_version < '3.0'
-pytest >=2.8.0,<3.0.0 ; python_version == '3.2'
-pytest >=2.8.0 ; python_version > '3.2'
+pytest >=3.6.0

setup.py

@@ -60,7 +60,7 @@ def make_release_tree(self, base_dir, files):
         'Source Code': 'https://github.com/RKrahl/pytest-dependency',
     },
     py_modules=['pytest_dependency'],
-    install_requires=['pytest >= 2.8.0'],
+    install_requires=['pytest >= 3.6.0'],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Framework :: Pytest',
@@ -70,7 +70,6 @@ def make_release_tree(self, base_dir, files):
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',

tests/pytest.ini

@@ -1,2 +1,2 @@
 [pytest]
-minversion = 2.8
+minversion = 3.6