Cleaning up usage of old pytest

Author: bsipocz

astroquery/alfalfa/tests/test_alfalfa.py

@@ -27,10 +27,8 @@ def close(self):
 
 @pytest.fixture
 def patch_get(request):
-    try:
-        mp = request.getfixturevalue("monkeypatch")
-    except AttributeError:  # pytest < 3
-        mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
+
     mp.setattr(requests, 'get', get_mockreturn)
     return mp
 
@@ -41,10 +39,9 @@ def patch_get_readable_fileobj(request):
     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
-    try:
-        mp = request.getfixturevalue("monkeypatch")
-    except AttributeError:  # pytest < 3
-        mp = request.getfuncargvalue("monkeypatch")
+
+    mp = request.getfixturevalue("monkeypatch")
+
     mp.setattr(commons, 'get_readable_fileobj',
                get_readable_fileobj_mockreturn)
     return mp

astroquery/astrometry_net/tests/test_astrometry_net.py

@@ -1,26 +1,18 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 import os
 import json
-from distutils.version import LooseVersion
 
 import pytest
 
-from ...utils.testing_tools import MockResponse
-from ...exceptions import (InvalidQueryError)
-
 from .. import AstrometryNet
 
-_pytest_is_old = LooseVersion(pytest.__version__) < LooseVersion('3.3')
-
 DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
 
 def data_path(filename):
     return os.path.join(DATA_DIR, filename)
 
 
-@pytest.mark.skipif(_pytest_is_old,
-                    reason='pytest version too old for caplog')
 def test_api_key_property(caplog):
     """
     Check that an empty key is returned if the api key is not in
@@ -46,8 +38,6 @@ def test_empty_settings_property():
     assert set(empty.keys()) == set(anet._constraints.keys())
 
 
-@pytest.mark.skipif(_pytest_is_old,
-                    reason='pytest version too old for output attributes')
 def test_show_allowed_settings(capsys):
     """
     Check that the expected content is printed to standard out when the

astroquery/besancon/tests/test_besancon.py

@@ -52,10 +52,8 @@ def test_reader(filename, length, ncols, d1, mv1):
 
 @pytest.fixture
 def patch_post(request):
-    try:
-        mp = request.getfixturevalue("monkeypatch")
-    except AttributeError:  # pytest < 3
-        mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
+
     mp.setattr(besancon.Besancon, '_request', post_mockreturn)
     return mp
 
@@ -72,10 +70,9 @@ def get_readable_fileobj_mockreturn(filename, **kwargs):
         else:
             file_obj = filename
         yield file_obj
-    try:
-        mp = request.getfixturevalue("monkeypatch")
-    except AttributeError:  # pytest < 3
-        mp = request.getfuncargvalue("monkeypatch")
+
+    mp = request.getfixturevalue("monkeypatch")
+
     mp.setattr(commons, 'get_readable_fileobj',
                get_readable_fileobj_mockreturn)
     return mp

astroquery/casda/tests/test_casda.py

@@ -16,7 +16,7 @@
 from astroquery.casda import Casda
 
 try:
-    from unittest.mock import Mock, patch, PropertyMock, MagicMock
+    from unittest.mock import Mock, patch, MagicMock
 except ImportError:
     pytest.skip("Install mock for the casda tests.", allow_module_level=True)
 
@@ -94,10 +94,8 @@ def create_auth_failure_response():
 
 @pytest.fixture
 def patch_get(request):
-    try:
-        mp = request.getfixturevalue("monkeypatch")
-    except AttributeError:  # pytest < 3
-        mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
+
     mp.setattr(requests.Session, 'request', get_mockreturn)
     return mp
 

astroquery/cds/tests/test_mocserver.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*
 
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
-import sys
 import pytest
 import os
 import requests
@@ -33,10 +32,8 @@
 
 @pytest.fixture
 def patch_get(request):
-    try:
-        mp = request.getfixturevalue("monkeypatch")
-    except AttributeError:  # pytest < 3
-        mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
+
     mp.setattr(requests.Session, 'request', get_mockreturn)
     return mp
 

astroquery/eso/tests/test_eso.py

@@ -36,10 +36,8 @@ def eso_request(request_type, url, **kwargs):
 
 # @pytest.fixture
 # def patch_get(request):
-#    try:
-#        mp = request.getfixturevalue("monkeypatch")
-#    except AttributeError:  # pytest < 3
-#        mp = request.getfuncargvalue("monkeypatch")
+#    mp = request.getfixturevalue("monkeypatch")
+#
 #    mp.setattr(Eso, 'request', eso_request)
 #    return mp
 

astroquery/fermi/tests/test_fermi.py

@@ -21,10 +21,8 @@ def data_path(filename):
 
 @pytest.fixture
 def patch_post(request):
-    try:
-        mp = request.getfixturevalue("monkeypatch")
-    except AttributeError:  # pytest < 3
-        mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
+
     mp.setattr(fermi.FermiLAT, '_request', post_mockreturn)
     mp.setattr(requests, 'post', post_mockreturn)
     return mp

astroquery/gemini/tests/test_gemini.py

@@ -32,10 +32,8 @@ def json(self):
 @pytest.fixture
 def patch_get(request):
     """ mock get requests so they return our canned JSON to mimic Gemini's archive website """
-    try:
-        mp = request.getfixturevalue("monkeypatch")
-    except AttributeError:  # pytest < 3
-        mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
+
     mp.setattr(requests.Session, 'request', get_mockreturn)
     return mp
 

astroquery/imcce/tests/test_miriade.py

@@ -1,6 +1,5 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
-
 import pytest
 import os
 
@@ -32,12 +31,9 @@ def nonremote_request(self, request_type, url, **kwargs):
 # that mocks(monkeypatches) the actual 'requests.get' function:
 @pytest.fixture
 def patch_request(request):
-    try:
-        mp = request.getfixturevalue("monkeypatch")
-    except AttributeError:  # pytest < 3
-        mp = request.getfuncargvalue("monkeypatch")
-    mp.setattr(MiriadeClass, '_request',
-               nonremote_request)
+    mp = request.getfixturevalue("monkeypatch")
+
+    mp.setattr(MiriadeClass, '_request', nonremote_request)
     return mp
 
 

astroquery/imcce/tests/test_skybot.py

@@ -32,12 +32,9 @@ def nonremote_request(self, url, **kwargs):
 # that mocks(monkeypatches) the actual 'requests.get' function:
 @pytest.fixture
 def patch_request(request):
-    try:
-        mp = request.getfixturevalue("monkeypatch")
-    except AttributeError:  # pytest < 3
-        mp = request.getfuncargvalue("monkeypatch")
-    mp.setattr(SkybotClass, '_request',
-               nonremote_request)
+    mp = request.getfixturevalue("monkeypatch")
+
+    mp.setattr(SkybotClass, '_request', nonremote_request)
     return mp