uv migration and python upgrade

Author: axelstudios

.github/workflows/ci.yml

@@ -9,34 +9,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        python-version: ["3.9", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - name: Install uv and set the Python version
+        uses: astral-sh/setup-uv@v7
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install poetry
-        uses: abatilo/actions-poetry@v3
-        with:
-          poetry-version: 1.8.4
-      - name: Install dependencies with Poetry
-        run: |
-          pip install --upgrade pip
-          poetry install
+          version: "0.9.27"
+      - name: Install the project
+        run: uv sync --locked
       - name: Run pytest
-        run: |
-          poetry run pytest
-  pre-commit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
+        run: uv run pytest -v -n auto
       - name: Run pre-commit
-        uses: pre-commit/action@v3.0.1
-        with:
-          extra_args: --all-files
+        run: uv run pre-commit run -a

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: check-added-large-files
@@ -15,20 +15,26 @@ repos:
       - id: mixed-line-ending
       - id: pretty-format-json
         args: ["--autofix", "--no-sort-keys"]
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.21.2
+    hooks:
+      - id: pyupgrade
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
         types_or: [markdown, yaml]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.12.1
+    rev: v1.19.1
     hooks:
       - id: mypy
+        additional_dependencies:
+          - pandas-stubs
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.0
+    rev: v0.14.14
     hooks:
       # Run the linter
-      - id: ruff
+      - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix, --output-format=full]
       # Run the formatter
       - id: ruff-format

LICENSE

@@ -1,4 +1,4 @@
-BuildingSync®, Copyright (c) 2015, 2024 Alliance for Sustainable Energy, LLC, and other contributors.
+BuildingSync®, Copyright (c) 2015, 2024 Alliance for Energy Innovation, LLC, and other contributors.
 
 All rights reserved.
 
