openepd 6.29.0__tar.gz → 6.30.0__tar.gz

{openepd-6.29.0 → openepd-6.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openepd
-Version: 6.29.0
+Version: 6.30.0
 Summary: Python library to work with OpenEPD format
 License: Apache-2.0
 Author: C-Change Labs

{openepd-6.29.0 → openepd-6.30.0}/pyproject.toml

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

{openepd-6.29.0 → openepd-6.30.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.29.0"
+VERSION = "6.30.0"

{openepd-6.29.0 → openepd-6.30.0}/src/openepd/model/specs/range/__init__.py

@@ -44,9 +44,17 @@ from .material_handling import MaterialHandlingRangeV1
 from .mechanical import MechanicalRangeV1
 from .mechanical_insulation import MechanicalInsulationRangeV1
 from .network_infrastructure import NetworkInfrastructureRangeV1
+from .non_construction import (
+    ChemicalsRangeV1,
+    ConsumerGoodsRangeV1,
+    ElectricityAndFuelRangeV1,
+    MachineryAndEquipmentRangeV1,
+    ServicesRangeV1,
+    VehiclesRangeV1,
+)
 from .openings import OpeningsRangeV1
 from .other_electrical_equipment import OtherElectricalEquipmentRangeV1
-from .other_materials import OtherMaterialsRangeV1
+from .other_materials import FoodBeverageRangeV1, OtherMaterialsRangeV1, TextileProductsRangeV1
 from .plumbing import PlumbingRangeV1
 from .precast_concrete import PrecastConcreteRangeV1
 from .sheathing import SheathingRangeV1
@@ -64,7 +72,7 @@ class SpecsRange(BaseOpenEpdHierarchicalSpec):
     Range version.
     """
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     CMU: CMURangeV1 | None = None
     Masonry: MasonryRangeV1 | None = None
@@ -101,3 +109,11 @@ class SpecsRange(BaseOpenEpdHierarchicalSpec):
     OtherElectricalEquipment: OtherElectricalEquipmentRangeV1 | None = None
     WoodJoists: WoodJoistsRangeV1 | None = None
     ExteriorImprovements: ExteriorImprovementsRangeV1 | None = None
+    TextileProducts: TextileProductsRangeV1 | None = None
+    Chemicals: ChemicalsRangeV1 | None = None
+    ElectricityAndFuel: ElectricityAndFuelRangeV1 | None = None
+    Vehicles: VehiclesRangeV1 | None = None
+    MachineryAndEquipment: MachineryAndEquipmentRangeV1 | None = None
+    Services: ServicesRangeV1 | None = None
+    ConsumerGoods: ConsumerGoodsRangeV1 | None = None
+    FoodBeverage: FoodBeverageRangeV1 | None = None

openepd-6.30.0/src/openepd/model/specs/range/non_construction.py

@@ -0,0 +1,52 @@
+#
+#  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.
+#  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
+
+
+class ChemicalsRangeV1(BaseOpenEpdHierarchicalSpec):
+    """Products of the Chemical or Allied Industries.  Includes most products in WCO HS Section VI."""
+
+    _EXT_VERSION = "1.0"
+
+
+class ElectricityAndFuelRangeV1(BaseOpenEpdHierarchicalSpec):
+    """Energy carriers including fuels, electricity, and steam."""
+
+    _EXT_VERSION = "1.0"
+
+
+class VehiclesRangeV1(BaseOpenEpdHierarchicalSpec):
+    """Machinery for moving people and goods.  Includes most products in WCO HS Section XVII."""
+
+    _EXT_VERSION = "1.0"
+
+
+class MachineryAndEquipmentRangeV1(BaseOpenEpdHierarchicalSpec):
+    """Machinery other than for installation in a building."""
+
+    _EXT_VERSION = "1.0"
+
+
+class ServicesRangeV1(BaseOpenEpdHierarchicalSpec):
+    """Services, including digital and professional services."""
+
+    _EXT_VERSION = "1.0"
+
+
+class ConsumerGoodsRangeV1(BaseOpenEpdHierarchicalSpec):
+    """Nonperishable products intended for use by individual consumers."""
+
+    _EXT_VERSION = "1.0"

{openepd-6.29.0 → openepd-6.30.0}/src/openepd/model/specs/range/other_materials.py

@@ -13,6 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+from openepd.compat.pydantic import pyd
+
 __all__ = (
     "AuxiliariesRangeV1",
     "CleaningProductsRangeV1",
@@ -100,8 +102,27 @@ class UnsupportedRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     CleaningProducts: CleaningProductsRangeV1 | None = None
+    Clothing: ClothingRangeV1 | None = pyd.Field(
+        default=None,
+        deprecated="UnsupportedRangeV1.Clothing is deprecated. Use TextileProductsRangeV1.Clothing instead.",
+    )
+    """
+    UnsupportedRangeV1.Clothing is deprecated. Use TextileProductsRangeV1.Clothing instead.
+    """
+    FoodBeverage: FoodBeverageRangeV1 | None = pyd.Field(
+        default=None, deprecated="UnsupportedRangeV1.FoodBeverage is deprecated. Use SpecsRange.FoodBeverage instead."
+    )
+    """
+    UnsupportedRangeV1.FoodBeverage is deprecated. Use SpecsRange.FoodBeverage instead.
+    """
+
+
+class TextileProductsRangeV1(BaseOpenEpdHierarchicalSpec):
+    """Products to be worn by humans, and materials intended to manufacture them. Includes most of WS HS Sections XI, XII."""
+
+    _EXT_VERSION = "1.0"
+
     Clothing: ClothingRangeV1 | None = None
-    FoodBeverage: FoodBeverageRangeV1 | None = None
 
 
 class CopperRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -174,6 +195,18 @@ class ZincRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
+class OtherPaperPlasticRangeV1(BaseOpenEpdHierarchicalSpec):
+    """Other products primarily made of plastic or paper. Includes WCO HS sections VII and X."""
+
+    _EXT_VERSION = "1.0"
+
+
+class OtherMineralMetalRangeV1(BaseOpenEpdHierarchicalSpec):
+    """Base minerals, metals, materials, and products made primarily of them not otherwise classified.  Includes most of WCO HS Section XV."""
+
+    _EXT_VERSION = "1.0"
+
+
 class OtherMaterialsRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Broad category of materials not yet classified.
@@ -181,7 +214,7 @@ class OtherMaterialsRangeV1(BaseOpenEpdHierarchicalSpec):
     Range version.
     """
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     TransportationInfrastructure: TransportationInfrastructureRangeV1 | None = None
     Unsupported: UnsupportedRangeV1 | None = None
@@ -192,3 +225,5 @@ class OtherMaterialsRangeV1(BaseOpenEpdHierarchicalSpec):
     Profiles: ProfilesRangeV1 | None = None
     Unknown: UnknownRangeV1 | None = None
     Zinc: ZincRangeV1 | None = None
+    OtherPaperPlastic: OtherPaperPlasticRangeV1 | None = None
+    OtherMineralMetal: OtherMineralMetalRangeV1 | None = None

{openepd-6.29.0 → openepd-6.30.0}/src/openepd/model/specs/singular/__init__.py

@@ -53,9 +53,17 @@ from openepd.model.specs.singular.material_handling import MaterialHandlingV1
 from openepd.model.specs.singular.mechanical import MechanicalV1
 from openepd.model.specs.singular.mechanical_insulation import MechanicalInsulationV1
 from openepd.model.specs.singular.network_infrastructure import NetworkInfrastructureV1
+from openepd.model.specs.singular.non_construction import (
+    ChemicalsV1,
+    ConsumerGoodsV1,
+    ElectricityAndFuelV1,
+    MachineryAndEquipmentV1,
+    ServicesV1,
+    VehiclesV1,
+)
 from openepd.model.specs.singular.openings import OpeningsV1
 from openepd.model.specs.singular.other_electrical_equipment import OtherElectricalEquipmentV1
-from openepd.model.specs.singular.other_materials import OtherMaterialsV1
+from openepd.model.specs.singular.other_materials import FoodBeverageV1, OtherMaterialsV1, TextileProductsV1
 from openepd.model.specs.singular.plumbing import PlumbingV1
 from openepd.model.specs.singular.precast_concrete import PrecastConcreteV1
 from openepd.model.specs.singular.sheathing import SheathingV1
@@ -73,7 +81,7 @@ class Specs(BaseOpenEpdHierarchicalSpec):
 
     COMPATIBILITY_SPECS: ClassVar[list[type[BaseCompatibilitySpec]]] = [ConcreteOldSpec, SteelOldSpec]
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     # Nested specs:
     CMU: CMUV1 | None = None
@@ -111,6 +119,14 @@ class Specs(BaseOpenEpdHierarchicalSpec):
     OtherElectricalEquipment: OtherElectricalEquipmentV1 | None = None
     WoodJoists: WoodJoistsV1 | None = None
     ExteriorImprovements: ExteriorImprovementsV1 | None = None
+    TextileProducts: TextileProductsV1 | None = None
+    Chemicals: ChemicalsV1 | None = None
+    ElectricityAndFuel: ElectricityAndFuelV1 | None = None
+    Vehicles: VehiclesV1 | None = None
+    MachineryAndEquipment: MachineryAndEquipmentV1 | None = None
+    Services: ServicesV1 | None = None
+    ConsumerGoods: ConsumerGoodsV1 | None = None
+    FoodBeverage: FoodBeverageV1 | None = None
 
     # historical backward-compatible specs
     concrete: ConcreteOldSpec | None = None

openepd-6.30.0/src/openepd/model/specs/singular/non_construction.py

@@ -0,0 +1,52 @@
+#
+#  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.
+#  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
+
+
+class ChemicalsV1(BaseOpenEpdHierarchicalSpec):
+    """Products of the Chemical or Allied Industries.  Includes most products in WCO HS Section VI."""
+
+    _EXT_VERSION = "1.0"
+
+
+class ElectricityAndFuelV1(BaseOpenEpdHierarchicalSpec):
+    """Energy carriers including fuels, electricity, and steam."""
+
+    _EXT_VERSION = "1.0"
+
+
+class VehiclesV1(BaseOpenEpdHierarchicalSpec):
+    """Machinery for moving people and goods.  Includes most products in WCO HS Section XVII."""
+
+    _EXT_VERSION = "1.0"
+
+
+class MachineryAndEquipmentV1(BaseOpenEpdHierarchicalSpec):
+    """Machinery other than for installation in a building."""
+
+    _EXT_VERSION = "1.0"
+
+
+class ServicesV1(BaseOpenEpdHierarchicalSpec):
+    """Services, including digital and professional services."""
+
+    _EXT_VERSION = "1.0"
+
+
+class ConsumerGoodsV1(BaseOpenEpdHierarchicalSpec):
+    """Nonperishable products intended for use by individual consumers."""
+
+    _EXT_VERSION = "1.0"

{openepd-6.29.0 → openepd-6.30.0}/src/openepd/model/specs/singular/other_materials.py

@@ -13,6 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 
 
@@ -60,8 +61,27 @@ class UnsupportedV1(BaseOpenEpdHierarchicalSpec):
 
     # Nested specs:
     CleaningProducts: CleaningProductsV1 | None = None
+
+    Clothing: ClothingV1 | None = pyd.Field(
+        default=None, deprecated="UnsupportedV1.Clothing is deprecated. Use TextileProductsV1.Clothing instead."
+    )
+    """
+    UnsupportedV1.Clothing is deprecated. Use TextileProductsV1.Clothing instead.
+    """
+    FoodBeverage: FoodBeverageV1 | None = pyd.Field(
+        default=None, deprecated="UnsupportedV1.FoodBeverage is deprecated. Use Specs.FoodBeverage instead."
+    )
+    """
+    UnsupportedV1.FoodBeverage is deprecated. Use TextileProductsV1.FoodBeverage instead.
+    """
+
+
+class TextileProductsV1(BaseOpenEpdHierarchicalSpec):
+    """Products to be worn by humans, and materials intended to manufacture them. Includes most of WS HS Sections XI, XII."""
+
+    _EXT_VERSION = "1.0"
+
     Clothing: ClothingV1 | None = None
-    FoodBeverage: FoodBeverageV1 | None = None
 
 
 class CopperV1(BaseOpenEpdHierarchicalSpec):
@@ -106,10 +126,22 @@ class ZincV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
+class OtherPaperPlasticV1(BaseOpenEpdHierarchicalSpec):
+    """Other products primarily made of plastic or paper. Includes WCO HS sections VII and X."""
+
+    _EXT_VERSION = "1.0"
+
+
+class OtherMineralMetalV1(BaseOpenEpdHierarchicalSpec):
+    """Base minerals, metals, materials, and products made primarily of them not otherwise classified.  Includes most of WCO HS Section XV."""
+
+    _EXT_VERSION = "1.0"
+
+
 class OtherMaterialsV1(BaseOpenEpdHierarchicalSpec):
     """Broad category of materials not yet classified."""
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     # Nested specs:
     TransportationInfrastructure: TransportationInfrastructureV1 | None = None
@@ -121,3 +153,5 @@ class OtherMaterialsV1(BaseOpenEpdHierarchicalSpec):
     Profiles: ProfilesV1 | None = None
     Unknown: UnknownV1 | None = None
     Zinc: ZincV1 | None = None
+    OtherPaperPlastic: OtherPaperPlasticV1 | None = None
+    OtherMineralMetal: OtherMineralMetalV1 | None = None