Author: Vincent Prat <vinceprat@free.fr>
Description: replacement of deprecated pytest features
--- a/astroquery/vizier/tests/test_vizier.py
+++ b/astroquery/vizier/tests/test_vizier.py
@@ -27,7 +27,7 @@
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests.Session, 'request', post_mockreturn)
     return mp
 
@@ -50,7 +50,7 @@
 
 @pytest.fixture
 def patch_coords(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(commons, 'parse_coordinates', parse_objname)
     return mp
 
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,7 +7,7 @@
 upload-dir = docs/_build/html
 show-response = 1
 
-[pytest]
+[tool:pytest]
 minversion = 2.2
 norecursedirs = build docs/_build
 doctest_plus = enabled
--- a/astroquery/alfalfa/tests/test_alfalfa.py
+++ b/astroquery/alfalfa/tests/test_alfalfa.py
@@ -27,7 +27,7 @@
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests, 'get', get_mockreturn)
     return mp
 
@@ -38,7 +38,7 @@
     def get_readable_fileobj_mockreturn(filename, **kwargs):
         file_obj = data_path(DATA_FILES['spectrum'])  # TODO: add images option
         yield open(file_obj, 'rb')  # read as bytes, assuming FITS
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(commons, 'get_readable_fileobj',
                get_readable_fileobj_mockreturn)
     return mp
--- a/astroquery/besancon/tests/test_besancon.py
+++ b/astroquery/besancon/tests/test_besancon.py
@@ -54,7 +54,7 @@
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests, 'post', post_mockreturn)
     return mp
 
@@ -72,7 +72,7 @@
             file_obj = filename
         # file_obj = data_path(filename)
         yield file_obj
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(commons, 'get_readable_fileobj',
                get_readable_fileobj_mockreturn)
     return mp
--- a/astroquery/eso/tests/test_eso.py
+++ b/astroquery/eso/tests/test_eso.py
@@ -31,7 +31,7 @@
 
 # @pytest.fixture
 # def patch_get(request):
-#    mp = request.getfuncargvalue("monkeypatch")
+#    mp = request.getfixturevalue("monkeypatch")
 #    mp.setattr(Eso, 'request', eso_request)
 #    return mp
 
--- a/astroquery/fermi/tests/test_fermi.py
+++ b/astroquery/fermi/tests/test_fermi.py
@@ -21,7 +21,7 @@
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests, 'post', post_mockreturn)
     return mp
 
--- a/astroquery/ibe/tests/test_ibe.py
+++ b/astroquery/ibe/tests/test_ibe.py
@@ -33,7 +33,7 @@
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests.Session, 'request', get_mockreturn)
     return mp
 
--- a/astroquery/irsa/tests/test_irsa.py
+++ b/astroquery/irsa/tests/test_irsa.py
@@ -31,7 +31,7 @@
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests, 'get', get_mockreturn)
     return mp
 
--- a/astroquery/irsa_dust/tests/test_irsa_dust.py
+++ b/astroquery/irsa_dust/tests/test_irsa_dust.py
@@ -48,7 +48,7 @@
 
 @pytest.fixture
 def patch_request(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(
         commons,
         'send_request',
@@ -59,7 +59,7 @@
 
 @pytest.fixture
 def patch_fromname(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
 
     def fromname(self, name):
         if isinstance(name, str):
--- a/astroquery/lcogt/tests/test_lcogt.py
+++ b/astroquery/lcogt/tests/test_lcogt.py
@@ -30,7 +30,7 @@
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(lcogt.core.Lcogt, '_request', get_mockreturn)
     return mp
 
--- a/astroquery/magpis/tests/test_magpis.py
+++ b/astroquery/magpis/tests/test_magpis.py
@@ -24,14 +24,14 @@
 def patch_parse_coordinates(request):
     def parse_coordinates_mock_return(c):
         return c
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(commons, 'parse_coordinates', parse_coordinates_mock_return)
     return mp
 
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests, 'post', post_mockreturn)
     return mp
 
--- a/astroquery/ned/tests/test_ned.py
+++ b/astroquery/ned/tests/test_ned.py
@@ -41,7 +41,7 @@
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests, 'get', get_mockreturn)
     return mp
 
@@ -54,7 +54,7 @@
         # otherwise
         assert encoding == 'binary'
         return open(data_path(DATA_FILES['image']), 'rb')
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(commons, 'get_readable_fileobj',
                get_readable_fileobj_mockreturn)
     return mp
--- a/astroquery/nist/tests/test_nist.py
+++ b/astroquery/nist/tests/test_nist.py
@@ -20,7 +20,7 @@
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests, 'get', get_mockreturn)
     return mp
 
--- a/astroquery/nrao/tests/test_nrao.py
+++ b/astroquery/nrao/tests/test_nrao.py
@@ -23,14 +23,14 @@
 def patch_parse_coordinates(request):
     def parse_coordinates_mock_return(c):
         return c
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(commons, 'parse_coordinates', parse_coordinates_mock_return)
     return mp
 
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests.Session, 'request', post_mockreturn)
     return mp
 
