Chore: Bump osc-ingest-tools version (#554)

Signed-off-by: Matthew Watkins <[email protected]>

Author: ModeSevenIndustrialSolutions

.pre-commit-config.yaml

@@ -1,6 +1,9 @@
 ---
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-FileCopyrightText: 2024 The Linux Foundation
+
 ci:
-  autofix_commit_msg: "Chore: pre-commit autoupdate"
+  autofix_commit_msg: "Chore: pre-commit.ci automated update"
 
 exclude: |
   (?x)^(
@@ -9,37 +12,52 @@ exclude: |
   )$
 
 repos:
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
       - id: check-added-large-files
+      - id: check-ast
+      - id: check-builtin-literals
       - id: check-case-conflict
+      - id: check-docstring-first
       - id: check-executables-have-shebangs
+      - id: check-illegal-windows-names
       - id: check-json
       - id: check-merge-conflict
       - id: check-shebang-scripts-are-executable
       - id: check-symlinks
       - id: check-toml
-      # - id: detect-aws-credentials
+      - id: check-vcs-permalinks
       - id: check-xml
       - id: check-yaml
+      - id: debug-statements
+      - id: destroyed-symlinks
+      - id: detect-aws-credentials
+        args: ["--allow-missing-credentials"]
+      # - id: double-quote-string-fixer
       - id: detect-private-key
       - id: end-of-file-fixer
-      # - id: mixed-line-ending
-      #  args: ["--fix=lf"]
+      - id: file-contents-sorter
+      - id: fix-byte-order-marker
+      - id: forbid-new-submodules
+      - id: forbid-submodules
+      - id: mixed-line-ending
+        args: ["--fix=lf"]
       - id: name-tests-test
         args: ["--pytest-test-first"]
       - id: no-commit-to-branch
       # - id: pretty-format-json
       - id: requirements-txt-fixer
+      - id: sort-simple-yaml
+        # Without specifying files, the above is inactive
+        # files: ^config/simple/
+      - id: trailing-whitespace
 
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
-        args:
-          ['--no-error-on-unmatched-pattern', '--ignore-unknown']
+        args: ["--no-error-on-unmatched-pattern", "--ignore-unknown"]
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.44.0
@@ -51,6 +69,7 @@ repos:
     rev: v0.19.1
     hooks:
       - id: gitlint
+        args: ["-c body-max-line-length=120", "-c title-max-length=120"]
 
   - repo: https://github.com/openstack/bashate
     rev: 2.1.1
@@ -62,7 +81,7 @@ repos:
     rev: v0.10.0.1
     hooks:
       - id: shellcheck
-        args: ["-x"]  # Check external files
+        args: ["-x"] # Check external files
 
   - repo: https://github.com/Mateusz-Grzelinski/actionlint-py
     rev: v1.7.7.23
@@ -73,9 +92,12 @@ repos:
     rev: v1.35.1
     hooks:
       - id: yamllint
+        types: [yaml]
         args:
-          ["-d", "{rules: {line-length: {max: 120}},
-          ignore-from-file: [.gitignore],}"]
+          [
+            "-d",
+            "{rules: {line-length: {max: 100}}, ignore-from-file: [.gitignore],}",
+          ]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.9.9
@@ -90,8 +112,14 @@ repos:
         name: "create mypy cache"
         language: system
         pass_filenames: false
-        entry: bash -c 'if [ ! -d .mypy_cache ];
-          then /bin/mkdir .mypy_cache; fi; exit 0'
+        entry: bash -c 'if [ ! -d .mypy_cache ]; then /bin/mkdir .mypy_cache; fi; exit 0'
+
+  - repo: https://github.com/abravalheri/validate-pyproject
+    rev: v0.23
+    hooks:
+      - id: validate-pyproject
+        # Optional extra validations from SchemaStore:
+        additional_dependencies: ["validate-pyproject-schema-store[all]"]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: "v1.15.0"
@@ -101,17 +129,26 @@ repos:
         args: ["--show-error-codes", "--install-types", "--non-interactive"]
         additional_dependencies: ["pytest", "types-requests"]
 
-# yamllint disable rule:comments-indentation
+  # - repo: https://github.com/fsfe/reuse-tool
+  #   rev: v5.0.2
+  #   hooks:
+  #     - id: reuse
+
+  # - repo: https://github.com/btford/write-good
+  #   rev: ab66ce10136dfad5146e69e70f82a3efac8842c1 # frozen: v1.0.8
+  #   hooks:
+  #     - id: write-good
+  #       files: "\\.(rst|md|markdown|mdown|mkdn)$"
+
   # Check for misspellings in documentation files
   # - repo: https://github.com/codespell-project/codespell
   #   rev: v2.2.2
   #   hooks:
-  #     - id: codespell
+  #   - id: codespell
 
   # Automatically upgrade Python syntax for newer versions
   # - repo: https://github.com/asottile/pyupgrade
   #   rev: v3.15.0
   #   hooks:
   #     - id: pyupgrade
   #       args: ['--py37-plus']
-# yamllint enable rule:comments-indentation

pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "ITR"
-version = "v1.1.9"
+version = "v1.1.10"
 description = "Assess the temperature alignment of current targets, commitments, and investment and lending portfolios."
 authors = [
   { name = "Michael Tiemann", email = "[email protected]" },
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 readme = "README.md"
 license = { text = "Apache-2.0" }
 keywords = ["Climate", "ITR", "Finance"]
@@ -23,7 +23,6 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.10",
-  "Programming Language :: Python :: 3.9",
   "Topic :: Office/Business :: Financial",
   "Topic :: Scientific/Engineering",
   "Topic :: Software Development",
@@ -36,7 +35,7 @@ dependencies = [
     "openpyxl==3.1.2",
     "openscm-units==0.6.1",
     "orca==1.8",
-    "osc-ingest-tools>=0.5.2",
+    "osc-ingest-tools>=v0.5.5",
     "pandas>=2.2.1",
     "pip>=23.1.2",
     "Pint>=0.23",
@@ -51,7 +50,7 @@ dependencies = [
     "sphinx<8,>=6",
     "sphinx-autoapi>=2.0.1",
     "sphinx-autodoc-typehints",
-    "sphinx-rtd-theme==1.3.0",
+    "sphinx-rtd-theme",
     "SQLAlchemy>=2.0.29",
     "tables>=3.8.0",
     "trino==0.328.0",

src/ITR/data/__init__.py

@@ -65,7 +65,7 @@ def translate_currency_symbols_1(text):
         return text
     if len(split_text) & 1 and split_text[-1] != "":
         split_text.append("")
-    pairs = zip(split_text[::2], split_text[1::2])
+    pairs = zip(split_text[::2], split_text[1::2], strict=False)
     retval = "".join(
         map(
             lambda x: f"{x[0]}{'USD' if x[1] == '$' or x[1] == 'US$' else currency_dict.get(x[1], '')}",
@@ -82,7 +82,7 @@ def translate_currency_symbols(text):
         return translate_currency_symbols_1(text)
     if len(keep_text) & 1 and keep_text[-1] != "":
         keep_text.append("")
-    pairs = zip(keep_text[::2], keep_text[1::2])
+    pairs = zip(keep_text[::2], keep_text[1::2], strict=False)
     retval = "".join(
         [
             inner

src/ITR/data/base_providers.py

@@ -155,7 +155,13 @@ def _convert_benchmark_to_series(
         # Benchmarks don't need work-around for https://github.com/hgrecco/pint/issues/1687, but if they did:
         # units = ureg.parse_units(benchmark.benchmark_metric)
         years, values = list(
-            map(list, zip(*{r.year: r.value.m for r in benchmark.projections}.items()))
+            map(
+                list,
+                zip(
+                    *{r.year: r.value.m for r in benchmark.projections}.items(),
+                    strict=False,
+                ),
+            )
         )
         return pd.Series(
             PA_(np.array(values), dtype="pint[dimensionless]"),
@@ -985,7 +991,7 @@ def get_company_projected_trajectories(
         if len(projections) == 0:
             return pd.DataFrame()
         index = pd.MultiIndex.from_tuples(
-            zip(c_ids, scopes), names=["company_id", "scope"]
+            zip(c_ids, scopes, strict=False), names=["company_id", "scope"]
         )
         if year is not None:
             values = list(
@@ -1207,7 +1213,11 @@ def _allocate_emissions(
                                     else em_p[0].value / em_p[1].value
                                 ),
                             ),
-                            zip(historic_sector.emissions[scope.name], prod_list),
+                            zip(
+                                historic_sector.emissions[scope.name],
+                                prod_list,
+                                strict=False,
+                            ),
                         )
                     )
                     setattr(historic_sector.emissions_intensities, scope.name, ei_list)
@@ -1775,7 +1785,11 @@ def _extrapolate_mini(col, trend):
             .T.cumprod()
             .rename(
                 index=dict(
-                    zip(range(0, len(projection_years[1:])), projection_years[1:])
+                    zip(
+                        range(0, len(projection_years[1:])),
+                        projection_years[1:],
+                        strict=False,
+                    )
                 )
             )
             .mul(historic_ei_t.iloc[-1], axis=1)

src/ITR/data/template.py

@@ -292,10 +292,13 @@ def _solve_intensities(
         # https://stackoverflow.com/a/61021228/1291237
         compare_cols = ["company_id", "report_date"]
         has_reported_production_mask = pd.Series(
-            list(zip(*[df_esg[c] for c in compare_cols]))
+            list(zip(*[df_esg[c] for c in compare_cols], strict=False))
         ).isin(
             list(
-                zip(*[df_esg[df_esg.metric.eq("production")][c] for c in compare_cols])
+                zip(
+                    *[df_esg[df_esg.metric.eq("production")][c] for c in compare_cols],
+                    strict=False,
+                )
             )
         )
         df_esg_missing_production = df_esg[~has_reported_production_mask.values]

src/ITR/data/vault_providers.py

@@ -63,7 +63,8 @@ def dequantify_column(df_col: pd.Series) -> pd.DataFrame:
                         lambda x: (np.nan, "dimensionless")
                         if pd.isna(x)
                         else (x.m, str(x.u))
-                    )
+                    ),
+                    strict=False,
                 )
             )
             return pd.DataFrame(
@@ -911,7 +912,8 @@ def __init__(
                 (c.company_id, c.sector, c.region, c.base_year_production)
                 for c in company_data._companies
                 if c.company_id in company_data.get_company_ids()
-            ]
+            ],
+            strict=False,
         )
         with warnings.catch_warnings():
             warnings.simplefilter("ignore")

src/ITR/interfaces.py

@@ -401,7 +401,8 @@ def __str__(self):
                     *[
                         (x.year, round(ITR.Q_m_as(x.value, ei_metric), 4))
                         for x in self.projections
-                    ]
+                    ],
+                    strict=False,
                 )
             )
         )
@@ -449,7 +450,8 @@ def __init__(self, icompany_ei_projections=None, *args, **kwargs):
                                 else ITR.Q_m_as(x["value"], ei_metric, inplace=True),
                             )
                             for x in projections_gen