@@ -17,7 +17,7 @@ respective party.
 
 (4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other
 derivative works may not use the "BuildingSync" trademark or any other confusingly similar designation
-without specific prior written permission from Alliance for Sustainable Energy, LLC.
+without specific prior written permission from Alliance for Energy Innovation, LLC.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND

buildingsync_asset_extractor/bae_types.py

@@ -1,10 +1,10 @@
 from dataclasses import dataclass
-from typing import Any, Optional
+from typing import Any
 
 
 @dataclass
 class Section:
-    type: Optional[str]
+    type: str | None
     areas: dict
 
 
@@ -27,13 +27,13 @@ class AssetDef:
     parent_path: str
     key: str
     export_units: bool
-    units: Optional[str] = None
+    units: str | None = None
 
 
 @dataclass
 class SystemData:
     value: Any
-    sqft: Optional[float] = None
-    cap: Optional[str] = None
-    cap_units: Optional[str] = None
-    units: Optional[str] = None
+    sqft: float | None = None
+    cap: str | None = None
+    cap_units: str | None = None
+    units: str | None = None

buildingsync_asset_extractor/converter.py

@@ -1,4 +1,4 @@
-from typing import Literal, Optional, get_args
+from typing import Literal, get_args
 
 from buildingsync_asset_extractor.bae_types import SystemData
 from buildingsync_asset_extractor.errors import BSyncProcessorError
@@ -22,7 +22,7 @@
 
 def unify_units(
     system_datas: list[SystemData],
-    to_units: Optional[str] = None,
+    to_units: str | None = None,
 ) -> list[SystemData]:
     if to_units is None:
         to_units = system_datas[0].cap_units

buildingsync_asset_extractor/cts/classes.py

@@ -1,8 +1,8 @@
 import functools
 import logging
+from collections.abc import Iterable
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Iterable, Optional
 
 from lxml import etree as ETree  # noqa: N812
 
@@ -36,7 +36,7 @@ class FacilityAppearance:
     path: Path
 
     @functools.cached_property
-    def cheapest_package_of_measures_scenario(self) -> Optional[PackageOfMeasuresScenario]:
+    def cheapest_package_of_measures_scenario(self) -> PackageOfMeasuresScenario | None:
         # get the measures for reference
         measures_by_id = {m.get("ID"): Measure(m) for m in self.etree.findall("./Measures/Measure", self.etree.nsmap)}
 

buildingsync_asset_extractor/cts/cts.py

@@ -42,7 +42,7 @@ def aggregate_facilities(files: list[Path]) -> dict[str, Facility]:
 
     # for each file, get the facilities in the file
     for f in files:
-        file_etree = etree.parse(f)  # noqa: S320
+        file_etree = etree.parse(f)
         facility_etrees = file_etree.findall("/Facilities/Facility", namespaces=file_etree.getroot().nsmap)
 
         # for each facility in the file, add it to facility_by_id

buildingsync_asset_extractor/cts/parsers.py

@@ -88,8 +88,8 @@ def get_aggregated_findings_of_comprehensive_evaluations_estimated_life_cycle_da
 
 
 def get_potential_conservation_measures_per_technology_category(facility: Facility) -> pd.Series:
-    results = {k: 0 for k in ENERGY_AND_WATER_CONSERVATION_MEASURES}
-    results.update({k: 0 for k in technology_category_to_cts_field.values()})
+    results = dict.fromkeys(ENERGY_AND_WATER_CONSERVATION_MEASURES, 0)
+    results.update(dict.fromkeys(technology_category_to_cts_field.values(), 0))
 
     # for each measure
     measures = [

buildingsync_asset_extractor/cts_main.py

@@ -1,6 +1,6 @@
 """
 *********************************************************************************************************
-:copyright (c) BuildingSync®, Copyright (c) 2015-2022, Alliance for Sustainable Energy, LLC,
+:copyright (c) BuildingSync®, Copyright (c) 2015-2026, Alliance for Energy Innovation, LLC,
 and other contributors.
 
 All rights reserved.
@@ -20,7 +20,7 @@
 
 (4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other
 derivative works may not use the "BuildingSync" trademark or any other confusingly similar designation
-without specific prior written permission from Alliance for Sustainable Energy, LLC.
+without specific prior written permission from Alliance for Energy Innovation, LLC.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND

buildingsync_asset_extractor/formatters.py

@@ -1,5 +1,6 @@
 import logging
-from typing import Any, Callable, Optional, Tuple, Union
+from collections.abc import Callable
+from typing import Any
 
 from buildingsync_asset_extractor.bae_types import SystemData
 from buildingsync_asset_extractor.converter import unify_units
@@ -25,7 +26,7 @@ def __init__(self, export_asset: Callable[[str, Any], None], export_asset_units:
         self.export_asset = export_asset
         self.export_asset_units = export_asset_units
 
-    def format_age_results(self, name: str, results: list[SystemData], process_type: str, units: Optional[str]) -> None:
+    def format_age_results(self, name: str, results: list[SystemData], process_type: str, units: str | None) -> None:
         # process results
         value = None
         if process_type.endswith("oldest"):
@@ -48,7 +49,7 @@ def format_age_results(self, name: str, results: list[SystemData], process_type:
         elif process_type.endswith("average"):
             self.format_custom_avg_results(name, results, units)
 
-    def format_80_percent_results(self, name: str, results: list[SystemData], units: Optional[str]) -> None:
+    def format_80_percent_results(self, name: str, results: list[SystemData], units: str | None) -> None:
         """format 80% rule results
         the "primary" type returned must at least serve 80% of the area by
         1. Capacity
@@ -68,7 +69,7 @@ def format_80_percent_results(self, name: str, results: list[SystemData], units:
 
         results = unify_units(results)
 
-        values, capacities, cap_units, sqfts = self.remap_results(results)
+        _values, capacities, cap_units, sqfts = self.remap_results(results)
         if None not in capacities and len(set(cap_units)) <= 1:
             # capacity method
             # add all capacities
@@ -82,8 +83,8 @@ def format_80_percent_results(self, name: str, results: list[SystemData], units:
                         primaries[res.value] = 0.0
                     primaries[res.value] += float(res.cap)  # type: ignore[arg-type]
 
-                for p in primaries:
-                    if float(primaries[p]) / total >= 0.8:
+                for p, value in primaries.items():
+                    if float(value) / total >= 0.8:
                         # this fuel meets the 80% threshold by capacity
                         found = 1
                         self.export_asset(name, p)
@@ -126,7 +127,7 @@ def format_80_percent_results(self, name: str, results: list[SystemData], units:
         self.export_asset(name, "unknown")
         self.export_asset_units(name, units)
 
-    def format_lighting_results(self, name: str, results: list[LightingData], units: Optional[str]) -> None:
+    def format_lighting_results(self, name: str, results: list[LightingData], units: str | None) -> None:
         """custom processing for lighting efficiency
         1. if 'lpd' is present, average the values
         2. else if percentpremisesserved
@@ -191,7 +192,7 @@ def format_lighting_results(self, name: str, results: list[LightingData], units:
         self.export_asset_units(name, units)
         return
 
-    def format_custom_avg_results(self, name: str, results: list[SystemData], units: Optional[str]) -> None:
+    def format_custom_avg_results(self, name: str, results: list[SystemData], units: str | None) -> None:
         """format weighted average
         1. Ensure all units are the same
         2. Attempt to calculate with installed power (NOT IMPLEMENTED)
@@ -229,7 +230,7 @@ def format_custom_avg_results(self, name: str, results: list[SystemData], units:
             for res in results:
                 cap_total = cap_total + float(res.cap)  # type: ignore[arg-type]
                 eff_total = eff_total + (float(res.value) * float(res.cap))  # type: ignore[arg-type]
-            total: Union[float, str] = eff_total / cap_total
+            total: float | str = eff_total / cap_total
 
             # special case for average age: take the floor since partial year doesn't make sense
             if name.lower().endswith("age"):
@@ -254,7 +255,7 @@ def format_custom_avg_results(self, name: str, results: list[SystemData], units:
             self.export_asset_units(name, units)
             return
 
-    def format_sqft_results(self, name: str, results: dict[str, float], units: Optional[str]) -> None:
+    def format_sqft_results(self, name: str, results: dict[str, float], units: str | None) -> None:
         """return primary and secondary for top 2 results by sqft"""
         # NOTE: this is the only method that modifies the export name '
         # by appending 'primary' and 'secondary'
@@ -279,13 +280,13 @@ def format_sqft_results(self, name: str, results: dict[str, float], units: Optio
         self.export_asset("Secondary " + name, value2)
         self.export_asset_units("Secondary " + name, units)
 
-    def format_avg_sqft_results(self, name: str, results: dict[Any, float], units: Optional[str]) -> None:
+    def format_avg_sqft_results(self, name: str, results: dict[Any, float], units: str | None) -> None:
         """weighted average of results"""
 
         # in this case the result keys will convert to numbers
         # to calculate the weighted average
 
-        total: Union[str, float, None] = None
+        total: str | float | None = None
 
         if results:
             total_sqft = sum(results.values())
@@ -304,7 +305,7 @@ def format_avg_sqft_results(self, name: str, results: dict[Any, float], units: O
         self.export_asset(name, total)
         self.export_asset_units(name, units)
 
-    def format_electrification_potential(self, name: str, results: list[SystemData], units: Optional[str]) -> None:
+    def format_electrification_potential(self, name: str, results: list[SystemData], units: str | None) -> None:
         """Sum non electric capacities"""
         # If no SystemDatas, then None
         if len(results) == 0:
@@ -340,7 +341,7 @@ def format_electrification_potential(self, name: str, results: list[SystemData],
     def remap_results(
         self,
         results: list[SystemData],
-    ) -> Tuple[list[Optional[float]], list[Optional[float]], list[Optional[str]], list[Optional[float]]]:
+    ) -> tuple[list[float | None], list[float | None], list[str | None], list[float | None]]:
         """Remap results from a list of dictionaries to 4 lists"""
         try:
             values = [sub.value if sub.value is None else float(sub.value) for sub in results]