Merge pull request #75 from dmtucker/nodeid

Add a configurable name to MypyItem node IDs

Author: dmtucker

setup.py

@@ -32,8 +32,8 @@ def read(fname):
     python_requires='~=3.4',
     install_requires=[
         'filelock>=3.0',
-        'pytest>=2.8,<4.7; python_version<"3.5"',
-        'pytest>=2.8; python_version>="3.5"',
+        'pytest>=3.5,<4.7; python_version<"3.5"',
+        'pytest>=3.5; python_version>="3.5"',
         'mypy>=0.500,<0.700; python_version<"3.5"',
         'mypy>=0.500; python_version>="3.5" and python_version<"3.8"',
         'mypy>=0.700; python_version>="3.8"',

src/pytest_mypy.py

@@ -10,6 +10,7 @@
 
 
 mypy_argv = []
+nodeid_name = 'mypy'
 
 
 def pytest_addoption(parser):
@@ -77,7 +78,14 @@ def pytest_collect_file(path, parent):
             parent.config.option.mypy,
             parent.config.option.mypy_ignore_missing_imports,
     ]):
-        return MypyItem(path, parent)
+        item = MypyItem(path, parent)
+        if nodeid_name:
+            item = MypyItem(
+                path,
+                parent,
+                nodeid='::'.join([item.nodeid, nodeid_name]),
+            )
+        return item
     return None
 
 

tests/test_pytest_mypy.py

@@ -145,6 +145,19 @@ def pytest_configure(config):
     assert result.ret == 0
 
 
+def test_api_nodeid_name(testdir, xdist_args):
+    """Ensure that the plugin can be configured in a conftest.py."""
+    nodeid_name = 'UnmistakableNodeIDName'
+    testdir.makepyfile(conftest='''
+        def pytest_configure(config):
+            plugin = config.pluginmanager.getplugin('mypy')
+            plugin.nodeid_name = '{}'
+    '''.format(nodeid_name))
+    result = testdir.runpytest_subprocess('--mypy', '--verbose', *xdist_args)
+    result.stdout.fnmatch_lines(['*conftest.py::' + nodeid_name + '*'])
+    assert result.ret == 0
+
+
 def test_pytest_collection_modifyitems(testdir, xdist_args):
     testdir.makepyfile(conftest='''
         def pytest_collection_modifyitems(session, config, items):

tox.ini

@@ -3,31 +3,15 @@
 min_version = 3.7.0
 isolated_build = true
 envlist =
-    py34-pytest{2.8, 2.x, 3.0, 3.x, 4.0, 4.x}-mypy{0.50, 0.5x, 0.60, 0.6x}
-    py35-pytest{2.8, 2.x, 3.0, 3.x, 4.0, 4.x, 5.0, 5.x}-mypy{0.50, 0.5x, 0.60, 0.6x, 0.70, 0.7x}
-    py36-pytest{2.8, 2.x, 3.0, 3.x, 4.0, 4.x, 5.0, 5.x}-mypy{0.50, 0.5x, 0.60, 0.6x, 0.70, 0.7x}
-    py37-pytest{2.8, 2.x, 3.0, 3.x, 4.0, 4.x, 5.0, 5.x}-mypy{0.50, 0.5x, 0.60, 0.6x, 0.70, 0.7x}
-    py38-pytest{2.8, 2.x, 3.0, 3.x, 4.0, 4.x, 5.0, 5.x}-mypy{0.71, 0.7x}
+    py34-pytest{3.5, 3.x, 4.0, 4.x}-mypy{0.50, 0.5x, 0.60, 0.6x}
+    py35-pytest{3.5, 3.x, 4.0, 4.x, 5.0, 5.x}-mypy{0.50, 0.5x, 0.60, 0.6x, 0.70, 0.7x}
+    py36-pytest{3.5, 3.x, 4.0, 4.x, 5.0, 5.x}-mypy{0.50, 0.5x, 0.60, 0.6x, 0.70, 0.7x}
+    py37-pytest{3.5, 3.x, 4.0, 4.x, 5.0, 5.x}-mypy{0.50, 0.5x, 0.60, 0.6x, 0.70, 0.7x}
+    py38-pytest{3.5, 3.x, 4.0, 4.x, 5.0, 5.x}-mypy{0.71, 0.7x}
     flake8
 
 [testenv]
 deps =
-    pytest2.8: pytest ~= 2.8.0
-    pytest2.8: pytest-xdist < 1.18.0
-    pytest2.x: pytest ~= 2.8
-    pytest2.x: pytest-xdist < 1.18.0
-    pytest3.0: pytest ~= 3.0.0
-    pytest3.0: pytest-xdist < 1.19.0
-    pytest3.1: pytest ~= 3.1.0
-    pytest3.1: pytest-xdist < 1.19.0
-    pytest3.2: pytest ~= 3.2.0
-    pytest3.2: pytest-xdist < 1.19.0
-    pytest3.3: attrs < 19.2.0  # https://github.com/pytest-dev/pytest/issues/3223
-    pytest3.3: pytest ~= 3.3.0
-    pytest3.3: pytest-xdist < 1.19.0
-    pytest3.4: attrs < 19.2.0  # https://github.com/pytest-dev/pytest/issues/3223
-    pytest3.4: pytest ~= 3.4.0
-    pytest3.4: pytest-xdist < 1.19.0
     pytest3.5: pytest ~= 3.5.0
     pytest3.5: pytest-xdist < 1.19.0
     pytest3.6: pytest ~= 3.6.0
@@ -40,7 +24,7 @@ deps =
     pytest3.9: pytest-xdist < 1.28.0
     pytest3.10: pytest ~= 3.10.0
     pytest3.10: pytest-xdist < 1.28.0
-    pytest3.x: pytest ~= 3.0
+    pytest3.x: pytest ~= 3.5
     pytest3.x: pytest-xdist < 1.28.0
     pytest4.0: attrs < 19.2.0  # https://github.com/pytest-dev/pytest/issues/5900
     pytest4.0: pytest ~= 4.0.0