openepd 6.10.0__tar.gz → 6.11.0__tar.gz

{openepd-6.10.0 → openepd-6.11.0}/PKG-INFO

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

{openepd-6.10.0 → openepd-6.11.0}/pyproject.toml

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

{openepd-6.10.0 → openepd-6.11.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.10.0"
+VERSION = "6.11.0"

{openepd-6.10.0 → openepd-6.11.0}/src/openepd/model/specs/range/furnishings.py

@@ -19,9 +19,16 @@ __all__ = (
     "CountertopsRangeV1",
     "DemountablePartitionsRangeV1",
     "OtherFurnishingsRangeV1",
+    "OpenStorageRangeV1",
+    "ClosedStorageRangeV1",
+    "RetractableStorageRangeV1",
+    "MobileStorageRangeV1",
+    "WallMountedShelvingRangeV1",
+    "OtherStorageFurnitureRangeV1",
     "StorageFurnitureRangeV1",
     "TablesRangeV1",
     "WorkSurfacesRangeV1",
+    "WorkspacesRangeV1",
     "FurnishingsRangeV1",
 )
 
@@ -89,6 +96,76 @@ class OtherFurnishingsRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
+class OpenStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Open Storage.
+
+    Open Storage furniture which is static and has no moving parts.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class ClosedStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Closed Storage.
+
+    Closed storage furniture making use of doors, sliding and/or hinged parts.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class RetractableStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Retractable Storage.
+
+    Storage Furniture with retractable (drawer) elements.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class MobileStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Mobile Storage.
+
+    Mobile storage furniture having wheels or casters for movement.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class WallMountedShelvingRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Wall Mounted Shelving.
+
+    Storage furniture which requires usage of a vertical structure for attachment and functional support.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class OtherStorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Other Storage Furniture.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
 class StorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Storage Furniture.
@@ -96,7 +173,14 @@ class StorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
     Range version.
     """
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
+
+    OpenStorage: OpenStorageRangeV1 | None = None
+    ClosedStorage: ClosedStorageRangeV1 | None = None
+    RetractableStorage: RetractableStorageRangeV1 | None = None
+    MobileStorage: MobileStorageRangeV1 | None = None
+    WallMountedShelving: WallMountedShelvingRangeV1 | None = None
+    OtherStorageFurniture: OtherStorageFurnitureRangeV1 | None = None
 
 
 class TablesRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -119,6 +203,19 @@ class WorkSurfacesRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
+class WorkspacesRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Workspaces.
+
+    Office furniture and furniture systems for performing office work, such as cubicle systems.
+    Typically includes component(s) that may fit in other categories.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
 class FurnishingsRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Home and office furnishings.
@@ -126,7 +223,7 @@ class FurnishingsRangeV1(BaseOpenEpdHierarchicalSpec):
     Range version.
     """
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     Chairs: ChairsRangeV1 | None = None
     Countertops: CountertopsRangeV1 | None = None
@@ -135,3 +232,4 @@ class FurnishingsRangeV1(BaseOpenEpdHierarchicalSpec):
     StorageFurniture: StorageFurnitureRangeV1 | None = None
     Tables: TablesRangeV1 | None = None
     WorkSurfaces: WorkSurfacesRangeV1 | None = None
+    Workspaces: WorkspacesRangeV1 | None = None

{openepd-6.10.0 → openepd-6.11.0}/src/openepd/model/specs/range/steel.py

@@ -227,10 +227,12 @@ class StructuralSteelRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     modulus_of_elasticity: AmountRangePressureMpa | None = pyd.Field(
-        default=None, description="Modulus of Elasticity, https://en.wikipedia.org/wiki/Elastic_modulus "
+        default=None,
+        description="Modulus of Elasticity, https://en.wikipedia.org/wiki/Elastic_modulus ",
     )
     thermal_expansion: AmountRangeThermalExpansion | None = pyd.Field(
-        default=None, description="Thermal Expansion, https://en.wikipedia.org/wiki/Thermal_expansion"
+        default=None,
+        description="Thermal Expansion, https://en.wikipedia.org/wiki/Thermal_expansion",
     )
     thermal_conductivity: AmountRangeThermalConductivity | None = pyd.Field(
         default=None,
@@ -280,7 +282,8 @@ class RebarSteelRangeV1(BaseOpenEpdHierarchicalSpec):
     diameter_min: AmountRangeLengthMm | None = pyd.Field(default=None, description="Minimal diameter")
     bending_pin_max: RangeFloat | None = pyd.Field(default=None)
     ts_ys_ratio_max: RangeFloat | None = pyd.Field(
-        default=None, description="Max ratio of ultimate tensile to yield tensile strength"
+        default=None,
+        description="Max ratio of ultimate tensile to yield tensile strength",
     )
     epoxy_coated: bool | None = pyd.Field(default=None)
 
@@ -297,6 +300,12 @@ class WireMeshSteelRangeV1(BaseOpenEpdHierarchicalSpec):
     fabricated: bool | None = None
 
 
+class OtherSteelRangeV1(BaseOpenEpdHierarchicalSpec):
+    """Steel products that do not fit into a defined subcategory."""
+
+    _EXT_VERSION = "1.0"
+
+
 class SteelRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Broad category for construction materials made from steel and its alloys.
@@ -304,18 +313,20 @@ class SteelRangeV1(BaseOpenEpdHierarchicalSpec):
     Range version.
     """
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     yield_tensile_str: AmountRangePressureMpa | None = pyd.Field(
         default=None,
         description="Yield Tensile strength (Mpa) per unit area. Yield strength is the point at which a material begins to permanently deform or change shape due to applied stress.",
     )
     bar_elongation: RangeFloat | None = pyd.Field(
-        default=None, description="Increase in length at break, in percent. Typically 10%-20%"
+        default=None,
+        description="Increase in length at break, in percent. Typically 10%-20%",
     )
     recycled_content: RangeRatioFloat | None = pyd.Field(default=None, description="")
     post_consumer_recycled_content: RangeRatioFloat | None = pyd.Field(
-        default=None, description="Should be a number between zero and the Recycled Content (steel_recycled_content)"
+        default=None,
+        description="Should be a number between zero and the Recycled Content (steel_recycled_content)",
     )
     astm_marking: str | None = pyd.Field(default=None, description="The marking to be expected on the product.")
     euro_marking: str | None = pyd.Field(default=None, description="The marking to be expected on the product.")
@@ -335,3 +346,4 @@ class SteelRangeV1(BaseOpenEpdHierarchicalSpec):
     PostTensioningSteel: PostTensioningSteelRangeV1 | None = None
     RebarSteel: RebarSteelRangeV1 | None = None
     WireMeshSteel: WireMeshSteelRangeV1 | None = None
+    OtherSteel: OtherSteelRangeV1 | None = None

{openepd-6.10.0 → openepd-6.11.0}/src/openepd/model/specs/singular/furnishings.py

@@ -56,10 +56,74 @@ class OtherFurnishingsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
+class OpenStorageV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Open Storage.
+
+    Open Storage furniture which is static and has no moving parts.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class ClosedStorageV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Closed Storage.
+
+    Closed storage furniture making use of doors, sliding and/or hinged parts.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class RetractableStorageV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Retractable Storage.
+
+    Storage Furniture with retractable (drawer) elements.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class MobileStorageV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Mobile Storage.
+
+    Mobile storage furniture having wheels or casters for movement.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class WallMountedShelvingV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Wall Mounted Shelving.
+
+    Storage furniture which requires usage of a vertical structure for attachment and functional support.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class OtherStorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
+    """Other Storage Furniture."""
+
+    _EXT_VERSION = "1.0"
+
+
 class StorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     """Storage Furniture."""
 
-    _EXT_VERSION = "1.0"
+    _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
+    OtherStorageFurniture: OtherStorageFurnitureV1 | None = None
 
 
 class TablesV1(BaseOpenEpdHierarchicalSpec):
@@ -74,10 +138,21 @@ class WorkSurfacesV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
+class WorkspacesV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Workspaces.
+
+    Office furniture and furniture systems for performing office work, such as cubicle systems.
+    Typically includes component(s) that may fit in other categories.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
 class FurnishingsV1(BaseOpenEpdHierarchicalSpec):
     """Home and office furnishings."""
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     # Nested specs:
     Chairs: ChairsV1 | None = None
@@ -87,3 +162,4 @@ class FurnishingsV1(BaseOpenEpdHierarchicalSpec):
     StorageFurniture: StorageFurnitureV1 | None = None
     Tables: TablesV1 | None = None
     WorkSurfaces: WorkSurfacesV1 | None = None
+    Workspaces: WorkspacesV1 | None = None