Add pytest lint

Author: WilliamJamieson

gwcs/tests/conftest.py

@@ -92,23 +92,22 @@ def sellmeier_zemax():
     return examples.sellmeier_zemax()
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def gwcs_3d_galactic_spectral():
     return examples.gwcs_3d_galactic_spectral()
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def gwcs_1d_spectral():
     return examples.gwcs_1d_spectral()
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def gwcs_spec_cel_time_4d():
     return examples.gwcs_spec_cel_time_4d()
 
 
 @pytest.fixture(
-    scope="function",
     params=[
         (2, 1, 0),
         (2, 0, 1),
@@ -123,7 +122,6 @@ def gwcs_cube_with_separable_spectral(request):
 
 
 @pytest.fixture(
-    scope="function",
     params=[
         (2, 0, 1),
         (2, 1, 0),
@@ -140,7 +138,7 @@ def gwcs_cube_with_separable_time(request):
     return examples.gwcs_cube_with_separable_time(axes_order)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def gwcs_7d_complex_mapping():
     return examples.gwcs_7d_complex_mapping()
 

gwcs/tests/test_api.py

@@ -163,7 +163,7 @@ def test_pixel_to_world_values_units_2d(gwcs_2d_shift_scale_quantity, x, y):
     [assert_allclose(n, p) for n, p in zip(new_api_pixel, api_pixel, strict=False)]
 
 
-@pytest.mark.parametrize(("x"), (x, xarr))
+@pytest.mark.parametrize(("x"), [x, xarr])
 def test_pixel_to_world_values_units_1d(gwcs_1d_freq_quantity, x):
     wcsobj = gwcs_1d_freq_quantity
 
@@ -456,7 +456,7 @@ def test_pixel_to_world_quantity(gwcs_2d_shift_scale, gwcs_2d_shift_scale_quanti
     assert_allclose(result1.data.lat, result2.data.lat)
 
     # test for pixel units
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         gwcs_2d_shift_scale.pixel_to_world(x * u.Jy, y * u.Jy)
 
 
@@ -483,7 +483,7 @@ def test_array_index_to_world_quantity(
     assert_allclose(result0.data.lat, result1.data.lat)
 
     # test for pixel units
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         gwcs_2d_shift_scale.array_index_to_world(x * u.Jy, y * u.Jy)
 
 

gwcs/tests/test_coordinate_systems.py

@@ -205,17 +205,17 @@ def test_axes_type():
 
 
 def test_length_attributes():
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         cf.CoordinateFrame(
             naxes=2, unit=(u.deg), axes_type=("SPATIAL", "SPATIAL"), axes_order=(0, 1)
         )
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         cf.CoordinateFrame(
             naxes=2, unit=(u.deg, u.deg), axes_type=("SPATIAL",), axes_order=(0, 1)
         )
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         cf.CoordinateFrame(
             naxes=2,
             unit=(u.deg, u.deg),
@@ -285,10 +285,10 @@ def test_coordinate_to_quantity_celestial(inp):
     assert_quantity_allclose(lon, 10 * u.deg)
     assert_quantity_allclose(lat, 20 * u.deg)
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         coordinate_to_quantity(10 * u.deg, 2 * u.deg, 3 * u.deg, frame=cel)
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         coordinate_to_quantity((1, 2), frame=cel)
 
 
@@ -407,14 +407,14 @@ def test_coordinate_to_quantity_frame_2d():
 
 def test_coordinate_to_quantity_error():
     frame = cf.Frame2D(unit=(u.one, u.arcsec))
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         coordinate_to_quantity(1, frame=frame)
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         coordinate_to_quantity((1, 1), 2, frame=frame)
 
     frame = cf.TemporalFrame(reference_frame=Time([], format="isot"), unit=u.s)
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         coordinate_to_quantity(1, frame=frame)
 
 
@@ -450,7 +450,7 @@ def test_axis_physical_types():
     fr2d = cf.Frame2D(name="d", axis_physical_types=("pos.x", "pos.y"))
     assert fr2d.axis_physical_types == ("custom:pos.x", "custom:pos.y")
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         cf.CelestialFrame(
             reference_frame=coord.ICRS(), axis_physical_types=("pos.eq.ra",)
         )
@@ -481,7 +481,7 @@ def test_axis_physical_types():
         naxes=1,
     )
     assert frame.axis_physical_types == ("custom:length",)
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         cf.CoordinateFrame(
             name="custom_frame",
             axes_type=("SPATIAL",),
@@ -492,7 +492,7 @@ def test_axis_physical_types():
 
 
 def test_base_frame():
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         cf.CoordinateFrame(
             name="custom_frame",
             axes_type=("SPATIAL",),
@@ -542,9 +542,10 @@ def test_ucd1_to_ctype(caplog):
         ctype_to_ucd=ctype_to_ucd, allowed_ucd_duplicates=cf._ALLOWED_UCD_DUPLICATES
     )
 
-    assert caplog.record_tuples[-1][1] == logging.WARNING and caplog.record_tuples[-1][
-        2
-    ].startswith("Found unsupported duplicate physical type")
+    assert caplog.record_tuples[-1][1] == logging.WARNING
+    assert caplog.record_tuples[-1][2].startswith(
+        "Found unsupported duplicate physical type"
+    )
 
     for k, v in cf._ALLOWED_UCD_DUPLICATES.items():
         assert inv_map.get(k, "") == v

gwcs/tests/test_geometry.py

@@ -28,7 +28,7 @@ def test_spherical_cartesian_inverse():
 
 
 @pytest.mark.parametrize(
-    "testval, unit, wrap_at",
+    ("testval", "unit", "wrap_at"),
     product(
         [
             (45.0, -90.0, (0.0, 0.0, -1.0)),
@@ -71,7 +71,7 @@ def test_spherical_to_cartesian(testval, unit, wrap_at):
 
 
 @pytest.mark.parametrize(
-    "lon, lat, unit, wrap_at",
+    ("lon", "lat", "unit", "wrap_at"),
     list(
         product(
             [0, 45, 90, 135, 180, 225, 270, 315, 360],
@@ -104,7 +104,7 @@ def test_cart2spher_at_pole(cart_to_spher):
 
 
 @pytest.mark.parametrize(
-    "lonlat, unit, wrap_at",
+    ("lonlat", "unit", "wrap_at"),
     list(
         product(
             [
@@ -146,7 +146,7 @@ def test_spher2cart_roundrip_arr(lonlat, unit, wrap_at):
     assert u.allclose(c2s(*s2c(lon, lat)), (olon, olat), atol=atol)
 
 
-@pytest.mark.parametrize("unit1, unit2", [(u.deg, 1), (1, u.deg)])
+@pytest.mark.parametrize(("unit1", "unit2"), [(u.deg, 1), (1, u.deg)])
 def test_spherical_to_cartesian_mixed_Q(spher_to_cart, unit1, unit2):
     with pytest.raises(TypeError) as arg_err:
         spher_to_cart(135.0 * unit1, 45.0 * unit2)
@@ -157,7 +157,7 @@ def test_spherical_to_cartesian_mixed_Q(spher_to_cart, unit1, unit2):
 
 
 @pytest.mark.parametrize(
-    "x, y, z",
+    ("x", "y", "z"),
     sorted(
         list(
             set(
@@ -180,21 +180,17 @@ def test_cartesian_to_spherical_mixed_Q(cart_to_spher, x, y, z):
 @pytest.mark.parametrize("wrap_at", ["1", 180.0, True, 180j, [180], -180, 0])
 def test_c2s2c_wrong_wrap_type(spher_to_cart, cart_to_spher, wrap_at):
     err_msg = "'wrap_lon_at' must be an integer number: 180 or 360"
-    with pytest.raises(ValueError) as arg_err:
+    with pytest.raises(ValueError, match=err_msg):
         geometry.SphericalToCartesian(wrap_lon_at=wrap_at)
-    assert arg_err.value.args[0] == err_msg
 
-    with pytest.raises(ValueError) as arg_err:
+    with pytest.raises(ValueError, match=err_msg):
         spher_to_cart.wrap_lon_at = wrap_at
-    assert arg_err.value.args[0] == err_msg
 
-    with pytest.raises(ValueError) as arg_err:
+    with pytest.raises(ValueError, match=err_msg):
         geometry.CartesianToSpherical(wrap_lon_at=wrap_at)
-    assert arg_err.value.args[0] == err_msg
 
-    with pytest.raises(ValueError) as arg_err:
+    with pytest.raises(ValueError, match=err_msg):
         cart_to_spher.wrap_lon_at = wrap_at
-    assert arg_err.value.args[0] == err_msg
 
 
 def test_cartesian_spherical_asdf(tmpdir):

gwcs/tests/test_region.py

@@ -200,7 +200,7 @@ def test_RegionsSelector():
     mapper = selector.LabelMapperArray(labels)
     sel = {1: models.Shift(1) & models.Scale(1), 2: models.Shift(2) & models.Scale(2)}
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         # 0 can't be a key in ``selector``
         selector.RegionsSelector(
             inputs=("x", "y"),
@@ -259,7 +259,7 @@ def test_overalpping_ranges():
     for key in keys:
         rmapper[tuple(key)] = models.Const1D(4)
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         selector.LabelMapperRange(("x", "y"), rmapper, inputs_mapping=((0,)))
 
 

gwcs/tests/test_utils.py

@@ -19,8 +19,8 @@
 
 
 def test_wrong_projcode():
+    ctype = {"CTYPE": ["RA---TAM", "DEC--TAM"]}
     with pytest.raises(UnsupportedProjectionError):
-        ctype = {"CTYPE": ["RA---TAM", "DEC--TAM"]}
         gwutils.get_projcode(ctype)
 
 

gwcs/tests/test_wcs.py

@@ -280,7 +280,7 @@ def test_bounding_box():
     pipeline = [("detector", trans3), ("sky", None)]
     w = wcs.WCS(pipeline)
     bb = ((-1, 10), (6, 15))
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         w.bounding_box = bb
     trans2 = models.Shift(10) & models.Scale(2)
     pipeline = [("detector", trans2), ("sky", None)]
@@ -292,7 +292,7 @@ def test_bounding_box():
     w = wcs.WCS(pipeline)
     w.bounding_box = (1, 5)
     assert w.bounding_box == w.forward_transform.bounding_box
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         w.bounding_box = ((1, 5), (2, 6))
 
 
@@ -333,7 +333,7 @@ def test_compound_bounding_box():
         w(13, 13, 4)
 
     # Test attaching a invalid bounding box (not ignoring input 'x')
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         w.attach_compound_bounding_box(cbb, [("x", False)])
 
     # Test that bounding_box with quantities can be assigned and evaluates
@@ -375,7 +375,7 @@ def test_grid_from_bounding_box_step():
     assert_allclose(x, x1)
     assert_allclose(y, y1)
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         grid_from_bounding_box(bb, step=(1, 2, 1))
 
 
@@ -778,9 +778,9 @@ def test_to_fits_sip():
     assert_allclose(gwcsvalx, fitsvalx, atol=4e-11, rtol=0)
     assert_allclose(gwcsvaly, fitsvaly, atol=4e-11, rtol=0)
 
-    with pytest.raises(ValueError):
-        miriwcs.bounding_box = None
-        mirisip = miriwcs.to_fits_sip(bounding_box=None, max_inv_pix_error=0.1)
+    miriwcs.bounding_box = None
+    with pytest.raises(ValueError):  # noqa: PT011
+        _ = miriwcs.to_fits_sip(bounding_box=None, max_inv_pix_error=0.1)
 
 
 @pytest.mark.parametrize(
@@ -918,8 +918,8 @@ def test_to_fits_tab_no_bb(gwcs_3d_galactic_spectral):
     w.bounding_box = None
 
     # FITS WCS -TAB:
-    with pytest.raises(ValueError):
-        hdr, bt = w.to_fits_tab()
+    with pytest.raises(ValueError):  # noqa: PT011
+        _, _ = w.to_fits_tab()
 
 
 def test_to_fits_tab_cube(gwcs_3d_galactic_spectral):
@@ -1346,7 +1346,6 @@ def test_iter_inv():
             quiet=False,
             with_bounding_box=False,
         )
-        assert np.allclose((x, y), (xp, yp))
 
     xp, yp = e.value.best_solution.T
     assert np.allclose((x[1:], y[1:]), (xp[1:], yp[1:]))

gwcs/wcs.py

@@ -1685,7 +1685,7 @@ def _order_clockwise(v):
         if center:
             vertices = utils._toindex(vertices)
 
-        result = np.asarray(self.__call__(*vertices, **{"with_bounding_box": False}))
+        result = np.asarray(self.__call__(*vertices, with_bounding_box=False))
 
         axis_type = axis_type.lower()
         if axis_type == "spatial" and all_spatial:
@@ -3389,8 +3389,8 @@ def _reform_poly_coefficients(fit_poly_x, fit_poly_y):
     invcdmat = npla.inv(np.array(cdmat))
     degree = fit_poly_x.degree
     # Now loop through all remaining coefficients
-    for i in range(0, degree + 1):
-        for j in range(0, degree + 1):
+    for i in range(degree + 1):
+        for j in range(degree + 1):
             if (i + j > 1) and (i + j < degree + 1):
                 old_x = getattr(fit_poly_x, f"c{i}_{j}").value
                 old_y = getattr(fit_poly_y, f"c{i}_{j}").value
@@ -3407,8 +3407,8 @@ def _store_2D_coefficients(hdr, poly_model, coeff_prefix, keeplinear=False):
     """
     mindeg = int(not keeplinear)
     degree = poly_model.degree
-    for i in range(0, degree + 1):
-        for j in range(0, degree + 1):
+    for i in range(degree + 1):
+        for j in range(degree + 1):
             if (i + j) > mindeg and (i + j < degree + 1):
                 hdr[f"{coeff_prefix}_{i}_{j}"] = getattr(poly_model, f"c{i}_{j}").value
 

pyproject.toml

@@ -131,11 +131,10 @@ select = [
     # "FA",     # flake8-future-annotations (correct usage future annotations)
     # "ISC",    # flake8-implicit-str-concat (prevent implicit string concat)
     # "ICN",    # flake8-import-conventions (enforce import conventions)
-    #"G",      # flake8-logging-format (best practices for logging)
     # "INP",    # flake8-no-pep420 (prevent use of PEP420, i.e. implicit name spaces)
-    #"PIE",    # flake8-pie (misc suggested improvement linting)
+    "PIE",    # flake8-pie (misc suggested improvement linting)
     # "T20",    # flake8-print (prevent print statements in code)
-    #"PT",     # flake8-pytest-style (best practices for pytest)
+    "PT",     # flake8-pytest-style (best practices for pytest)
     #"Q",      # flake8-quotes (best practices for quotes)
     # "RSE",    # flake8-raise (best practices for raising exceptions)
     #"RET",    # flake8-return (best practices for return statements)