-                        ]
+                        ],
+                        strict=False,
                     ),
                 )
             )
@@ -629,7 +631,8 @@ def __str__(self):
                         *[
                             (x.year, round(x.value.to("Mt CO2e").m, 4))
                             for x in getattr(self, scope)
-                        ]
+                        ],
+                        strict=False,
                     )
                 )
             )
@@ -696,7 +699,8 @@ def __str__(self):
                         *[
                             (x.year, round(x.value.to(ei_metric).m, 4))
                             for x in getattr(self, scope)
-                        ]
+                        ],
+                        strict=False,
                     )
                 )
             )

src/ITR/temperature_score.py

@@ -274,7 +274,10 @@ def _prepare_data(self, data: pd.DataFrame, target_probability: float):
                 scoring_data[self.c.COLS.TARGET_SCORE],
                 scoring_data[self.c.COLS.TARGET_OVERSHOOT],
                 scoring_data[self.c.SCORE_RESULT_TYPE],
-            ) = zip(*scoring_data.apply(lambda row: self.get_score(row), axis=1))
+            ) = zip(
+                *scoring_data.apply(lambda row: self.get_score(row), axis=1),
+                strict=False,
+            )
 
         # Fix up dtypes for the new columns we just added
         for col in [

test/test_base_providers.py

@@ -359,7 +359,11 @@ def test_get_projected_targets(self):
                     Q_(0.04623233372785435, "t CO2 / GJ"),
                 ],
                 index=pd.MultiIndex.from_tuples(
-                    zip(self.company_ids, [EScope.S1S2] * len(self.company_ids))
+                    zip(
+                        self.company_ids,
+                        [EScope.S1S2] * len(self.company_ids),
+                        strict=False,
+                    )
                 ),
                 name=2025,
             )