Merge remote-tracking branch 'origin/main'

ocni-dtu · Feb 5, 2024 · 1ede10f · 1ede10f
2 parents 2888b46 + a846a23
commit 1ede10f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## [1.1.0](https://github.com/ocni-dtu/epdx/compare/v1.0.0...v1.1.0) (2024-02-05)
+
+
+### Features
+
+* added km and tones_km to units ([08f6480](https://github.com/ocni-dtu/epdx/commit/08f6480464a3583db6955d21d9e2b57279c9398c))
+* added meta_data to conversion struct ([b4fa5c1](https://github.com/ocni-dtu/epdx/commit/b4fa5c1254691c1263b5048570675d300661bfd7))
+
+
+### Bug Fixes
+
+* refactored ILCD parsing functions and added more test cases for ILCD files ([35256b6](https://github.com/ocni-dtu/epdx/commit/35256b672c828283c262c5affdcc7f85f10575c1))
+
 ## 1.0.0 (2024-01-24)
 
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "epdx"
 description = "EPDx is a library for parsing EPD files into a common exchange format."
-version = "1.0.0"
+version = "1.1.0"
 authors = ["Christian Kongsgaard <[email protected]>"]
 edition = "2018"
 readme = "README.md"

diff --git a/packages/python/src/epdx/pydantic.py b/packages/python/src/epdx/pydantic.py
@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  epdx.schema.json
-#   timestamp: 2024-01-24T10:40:45+00:00
+#   timestamp: 2024-02-05T08:19:48+00:00
 
 from __future__ import annotations
 
@@ -56,10 +56,13 @@ class Unit(Enum):
     PCS = 'PCS'
     L = 'L'
     M2R1 = 'M2R1'
+    KM = 'KM'
+    TONES_KM = 'TONES_KM'
     UNKNOWN = 'UNKNOWN'
 
 
 class Conversion(BaseModel):
+    meta_data: str
     to: Unit
     value: float
 
@@ -83,7 +86,7 @@ class EPD(BaseModel):
     location: str
     mer: Optional[ImpactCategory] = None
     meta_data: Optional[Dict[str, Any]] = None
-    mrf: Optional[ImpactCategory] = None
+    mfr: Optional[ImpactCategory] = None
     name: str
     nhwd: Optional[ImpactCategory] = None
     nrsf: Optional[ImpactCategory] = None