MAINT: run pyupgrade for dropping 3.7

Author: bsipocz

pytest_arraydiff/plugin.py

@@ -43,7 +43,7 @@
 abstractclassmethod = abc.abstractclassmethod
 
 
-class BaseDiff(object, metaclass=abc.ABCMeta):
+class BaseDiff(metaclass=abc.ABCMeta):
 
     @abstractstaticmethod
     def read(filename):
@@ -83,8 +83,8 @@ def compare(cls, reference_file, test_file, atol=None, rtol=None):
         try:
             np.testing.assert_allclose(array_ref, array_new, atol=atol, rtol=rtol)
         except AssertionError as exc:
-            message = "\n\na: {0}".format(test_file) + '\n'
-            message += "b: {0}".format(reference_file) + '\n'
+            message = f"\n\na: {test_file}" + '\n'
+            message += f"b: {reference_file}" + '\n'
             message += exc.args[0]
             return False, message
         else:
@@ -160,8 +160,8 @@ def compare(cls, reference_file, test_file, atol=None, rtol=None):
         try:
             pdt.assert_frame_equal(ref_data, test_data)
         except AssertionError as exc:
-            message = "\n\na: {0}".format(test_file) + '\n'
-            message += "b: {0}".format(reference_file) + '\n'
+            message = f"\n\na: {test_file}" + '\n'
+            message += f"b: {reference_file}" + '\n'
             message += exc.args[0]
             return False, message
         else:
@@ -251,7 +251,7 @@ def wrapper(*args, **kwargs):
         item.obj = array_interceptor(plugin, item.obj)
 
 
-class ArrayComparison(object):
+class ArrayComparison:
 
     def __init__(self, config, reference_dir=None, generate_dir=None, default_format='text'):
         self.config = config
@@ -272,7 +272,7 @@ def pytest_runtest_call(self, item):
         file_format = compare.kwargs.get('file_format', self.default_format)
 
         if file_format not in FORMATS:
-            raise ValueError("Unknown format: {0}".format(file_format))
+            raise ValueError(f"Unknown format: {file_format}")
 
         if 'extension' in compare.kwargs:
             extension = compare.kwargs['extension']

tests/test_pytest_arraydiff.py

@@ -40,7 +40,7 @@ def test_succeeds_func_fits_hdu():
     return fits.PrimaryHDU(np.arange(3 * 5).reshape((3, 5)).astype(np.int64))
 
 
-class TestClass(object):
+class TestClass:
 
     @pytest.mark.array_compare(file_format='fits', reference_dir=reference_dir)
     def test_succeeds_class(self):
@@ -66,11 +66,11 @@ def test_fails():
         f.write(TEST_FAILING)
 
     # If we use --arraydiff, it should detect that the file is missing
-    code = subprocess.call('pytest --arraydiff {0}'.format(test_file), shell=True)
+    code = subprocess.call(f'pytest --arraydiff {test_file}', shell=True)
     assert code != 0
 
     # If we don't use --arraydiff option, the test should succeed
-    code = subprocess.call('pytest {0}'.format(test_file), shell=True)
+    code = subprocess.call(f'pytest {test_file}', shell=True)
     assert code == 0
 
 
@@ -102,7 +102,7 @@ def test_generate(file_format):
         assert b'File not found for comparison test' in grepexc.output
 
     # If we do generate, the test should succeed and a new file will appear
-    code = subprocess.call(['pytest', '--arraydiff-generate-path={0}'.format(gen_dir), test_file],
+    code = subprocess.call(['pytest', f'--arraydiff-generate-path={gen_dir}', test_file],
                            timeout=10)
     assert code == 0
     assert os.path.exists(os.path.join(gen_dir, 'test_gen.' + ('fits' if file_format == 'fits' else 'txt')))
@@ -130,8 +130,8 @@ def test_default_format(file_format):
     gen_dir = os.path.join(tmpdir, 'spam', 'egg')
 
     # If we do generate, the test should succeed and a new file will appear
-    code = subprocess.call('pytest -s --arraydiff-default-format={0}'
-                           ' --arraydiff-generate-path={1} {2}'.format(file_format, gen_dir, test_file), shell=True)
+    code = subprocess.call('pytest -s --arraydiff-default-format={}'
+                           ' --arraydiff-generate-path={} {}'.format(file_format, gen_dir, test_file), shell=True)
     assert code == 0
     assert os.path.exists(os.path.join(gen_dir, 'test_default.' + ('fits' if file_format == 'fits' else 'txt')))