openepd 6.8.0__tar.gz → 6.9.1__tar.gz

{openepd-6.8.0 → openepd-6.9.1}/PKG-INFO

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

{openepd-6.8.0 → openepd-6.9.1}/pyproject.toml

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

{openepd-6.8.0 → openepd-6.9.1}/src/openepd/__version__.py

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

{openepd-6.8.0 → openepd-6.9.1}/src/openepd/model/base.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2024 by C Change Labs Inc. www.c-change-labs.com
+#  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.
@@ -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
@@ -117,7 +117,7 @@ class BaseOpenEpdSchema(pyd.BaseModel):
         if value is None:
             return None  # type: ignore
         if issubclass(target_type, pyd.BaseModel) and isinstance(value, dict):
-            return target_type.construct(**value)  # type: ignore
+            return target_type.parse_obj(value)  # type: ignore[return-value]
         elif isinstance(value, target_type):
             return value
         raise ValueError(f"Cannot convert {value} to {target_type}")

{openepd-6.8.0 → openepd-6.9.1}/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.8.0 → openepd-6.9.1}/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):