openepd 4.7.0__tar.gz → 4.8.0__tar.gz

{openepd-4.7.0 → openepd-4.8.0}/PKG-INFO

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

{openepd-4.7.0 → openepd-4.8.0}/pyproject.toml

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

{openepd-4.7.0 → openepd-4.8.0}/src/openepd/__version__.py

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

{openepd-4.7.0 → openepd-4.8.0}/src/openepd/model/specs/generated/electrical.py

@@ -290,10 +290,16 @@ class LightingV1(BaseOpenEpdHierarchicalSpec):
     TaskLighting: TaskLightingV1 | None = None
 
 
+class ElectricalConduitV1(BaseOpenEpdHierarchicalSpec):
+    """Tubing used to protect and route electrical wiring in a building or structure."""
+
+    _EXT_VERSION = "1.0"
+
+
 class ElectricalV1(BaseOpenEpdHierarchicalSpec):
     """Electric power and equipment."""
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     # Nested specs:
     ElectricalPowerStorage: ElectricalPowerStorageV1 | None = None
@@ -301,3 +307,4 @@ class ElectricalV1(BaseOpenEpdHierarchicalSpec):
     ElectricalGenerationEquipment: ElectricalGenerationEquipmentV1 | None = None
     ElectricPower: ElectricPowerV1 | None = None
     Lighting: LightingV1 | None = None
+    ElectricalConduit: ElectricalConduitV1 | None = None

{openepd-4.7.0 → openepd-4.8.0}/src/openepd/model/specs/generated/finishes.py

@@ -468,10 +468,44 @@ class MirrorsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
+class PaintByMassV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Paintings and coatings by mass.
+
+    Expected declared unit for products is mass of ready to use product.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class PaintByVolumeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Paintings and coatings by volume.
+
+    Expecting declared unit for products is volume of ready to use product.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class PaintByAreaV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Paintings and coatings by area.
+
+    Expected declared unit is area of host surface covered by the product.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
 class PaintingAndCoatingV1(BaseOpenEpdHierarchicalSpec):
     """Paintings and coatings."""
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
+
+    PaintByMass: PaintByMassV1 | None = None
+    PaintByVolume: PaintByVolumeV1 | None = None
+    PaintByArea: PaintByAreaV1 | None = None
 
 
 class WallFinishesV1(BaseOpenEpdHierarchicalSpec):

{openepd-4.7.0 → openepd-4.8.0}/src/openepd/model/specs/generated/network_infrastructure.py

@@ -166,10 +166,16 @@ class NetworkingRacewaysV1(BaseOpenEpdHierarchicalSpec):
     raceways_material: RacewaysMaterial | None = pyd.Field(default=None, description="", example="Aluminum")
 
 
+class CommunicationsConduitV1(BaseOpenEpdHierarchicalSpec):
+    """Tubing used to protect and route communications wiring in a building or structure."""
+
+    _EXT_VERSION = "1.0"
+
+
 class NetworkInfrastructureV1(BaseOpenEpdHierarchicalSpec):
     """General category for network infrastructure products for data centers and commercial and residential buildings."""
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     # Nested specs:
     PDU: PDUV1 | None = None
@@ -178,3 +184,4 @@ class NetworkInfrastructureV1(BaseOpenEpdHierarchicalSpec):
     FloorBoxesAndAccessories: FloorBoxesAndAccessoriesV1 | None = None
     NetworkingCableTrays: NetworkingCableTraysV1 | None = None
     NetworkingRaceways: NetworkingRacewaysV1 | None = None
+    CommunicationsConduit: CommunicationsConduitV1 | None = None