Merge branch 'main' into add-non-pudl-metadata

.pre-commit-config.yaml

@@ -26,7 +26,7 @@ repos:
   # Formatters: hooks that re-write Python and RST files
   #####################################################################################
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.6
+    rev: v0.9.1
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

environment.yml

@@ -10,6 +10,6 @@ dependencies:
   # GDAL is a transitive dependency whose binaries must match those installed by the
   # pudl-dev conda environment, so we also install it with conda here.
   # TODO: once we break the archiver repo's dependency on pudl we should remove this.
-  - gdal==3.9.3 # pinned to ensure it matches pudl-dev environment exactly.
+  - gdal==3.10.0 # pinned to ensure it matches pudl-dev environment exactly.
   - pip:
       - --editable ./[dev,docs,tests]

pyproject.toml

@@ -32,7 +32,7 @@ classifiers = [
 
 [project.optional-dependencies]
 dev = [
-    "ruff>=0.6,<0.9",
+    "ruff>=0.6,<0.10",
     "build>=1.2,<1.3",
     "tox>=4.16.0,<4.24",  # Python test environment manager
     "twine>=3.3,<6.1",  # Used to make releases to PyPI
@@ -57,7 +57,7 @@ tests = [
     "pytest-console-scripts>=1.1,<1.5",  # Allow automatic testing of scripts
     "pytest-cov>=5,<6.1",  # Pytest plugin for working with coverage
     "pytest-mock>=3.0,<3.15",  # Pytest plugin for mocking function calls and objects
-    "ruff>=0.6,<0.9",
+    "ruff>=0.6,<0.10",
 ]
 
 [project.scripts]

src/pudl_archiver/archivers/classes.py

@@ -448,7 +448,7 @@ def _check_data_continuity(
 
         return validate.DatasetUniversalValidation(
             name="Validate data continuity",
-            description=f'Test {", ".join(list(VALID_PARTITION_RANGES.keys()))} partitions for continuity and duplication.',
+            description=f"Test {', '.join(list(VALID_PARTITION_RANGES.keys()))} partitions for continuity and duplication.",
             success=success,
             notes=note,
             required_for_run_success=self.fail_on_data_continuity,

src/pudl_archiver/archivers/eia/eia176.py

@@ -78,7 +78,7 @@ async def get_year_resource(self, year: str, items_list: list[str]) -> ResourceI
 
         for i in range(0, len(items_list), 20):
             rand = random.randint(0, 2)  # noqa: S311
-            logger.debug(f"Getting items {i}-{i+20} of data for {year}")
+            logger.debug(f"Getting items {i}-{i + 20} of data for {year}")
             # Chunk items list into 20 to avoid error message
             download_url = self.data_url + f"{year}/{year}/ICA/Name/"
             items = items_list[i : i + 20]