Transform eia861 short form

.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
   # Formatters: hooks that re-write Python & documentation files
   ####################################################################################
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.5
+    rev: v0.4.7
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

devtools/zenodo/zenodo_data_release.py

@@ -87,22 +87,24 @@ def __init__(self, env: str):
 
         logger.info(f"Using Zenodo token: {token[:4]}...{token[-4:]}")
 
-    def retry_request(self, *, method, url, max_tries=5, **kwargs):
+    def retry_request(self, *, method, url, max_tries=5, timeout=5, **kwargs):
         """Wrap requests.request in retry logic.
 
         Passes method, url, and **kwargs to requests.request.
         """
         base_timeout = 2
         for try_num in range(1, max_tries):
             try:
-                return requests.request(method=method, url=url, **kwargs)
+                return requests.request(
+                    method=method, url=url, timeout=timeout, **kwargs
+                )
             except requests.RequestException as e:
                 timeout = base_timeout**try_num
                 logger.warning(f"Attempt #{try_num} Got {e}, retrying in {timeout} s")
                 time.sleep(timeout)
 
         # don't catch errors on the last try.
-        return requests.request(method=method, url=url, **kwargs)
+        return requests.request(method=method, url=url, timeout=timeout, **kwargs)
 
     def get_deposition(self, deposition_id: int) -> _LegacyDeposition:
         """LEGACY API: Get JSON describing a deposition.

docs/release_notes.rst

@@ -65,6 +65,8 @@ EIA AEO
   <https://www.eia.gov/outlooks/aeo/tables_ref.php>`__, which include future
   projections related to electric power and renewable energy through the year
   2050, across a variety of scenarios. See :issue:`3368` and :pr:`3538`.
+* Added new :ref:`core_eia861__yearly_short_form` table from EIA861 which contains
+  the shorter version of EIA861. See issues :issue:`3540` and PR :pr:`3565`.
 * Added new tables from EIA AEO table 54:
 
   * :ref:`core_eiaaeo__yearly_projected_generation_in_electric_sector_by_technology`