Resolved errors related to SIM

Author: Sherwin-14

earthaccess/api.py

@@ -420,7 +420,7 @@ def download(
     """
     provider = _normalize_location(str(provider))
 
-    if isinstance(granules, DataGranule):
+    if isinstance(granules, DataGranule):  # noqa: SIM114
         granules = [granules]
     elif isinstance(granules, str):
         granules = [granules]

earthaccess/search.py

@@ -740,13 +740,9 @@ def _valid_state(self) -> bool:
         # spatial params must be paired with a collection limiting parameter
         spatial_keys = ["point", "polygon", "bounding_box", "line"]
         collection_keys = ["short_name", "entry_title", "concept_id"]
-
-        if any(key in self.params for key in spatial_keys):
-            if not any(key in self.params for key in collection_keys):
-                return False
-
-        # all good then
-        return True
+        return not any(key in self.params for key in spatial_keys) or any(
+            key in self.params for key in collection_keys
+        )
 
     def _is_cloud_hosted(self, granule: Any) -> bool:
         """Check if a granule record, from CMR, advertises "direct access"."""

earthaccess/store.py

@@ -201,7 +201,7 @@ def _sibling_tempfile(sibling: Path) -> Generator[Path, None, None]:
     # directory if it does not already exist.  Others succeed due to exist_ok.
     sibling.parent.mkdir(parents=True, exist_ok=True)
 
-    temp_fh = tempfile.NamedTemporaryFile(
+    temp_fh = tempfile.NamedTemporaryFile(  # noqa: SIM115
         dir=sibling.parent,
         prefix="partial_",  # In case auto-delete fails, make it obvious to users
         delete=False,
@@ -266,9 +266,7 @@ def _derive_daac_provider(self, daac: str) -> str | None:
 
     def _is_cloud_collection(self, concept_id: list[str]) -> bool:
         collection = DataCollections(self.auth).concept_id(concept_id).get()
-        if len(collection) > 0 and "s3-links" in collection[0]["meta"]:
-            return True
-        return False
+        return len(collection) > 0 and "s3-links" in collection[0]["meta"]
 
     def _own_s3_credentials(self, links: list[dict[str, Any]]) -> str | None:
         for link in links:
@@ -293,7 +291,7 @@ def _running_in_us_west_2(self) -> bool:
         except Exception:
             return False
 
-        if resp.status_code == 200 and resp.content == b"us-west-2":
+        if resp.status_code == 200 and resp.content == b"us-west-2":  # noqa: SIM103
             # On AWS, in region us-west-2
             return True
         return False

earthaccess/utils/_validation.py

@@ -2,6 +2,4 @@
 
 
 def valid_dataset_parameters(**kwargs: Any) -> bool:
-    if len(kwargs) == 0:
-        return False
-    return True
+    return len(kwargs) != 0

pyproject.toml

@@ -267,13 +267,6 @@ ignore = [
   "S301",
   "S603",
   "S607",
-  "SIM101",
-  "SIM102",
-  "SIM103",
-  "SIM114",
-  "SIM115",
-  "SIM117",
-  "SIM300",
   "SLF001",
   "TD002",
   "TD003",

tests/integration/test_api.py

@@ -236,12 +236,14 @@ def test_download_immediate_failure(tmp_path: Path):
         count=3,
     )
 
-    with patch.object(earthaccess.__store__, "_download_file", fail_to_download_file):
-        with pytest.raises(IOError, match="Download failed"):
-            # By default, we set pqdm exception_behavior to "immediate" so that
-            # it simply propagates the first download error it encounters, halting
-            # any further downloads.
-            earthaccess.download(results, tmp_path, pqdm_kwargs=dict(disable=True))
+    with (
+        patch.object(earthaccess.__store__, "_download_file", fail_to_download_file),
+        pytest.raises(IOError, match="Download failed"),
+    ):
+        # By default, we set pqdm exception_behavior to "immediate" so that
+        # it simply propagates the first download error it encounters, halting
+        # any further downloads.
+        earthaccess.download(results, tmp_path, pqdm_kwargs=dict(disable=True))
 
 
 def test_download_deferred_failure(tmp_path: Path):
@@ -253,7 +255,7 @@ def test_download_deferred_failure(tmp_path: Path):
         count=count,
     )
 
-    with patch.object(earthaccess.__store__, "_download_file", fail_to_download_file):
+    with patch.object(earthaccess.__store__, "_download_file", fail_to_download_file):  # noqa: SIM117
         # With "deferred" exceptions, pqdm catches all exceptions, then at the end
         # raises a single generic Exception, passing the sequence of caught exceptions
         # as arguments to the Exception constructor.

tests/unit/test_store.py

@@ -392,10 +392,12 @@ def test_sibling_tempfile_error(tmp_path):
     orig_text = "Should get replaced"
     new_text = "New-fangled text"
     trg_file.write_text(orig_text)
-    with pytest.raises(Exception, match="Some error to trigger cleanup"):
-        with _sibling_tempfile(trg_file) as temp_file:
-            temp_file.write_text(new_text)
-            raise RuntimeError("Some error to trigger cleanup")
+    with (
+        pytest.raises(Exception, match="Some error to trigger cleanup"),
+        _sibling_tempfile(trg_file) as temp_file,
+    ):
+        temp_file.write_text(new_text)
+        raise RuntimeError("Some error to trigger cleanup")
     assert not temp_file.exists()
     assert trg_file.exists()
     assert trg_file.read_text() == orig_text

tests/unit/test_virtual.py

@@ -72,12 +72,13 @@ def test_virtualize_multi_granule_no_concat_dim_raises() -> None:
     """virtualize() raises ValueError for >1 granule without concat_dim."""
     from earthaccess.virtual.core import virtualize
 
-    with patch(
-        "earthaccess.virtual.core.build_obstore_registry",
-        return_value=MagicMock(),
+    with (
+        patch(
+            "earthaccess.virtual.core.build_obstore_registry", return_value=MagicMock(),
+        ),
+        pytest.raises(ValueError, match="concat_dim"),
     ):
-        with pytest.raises(ValueError, match="concat_dim"):
-            virtualize(_make_granules(2))
+        virtualize(_make_granules(2))
 
 
 def test_virtualize_invalid_parser_string_raises() -> None:
@@ -99,9 +100,12 @@ def test_virtualize_load_false_returns_virtual_dataset() -> None:
 
     mock_vds = MagicMock()
     reg_patch, open_patch = _patch_internals(mock_vds)
-    with reg_patch, open_patch:
-        with patch("earthaccess.virtual.core._load_via_kerchunk") as mock_load:
-            result = virtualize(_make_granules(1), load=False)
+    with (
+        reg_patch,
+        open_patch,
+        patch("earthaccess.virtual.core._load_via_kerchunk") as mock_load,
+    ):
+        result = virtualize(_make_granules(1), load=False)
 
     assert result is mock_vds
     mock_load.assert_not_called()
@@ -113,16 +117,18 @@ def test_virtualize_load_true_delegates_to_kerchunk(tmp_path) -> None:
 
     expected_ds = MagicMock()
     reg_patch, open_patch = _patch_internals()
-    with reg_patch, open_patch:
-        with patch(
-            "earthaccess.virtual.core._load_via_kerchunk",
-            return_value=expected_ds,
-        ) as mock_load:
-            result = virtualize(
-                _make_granules(1),
-                load=True,
-                reference_dir=str(tmp_path),
-            )
+    with (
+        reg_patch,
+        open_patch,
+        patch(
+            "earthaccess.virtual.core._load_via_kerchunk", return_value=expected_ds,
+        ) as mock_load,
+    ):
+        result = virtualize(
+            _make_granules(1),
+            load=True,
+            reference_dir=str(tmp_path),
+        )
 
     mock_load.assert_called_once()
     assert result is expected_ds
@@ -146,16 +152,18 @@ def side_effect(*args, **kwargs):
             raise FileNotFoundError("no .dmrpp sidecar")
         return mock_vds_hdf
 
-    with patch(
-        "earthaccess.virtual.core.build_obstore_registry",
-        return_value=MagicMock(),
-    ):
-        with patch(
+    with (
+        patch(
+            "earthaccess.virtual.core.build_obstore_registry",
+            return_value=MagicMock(),
+        ),
+        patch(
             "earthaccess.virtual.core._open_virtual_mfdataset",
             side_effect=side_effect,
-        ):
-            with pytest.warns(UserWarning, match="HDFParser"):
-                result = virtualize(_make_granules(1), parser="DMRPPParser")
+        ),
+        pytest.warns(UserWarning, match="HDFParser"),
+    ):
+        result = virtualize(_make_granules(1), parser="DMRPPParser")
 
     assert result is mock_vds_hdf
     assert call_count["n"] == 2