openepd 6.13.1__tar.gz → 6.14.0__tar.gz

{openepd-6.13.1 → openepd-6.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openepd
-Version: 6.13.1
+Version: 6.14.0
 Summary: Python library to work with OpenEPD format
 Home-page: https://github.com/cchangelabs/openepd
 License: Apache-2.0
@@ -15,6 +15,8 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Provides-Extra: api-client
 Requires-Dist: email-validator (>=1.3.1)

{openepd-6.13.1 → openepd-6.14.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openepd"
-version = "6.13.1"
+version = "6.14.0"
 license = "Apache-2.0"
 description = "Python library to work with OpenEPD format"
 authors = ["C-Change Labs <support@c-change-labs.com>"]

{openepd-6.13.1 → openepd-6.14.0}/src/openepd/__version__.py

@@ -13,4 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-VERSION = "6.13.1"
+VERSION = "6.14.0"

openepd-6.14.0/src/openepd/m49/__init__.py

@@ -0,0 +1,17 @@
+#
+#  Copyright 2025 by C Change Labs Inc. www.c-change-labs.com
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
+from . import utils as geo_converter  # for backwards compatibility

{openepd-6.13.1 → openepd-6.14.0}/src/openepd/m49/const.py

@@ -13,8 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-
 from typing import NamedTuple
+import warnings
 
 M49_CODE_WORLD = "001"
 M49_CODE_AFRICA = "002"
@@ -1169,4 +1169,7 @@ def is_m49_code(to_check: str) -> bool:
     :param to_check: any string
     :return: `True` if passed string is M49 code, `False` otherwise
     """
-    return to_check in M49_AREAS or to_check in M49_TO_ISO3166_ALPHA2
+    warnings.warn("Use m49.utils.is_m49_code instead.", DeprecationWarning)
+    from . import utils
+
+    return utils.is_m49_code(to_check)

openepd-6.13.1/src/openepd/m49/geo_converter.py → openepd-6.14.0/src/openepd/m49/utils.py

@@ -13,11 +13,21 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+__all__ = [
+    "iso_to_m49",
+    "m49_to_iso",
+    "region_and_country_names_to_m49",
+    "m49_to_region_and_country_names",
+    "openepd_to_m49",
+    "m49_to_openepd",
+    "is_m49_code",
+]
 from typing import Collection
 
 from openepd.m49.const import (
     COUNTRY_VERBOSE_NAME_TO_M49,
     ISO3166_ALPHA2_TO_M49,
+    M49_AREAS,
     M49_TO_COUNTRY_VERBOSE_NAME,
     M49_TO_ISO3166_ALPHA2,
     M49_TO_REGION_VERBOSE_NAME,
@@ -122,10 +132,10 @@ def openepd_to_m49(regions: Collection[str]) -> set[str]:
     Convert OpenEPD geography definitions to pure M49 region codes.
 
     :param regions: list of OpenEPD geography definitions including letter codes and aliases
-        like "EU27" or "NAFTA" (e.g., ["EU27", "NAFTA"], ["US", "CA, MX"])
+        like "EU27" or "NAFTA" (e.g., ["EU27", "NAFTA"], ["US", "CA, MX"], ["NAFTA", "051"])
     :return: Set of M49 region codes (e.g., {"040", "056", "100", "191", "196", "203", "208", "233", "246", "250",
         "276", "300", "348", "372", "380", "428", "440", "442", "470", "528", "616", "620", "642", "703", "705", "724",
-        "752", "840", "124", "484"}, {"840", "124", "484"})
+        "752", "840", "124", "484"}, {"840", "124", "484"}, {"840", "124", "484", "051"})
     :raises ValueError: If a region or country name is not found in ISO3166 or OpenEPD special regions.
     """
 
@@ -140,6 +150,8 @@ def openepd_to_m49(regions: Collection[str]) -> set[str]:
             m49_code = ISO3166_ALPHA2_TO_M49.get(region.upper())
             if m49_code:
                 result.add(m49_code)
+            elif is_m49_code(region):
+                result.add(region)
             else:
                 raise ValueError(f"Region '{region}' not found in ISO3166 or OpenEPD special regions.")
     return result
@@ -176,3 +188,13 @@ def m49_to_openepd(regions: list[str]) -> set[str]:
             raise ValueError(f"Region code '{code}' not found in ISO3166 or OpenEPD special regions.")
 
     return result
+
+
+def is_m49_code(to_check: str) -> bool:
+    """
+    Check if passed string is M49 code.
+
+    :param to_check: any string
+    :return: `True` if passed string is M49 code, `False` otherwise
+    """
+    return to_check in M49_AREAS or to_check in M49_TO_ISO3166_ALPHA2

{openepd-6.13.1 → openepd-6.14.0}/src/openepd/model/lcia.py

@@ -359,6 +359,18 @@ class ScopeSetCTUe(ScopeSet):
     allowed_units = "CTUe"
 
 
+class ScopeSetKgSbe(ScopeSet):
+    """ScopeSet measured in kgSbe."""
+
+    allowed_units = "kgSbe"
+
+
+class ScopeSetMJ(ScopeSet):
+    """ScopeSet measured in MJ."""
+
+    allowed_units = "MJ"
+
+
 class ScopeSetDiseaseIncidence(ScopeSet):
     """ScopeSet measuring disease incidence measured in AnnualPerCapita (cases)."""
 
@@ -474,6 +486,17 @@ class ImpactSet(ScopesetByNameBase):
         default=None,
         description="Land use related impacts / Soil quality, in potential soil quality parameters.",
     )
+    ADP_mineral: ScopeSetKgSbe | None = pyd.Field(
+        alias="ADP-mineral",
+        default=None,
+        description='Abiotic depletion potential for non-fossil resources. EN15804 calls this "ADP - minerals and metals".',
+    )
+
+    ADP_fossil: ScopeSetMJ | None = pyd.Field(
+        alias="ADP-fossil",
+        default=None,
+        description="Abiotic depletion potential for fossil resources",
+    )
 
 
 class LCIAMethod(StrEnum):

{openepd-6.13.1 → openepd-6.14.0}/src/openepd/model/specs/range/furnishings.py

@@ -19,11 +19,11 @@ __all__ = (
     "CountertopsRangeV1",
     "DemountablePartitionsRangeV1",
     "OtherFurnishingsRangeV1",
-    "OpenStorageRangeV1",
-    "ClosedStorageRangeV1",
-    "RetractableStorageRangeV1",
-    "MobileStorageRangeV1",
-    "WallMountedShelvingRangeV1",
+    "OpenStorageFurnitureRangeV1",
+    "ClosedStorageFurnitureRangeV1",
+    "RetractableStorageFurnitureRangeV1",
+    "MobileStorageFurnitureRangeV1",
+    "WallMountedStorageShelvingRangeV1",
     "OtherStorageFurnitureRangeV1",
     "StorageFurnitureRangeV1",
     "TablesRangeV1",
@@ -97,7 +97,7 @@ class OtherFurnishingsRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class OpenStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+class OpenStorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Open Storage.
 
@@ -109,7 +109,7 @@ class OpenStorageRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class ClosedStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+class ClosedStorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Closed Storage.
 
@@ -121,7 +121,7 @@ class ClosedStorageRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class RetractableStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+class RetractableStorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Retractable Storage.
 
@@ -133,7 +133,7 @@ class RetractableStorageRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class MobileStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+class MobileStorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Mobile Storage.
 
@@ -145,7 +145,7 @@ class MobileStorageRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class WallMountedShelvingRangeV1(BaseOpenEpdHierarchicalSpec):
+class WallMountedStorageShelvingRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Wall Mounted Shelving.
 
@@ -176,11 +176,11 @@ class StorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.1"
 
-    OpenStorage: OpenStorageRangeV1 | None = None
-    ClosedStorage: ClosedStorageRangeV1 | None = None
-    RetractableStorage: RetractableStorageRangeV1 | None = None
-    MobileStorage: MobileStorageRangeV1 | None = None
-    WallMountedShelving: WallMountedShelvingRangeV1 | None = None
+    OpenStorageFurniture: OpenStorageFurnitureRangeV1 | None = None
+    ClosedStorageFurniture: ClosedStorageFurnitureRangeV1 | None = None
+    RetractableStorageFurniture: RetractableStorageFurnitureRangeV1 | None = None
+    MobileStorageFurniture: MobileStorageFurnitureRangeV1 | None = None
+    WallMountedStorageShelving: WallMountedStorageShelvingRangeV1 | None = None
     OtherStorageFurniture: OtherStorageFurnitureRangeV1 | None = None
 
 

{openepd-6.13.1 → openepd-6.14.0}/src/openepd/model/specs/singular/furnishings.py

@@ -57,7 +57,7 @@ class OtherFurnishingsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class OpenStorageV1(BaseOpenEpdHierarchicalSpec):
+class OpenStorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     """
     Open Storage.
 
@@ -67,7 +67,7 @@ class OpenStorageV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class ClosedStorageV1(BaseOpenEpdHierarchicalSpec):
+class ClosedStorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     """
     Closed Storage.
 
@@ -77,7 +77,7 @@ class ClosedStorageV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class RetractableStorageV1(BaseOpenEpdHierarchicalSpec):
+class RetractableStorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     """
     Retractable Storage.
 
@@ -87,7 +87,7 @@ class RetractableStorageV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class MobileStorageV1(BaseOpenEpdHierarchicalSpec):
+class MobileStorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     """
     Mobile Storage.
 
@@ -97,7 +97,7 @@ class MobileStorageV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class WallMountedShelvingV1(BaseOpenEpdHierarchicalSpec):
+class WallMountedStorageShelvingV1(BaseOpenEpdHierarchicalSpec):
     """
     Wall Mounted Shelving.
 
@@ -119,11 +119,11 @@ class StorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.1"
 
     # Nested specs:
-    OpenStorage: OpenStorageV1 | None = None
-    ClosedStorage: ClosedStorageV1 | None = None
-    RetractableStorage: RetractableStorageV1 | None = None
-    MobileStorage: MobileStorageV1 | None = None
-    WallMountedShelving: WallMountedShelvingV1 | None = None
+    OpenStorageFurniture: OpenStorageFurnitureV1 | None = None
+    ClosedStorageFurniture: ClosedStorageFurnitureV1 | None = None
+    RetractableStorageFurniture: RetractableStorageFurnitureV1 | None = None
+    MobileStorageFurniture: MobileStorageFurnitureV1 | None = None
+    WallMountedStorageShelving: WallMountedStorageShelvingV1 | None = None
     OtherStorageFurniture: OtherStorageFurnitureV1 | None = None
 
 

openepd-6.13.1/src/openepd/model/validation/__init__.py

@@ -1,15 +0,0 @@
-#
-#  Copyright 2025 by C Change Labs Inc. www.c-change-labs.com
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#