openepd 7.0.1__py3-none-any.whl → 7.1.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 = "7.0.1"
+VERSION = "7.1.0"

openepd/model/lcia.py

@@ -365,6 +365,12 @@ class ScopeSetCTUe(ScopeSet):
     allowed_units: ClassVar[str | tuple[str, ...] | None] = "CTUe"
 
 
+class ScopeSetKgSbe(ScopeSet):
+    """ScopeSet measured in kgSbe."""
+
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = "kgSbe"
+
+
 class ScopeSetDiseaseIncidence(ScopeSet):
     """ScopeSet measuring disease incidence measured in AnnualPerCapita (cases)."""
 
@@ -487,6 +493,17 @@ class ImpactSet(ScopesetByNameBase):
         default=None,
         description="Land use related impacts / Soil quality, in potential soil quality parameters.",
     )
+    ADP_mineral: ScopeSetKgSbe | None = pydantic.Field(
+        alias="ADP-mineral",
+        default=None,
+        description='Abiotic depletion potential for non-fossil resources. EN15804 calls this "ADP - minerals and metals".',
+    )
+
+    ADP_fossil: ScopeSetEnergy | None = pydantic.Field(
+        alias="ADP-fossil",
+        default=None,
+        description="Abiotic depletion potential for fossil resources",
+    )
 
     model_config = pydantic.ConfigDict(from_attributes=True)
 

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/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-7.0.1.dist-info → openepd-7.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openepd
-Version: 7.0.1
+Version: 7.1.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-7.0.1.dist-info → openepd-7.1.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
-openepd/__version__.py,sha256=cQ-OwE-r-8WgC7M8aP58dwhTkUGGnep-uii5xipUfHI,638
+openepd/__version__.py,sha256=YE_JkVAHWAazVwAceVI_tNykuQM3UyXJiDIfU2dySlI,638
 openepd/api/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
 openepd/api/average_dataset/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
 openepd/api/average_dataset/generic_estimate_sync_api.py,sha256=SRIs-qmb_wO7ELumeP1DLXJbVUtdBJ4CToecoCIsPAQ,8015
@@ -42,7 +42,7 @@ openepd/model/factory.py,sha256=doexyqZXJVGd45T1JsbjuyGUjEykW-MerKUq4SQHhRY,2656
 openepd/model/generic_estimate.py,sha256=RGNrGNwaqY42m6nRrwmDZYO_Gy2EhOBZn6g0EAWiDHs,4224
 openepd/model/geography.py,sha256=Jx7NIDdk_sIvwyh-7YxnIjAwIHW2HCQK7UtFGM2xKtw,42095
 openepd/model/industry_epd.py,sha256=Cqn01IUNSZqRkyU05TwtOLXDKlg0YnGzqvKL8A__zbI,4061
-openepd/model/lcia.py,sha256=wilehrZfb5d_kqOuaVVk_TuFRDLr2jagScAXsXArZsI,27186
+openepd/model/lcia.py,sha256=swKO8vAISpesYzF-w7HHLjckVhCb3jj3dv4FbIwp3Ak,27749
 openepd/model/org.py,sha256=1ALm91OyJrvyFjkJ1hWQWGKO5fDdYQE8lMWEVZRUPrs,6348
 openepd/model/pcr.py,sha256=W_GjmMwFxZGLnbbU7khoYziSvOxxd6Id4xBdhitq_SE,5655
 openepd/model/specs/README.md,sha256=UGhSiFJ9hOxT1mZl-5ZrhkOrPKf1W_gcu5CI9hzV7LU,2430
@@ -67,7 +67,7 @@ openepd/model/specs/range/electrical_transmission_and_distribution_equipment.py,
 openepd/model/specs/range/electricity.py,sha256=yn_S25C_tZqseb8hiJ1yiHszu2mQ49FOFWWCqNpOBY0,997
 openepd/model/specs/range/finishes.py,sha256=gJnMvjhivQC0jnKizKcrwn1Y7UJjrK_emixigQhbbfE,21792
 openepd/model/specs/range/fire_and_smoke_protection.py,sha256=KLH5t3d-a2cppF5i-uW4233z1vAPbJIY1zTn89_gV4k,3333
-openepd/model/specs/range/furnishings.py,sha256=SPZDMacVvXHA_zcE4l3fL5hroZWaEeSsql0oSn3BnBo,6576
+openepd/model/specs/range/furnishings.py,sha256=LWu88Y7QEuq7IdNCKQG5v0u0PAWpG919gxkMdmm5Sig,6748
 openepd/model/specs/range/grouting.py,sha256=BQPxH6BvlXpdhLEZBui9zTuY93K_9syjoa6rdnF8GGY,1095
 openepd/model/specs/range/manufacturing_inputs.py,sha256=iqK4QS-T5vyjMQtl5v63Feb99qSNwKS0kM-1izoJTzA,5615
 openepd/model/specs/range/masonry.py,sha256=egeqDr0K3eTFDHeIzFHrg9_u9d6XIHOSmBPnBERkvxY,2908
@@ -106,7 +106,7 @@ openepd/model/specs/singular/electrical_transmission_and_distribution_equipment.
 openepd/model/specs/singular/electricity.py,sha256=f1cJ9eklNUf97khCIZiT5-z8V_TbOcvH2me_1UTQVrE,823
 openepd/model/specs/singular/finishes.py,sha256=8BtFK2_olB8OJQFv8rxf7afoLhqlJI1o2tEKopidOGA,24398
 openepd/model/specs/singular/fire_and_smoke_protection.py,sha256=h8Dy4ps_xfa5g8EQEIN8OHxjH6aDvqmZUFRdEzYy7aY,3081
-openepd/model/specs/singular/furnishings.py,sha256=6MZT42b-nlZdQvvZw1_tVg5GFlMQ2gw_r6zBjxMtxHc,5608
+openepd/model/specs/singular/furnishings.py,sha256=-8_96GZala4_xuI6u29OO0KfGA0OctsD3M5Iid2NHvE,5737
 openepd/model/specs/singular/grouting.py,sha256=pg2tX3W7a2TQ3z_eyFYGlBJY3WEwn6JlZyqM3PQIJcU,934
 openepd/model/specs/singular/manufacturing_inputs.py,sha256=OBy7Lzm1TbC8kGxE3YXIXeyrqIPqf2_rXcGEN7MEMBw,5233
 openepd/model/specs/singular/masonry.py,sha256=e9siblrPFFSvIjucYkwZzSlpSSZPZ9rA1bdVIDQz-RM,3627
@@ -135,7 +135,7 @@ openepd/model/validation/numbers.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9
 openepd/model/validation/quantity.py,sha256=zsyNGygYW4GGeWAtyM9708lFdEuebtSctr3qIfNdEXQ,21720
 openepd/model/versioning.py,sha256=de53OlduidxAkDlSbAu6xrIy2IUuCnwI69vUJPCXX_8,4512
 openepd/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openepd-7.0.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-7.0.1.dist-info/METADATA,sha256=nqzPdeu5vJAB7DTCYDXRVx2ebuPlRn4YI9-lcpbzrdg,9035
-openepd-7.0.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-openepd-7.0.1.dist-info/RECORD,,
+openepd-7.1.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-7.1.0.dist-info/METADATA,sha256=xmx2tvBuvOMpEzJ_ViXm82pnWkZQ1_XqqnaBBMo11So,9137
+openepd-7.1.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+openepd-7.1.0.dist-info/RECORD,,

{openepd-7.0.1.dist-info → openepd-7.1.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.6.1
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any