openepd 6.7.1__tar.gz → 6.9.0__tar.gz

{openepd-6.7.1 → openepd-6.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openepd
-Version: 6.7.1
+Version: 6.9.0
 Summary: Python library to work with OpenEPD format
 Home-page: https://github.com/cchangelabs/openepd
 License: Apache-2.0

{openepd-6.7.1 → openepd-6.9.0}/pyproject.toml

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

{openepd-6.7.1 → openepd-6.9.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.7.1"
+VERSION = "6.9.0"

{openepd-6.7.1 → openepd-6.9.0}/src/openepd/model/base.py

@@ -18,7 +18,7 @@ from enum import StrEnum
 import json
 from typing import Any, Callable, ClassVar, Generic, Optional, Type, TypeAlias, TypeVar
 
-from cqd import open_xpd_uuid  # type:ignore[import-untyped]
+from cqd import open_xpd_uuid  # type:ignore[import-untyped,ignore-not-found]
 
 from openepd.compat.pydantic import pyd, pyd_generics
 from openepd.model.validation.common import validate_version_compatibility, validate_version_format

{openepd-6.7.1 → openepd-6.9.0}/src/openepd/model/epd.py

@@ -15,7 +15,7 @@
 #
 
 from openepd.compat.pydantic import pyd
-from openepd.model.base import BaseDocumentFactory, BaseOpenEpdSchema, OpenEpdDoctypes
+from openepd.model.base import BaseDocumentFactory, OpenEpdDoctypes, OpenEpdExtension
 from openepd.model.common import Ingredient, WithAltIdsMixin, WithAttachmentsMixin
 from openepd.model.declaration import (
     DEVELOPER_DESCRIPTION,
@@ -61,13 +61,18 @@ PLANT_DESCRIPTION = "List of object(s) for one or more plant(s) that this declar
 #
 
 
-class Ec3EpdExtension(BaseOpenEpdSchema):
+class Ec3EpdExtension(OpenEpdExtension):
     """Extension for EC3 specific fields on openEPD."""
 
     # While the extensions should be stored under the 'ext' key - extension point of the BaseOpenepdModel - the EC3
     # extension was started before the introduction of extension management, and so is located at the root of the EPD
     # object.
 
+    @classmethod
+    def get_extension_name(cls) -> str:
+        """Return the name of the extension."""
+        return "ec3"
+
     uaGWP_a1a2a3_traci21: float | None = pyd.Field(
         default=None,
         description="""The A1A2A3 uncertainty-adjusted GWP, in kgCO2e per declared unit, calculated for the TRACI 2.1

{openepd-6.7.1 → openepd-6.9.0}/src/openepd/model/specs/asphalt.py

@@ -35,12 +35,15 @@ class AsphaltGradation(StrEnum):
     Dense_graded = "Dense-graded"
     Open_graded = "Open-graded"
     Gap_graded = "Gap-graded"
+    Permeable = "Permeable"
+    Porous = "Porous"
+    Other = "Other"
 
 
 class AsphaltV1(BaseOpenEpdHierarchicalSpec):
     """Asphalt spec."""
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     asphalt_aggregate_size_max: LengthMmStr | None = pyd.Field(
         default=None, example="5mm", description="Max aggregate size"

{openepd-6.7.1 → openepd-6.9.0}/src/openepd/model/specs/enums.py

@@ -1479,11 +1479,13 @@ class AsphaltMixType(StrEnum):
 
      - WMA: WMA
      - HMA: HMA
+     - CCPR: CCPR
 
     """
 
     WMA = "WMA"
     HMA = "HMA"
+    CCPR = "CCPR"
 
 
 class EngineeredTimberSpecies(StrEnum):