Merge branch 'master' into j1

Author: nicoddemus

CHANGELOG.rst

@@ -1,3 +1,9 @@
+1.6.1 (2019-07-22)
+------------------
+
+* `#98 <https://github.com/pytest-dev/execnet/pull/98>`__: Internal change to avoid
+  using deprecated ``funcargs`` name in pytest 5+.
+
 1.6.0 (2019-03-31)
 ------------------
 

README.rst

@@ -1,3 +1,8 @@
+.. warning::
+  
+  execnet is currently not maintained
+
+
 execnet: distributed Python deployment and communication
 ========================================================
 

testing/conftest.py

@@ -83,16 +83,16 @@ def getsocketspec(config=None):
 
 
 def pytest_generate_tests(metafunc):
-    if 'gw' in metafunc.funcargnames:
-        assert 'anypython' not in metafunc.funcargnames, "need combine?"
+    if 'gw' in metafunc.fixturenames:
+        assert 'anypython' not in metafunc.fixturenames, "need combine?"
         if hasattr(metafunc.function, 'gwtypes'):
             gwtypes = metafunc.function.gwtypes
         elif hasattr(metafunc.cls, 'gwtype'):
             gwtypes = [metafunc.cls.gwtype]
         else:
             gwtypes = ['popen', 'socket', 'ssh', 'proxy']
         metafunc.parametrize("gw", gwtypes, indirect=True)
-    elif 'anypython' in metafunc.funcargnames:
+    elif 'anypython' in metafunc.fixturenames:
         metafunc.parametrize(
             "anypython", indirect=True, argvalues=(
                 'sys.executable', 'python2.7', 'pypy', 'jython',