openepd 6.7.1__py3-none-any.whl → 6.9.0__py3-none-any.whl

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/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/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/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/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):

{openepd-6.7.1.dist-info → openepd-6.9.0.dist-info}/METADATA

@@ -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.dist-info → openepd-6.9.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=Shkfh0Kun0YRhmRDw7LkUj2eQL3X-HnP55u2THOEALw,794
-openepd/__version__.py,sha256=cEXzkRISIfazD-OHuFNpI2q_1XMVZidZBJvxj36ex6U,638
+openepd/__version__.py,sha256=jwrNSpYRkNJ8jhmq3aqFdUNhGmX1iMU6nRZBzp2-f1Y,638
 openepd/api/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
 openepd/api/average_dataset/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
 openepd/api/average_dataset/generic_estimate_sync_api.py,sha256=mxWwDokEGMe87Px8C_aHvIdVKZVHrEAuVtaSA1zJchU,7953
@@ -33,11 +33,11 @@ openepd/compat/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,62
 openepd/compat/compat_functional_validators.py,sha256=yz6DfWeg7knBHEN_enpCGGTLRknEsecXfpzD1FDlywY,834
 openepd/compat/pydantic.py,sha256=DOjSixsylLqMtFAIARu50sGcT4VPXN_c473q_2JwZQ0,1146
 openepd/model/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
-openepd/model/base.py,sha256=OEYNFUTL4BivBNAt_LGowTlDuUjvKMHgf5U5ZBncZwQ,9805
+openepd/model/base.py,sha256=Ka477sFBzXoYdjovyYvYMG3EudQMxVmP-BG76Qhcwuk,9822
 openepd/model/category.py,sha256=IQXNGQFQmFZ_H9PRONloX_UOSf1sTMDq1rM1yz8JR0Y,1639
 openepd/model/common.py,sha256=rADzzNqrjQ8oixy4KL7kyiIIvWM2S7cUDuicen1Xs6Y,13062
 openepd/model/declaration.py,sha256=oBJ_v_ESoQhybQIH5S5tmYVkgkoX3gwe3nvFyPqb4uk,13832
-openepd/model/epd.py,sha256=I8pGcvvsVzbwyQYRrqGQa7tGyRw55T_sIQn1VJ9568g,12165
+openepd/model/epd.py,sha256=Ldw_X-lo5abEXSAAxV9scjVku7NQWrsANxlIfRjkw_8,12290
 openepd/model/factory.py,sha256=XP7eeQNW5tqwX_4hfuEb3lK6BFQDb4KB0fSN0r8-lCU,2656
 openepd/model/generic_estimate.py,sha256=bbU0cR4izSqjZcfxUHNbdO4pllqqd8OaUFikrEgCFoA,3992
 openepd/model/geography.py,sha256=G3Oz3QBw5n-RiSCAv-vAGxrOZBhwIT5rASnPlo9dkcs,42095
@@ -47,10 +47,10 @@ openepd/model/org.py,sha256=zySCWBFxCz8ymEuSgThYruLFhylYdxouMPV7_oRvAJY,5342
 openepd/model/pcr.py,sha256=QknLtTn6Y14JORWKQ1qBqGgKnZpbKgqNiYF3Axl4U4c,5494
 openepd/model/specs/README.md,sha256=UGhSiFJ9hOxT1mZl-5ZrhkOrPKf1W_gcu5CI9hzV7LU,2430
 openepd/model/specs/__init__.py,sha256=IAevXqqYrCWlTH4z4Fy9o77vaOLinX56G05iIJJfm0M,3094
-openepd/model/specs/asphalt.py,sha256=V-N7NbrxyNnjgNXQbJPj17ZFM3Q-qxTxxjqpx61wEfA,3350
+openepd/model/specs/asphalt.py,sha256=QGP89G1PtzNLeG5ZJXRhPJLAvu0Bk0GtlutCcxtl_fk,3420
 openepd/model/specs/base.py,sha256=JgXvfy8K1Jpcai1eCUDZ-ndsLYkL-dcDyH2hQls6Znw,2652
 openepd/model/specs/concrete.py,sha256=ndi-z2KYXuhLMChgYq7ZNWDKS_LmkZWTOwY3DgZv19M,5336
-openepd/model/specs/enums.py,sha256=r7Ik8tgL60McK_5ACQn0qhIUTmxjnCQlGvHtFE6m8xM,63602
+openepd/model/specs/enums.py,sha256=lj8-PUymJ5QkHiCqJGyOhjVuwClLnMc3END-hLyN95w,63638
 openepd/model/specs/range/__init__.py,sha256=LmBClxzTNpWzGwS1zvFoAxbKILrMRMz22mJXKYu2u8I,4502
 openepd/model/specs/range/accessories.py,sha256=T3z-5jLoIVIIGeQi2cc5fMP3a7uGgvoW2E_SVmr3c30,2498
 openepd/model/specs/range/aggregates.py,sha256=nxk6iZHzs0CIoUMWSw4IfB-D4tGd4prh9O2HXnC9u70,2549
@@ -136,7 +136,7 @@ openepd/model/validation/quantity.py,sha256=1z-G46dlryJEm4W-O0QiEJuFYICz7CPTM6gL
 openepd/model/versioning.py,sha256=R_zm6rCrgF3vlJQYbpyWhirdS_Oek16cv_mvZmpuE8I,4473
 openepd/patch_pydantic.py,sha256=xrkzblatmU9HBzukWkp1cPq9ZSuohoz1p0pQqVKSlKs,4122
 openepd/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openepd-6.7.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-6.7.1.dist-info/METADATA,sha256=Lh9wNYq2c0sOnAnTpmHeXQhOipSTz6cV9CsaIxxd-U4,9038
-openepd-6.7.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-openepd-6.7.1.dist-info/RECORD,,
+openepd-6.9.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-6.9.0.dist-info/METADATA,sha256=vgX9ZSkxewrFTlM9YDsMCYYiOc1wBi8EtDuiSJBXv9c,9038
+openepd-6.9.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+openepd-6.9.0.dist-info/RECORD,,