--- a/astroquery/nvas/tests/test_nvas.py
+++ b/astroquery/nvas/tests/test_nvas.py
@@ -30,7 +30,7 @@
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests, 'post', post_mockreturn)
     return mp
 
@@ -39,7 +39,7 @@
 def patch_parse_coordinates(request):
     def parse_coordinates_mock_return(c):
         return c
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(commons, 'parse_coordinates', parse_coordinates_mock_return)
     return mp
 
@@ -62,7 +62,7 @@
             file_obj = open(data_path(DATA_FILES["image"]),
                             "r", encoding=encoding)
         yield file_obj
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(commons, 'get_readable_fileobj',
                get_readable_fileobj_mockreturn)
     return mp
--- a/astroquery/ogle/tests/test_ogle.py
+++ b/astroquery/ogle/tests/test_ogle.py
@@ -19,7 +19,7 @@
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests, 'post', post_mockreturn)
     return mp
 
--- a/astroquery/sdss/tests/test_sdss.py
+++ b/astroquery/sdss/tests/test_sdss.py
@@ -26,21 +26,21 @@
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(sdss.SDSS, '_request', get_mockreturn)
     return mp
 
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(sdss.SDSS, '_request', post_mockreturn)
     return mp
 
 
 @pytest.fixture
 def patch_get_slow(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(sdss.SDSS, '_request', get_mockreturn_slow)
     return mp
 
@@ -56,7 +56,7 @@
         else:
             yield open(file_obj, 'r', encoding=encoding)
 
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(commons, 'get_readable_fileobj',
                get_readable_fileobj_mockreturn)
     return mp
@@ -70,7 +70,7 @@
         e.reason = socket.timeout()
         raise e
         yield True
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(commons, 'get_readable_fileobj',
                get_readable_fileobj_mockreturn)
     return mp
--- a/astroquery/sha/tests/test_sha.py
+++ b/astroquery/sha/tests/test_sha.py
@@ -40,7 +40,7 @@
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests, 'get', get_mockreturn)
     return mp
 
--- a/astroquery/simbad/tests/test_simbad.py
+++ b/astroquery/simbad/tests/test_simbad.py
@@ -58,7 +58,7 @@
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests, 'post', post_mockreturn)
     return mp
 
--- a/astroquery/skyview/tests/test_skyview.py
+++ b/astroquery/skyview/tests/test_skyview.py
@@ -17,7 +17,7 @@
 
 @pytest.fixture
 def patch_fromname(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
 
     def fromname(self, name):
         if isinstance(name, str):
@@ -61,7 +61,7 @@
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(SkyView, '_request', MockResponseSkyviewForm)
     return mp
 
--- a/astroquery/splatalogue/tests/test_splatalogue.py
+++ b/astroquery/splatalogue/tests/test_splatalogue.py
@@ -16,7 +16,7 @@
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests.Session, 'request', post_mockreturn)
     return mp
 
--- a/astroquery/template_module/tests/test_module.py
+++ b/astroquery/template_module/tests/test_module.py
@@ -67,7 +67,7 @@
 # that mocks(monkeypatches) the actual 'requests.get' function:
 @pytest.fixture
 def patch_request(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(template_module.core.TemplateClass, '_request',
                nonremote_request)
     return mp
--- a/astroquery/ukidss/tests/test_ukidss.py
+++ b/astroquery/ukidss/tests/test_ukidss.py
@@ -28,7 +28,7 @@
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests, 'get', get_mockreturn)
     return mp
 
@@ -44,7 +44,7 @@
         else:
             file_obj = open(data_path(DATA_FILES["votable"]), mode)
         yield file_obj
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(commons, 'get_readable_fileobj',
                get_readable_fileobj_mockreturn)
     return mp
@@ -57,7 +57,7 @@
     # This should probably be request, not requests, but this mistake has lead
     # to no errors
     # TODO: determine if this patch is ever used
-    mp = requests.getfuncargvalue("monkeypatch")
+    mp = requests.getfixturevalue("monkeypatch")
     mp.setattr(commons, 'parse_coordinates', parse_coordinates_mock_return)
     return mp
 
--- a/astroquery/xmatch/tests/test_xmatch.py
+++ b/astroquery/xmatch/tests/test_xmatch.py
@@ -32,7 +32,7 @@
 
 @pytest.fixture
 def patch_request(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(requests, "_request", request_mockreturn)
     return mp
 
--- a/astroquery/esasky/tests/test_esasky.py
+++ b/astroquery/esasky/tests/test_esasky.py
@@ -29,7 +29,7 @@
 
 @pytest.fixture
 def esasky_request(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(ESASky, '_request', nonremote_request)
     return mp
 
