Merge pull request #197 from samply/develop

Release v0.10.0
samply · Jan 28, 2025 · 5f67431 · 5f67431
2 parents de85f09 + d10e317
commit 5f67431
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,14 @@
-# Samply.Focus v0.8.0 2024-11-04
+# Samply.Focus v0.10.0 2024-12-11
+
+## Major changes
+* Laplace-rs version 0.5.0 (includes a statrs breaking change)
+* DKTK_REPLACE_SPECIMEN_STRATIFIER, DKTK_REPLACE_HISTOLOGY_STRATIFIER for sample centric search
+
+## Minor changes
+* Allow Zlib license
+
+
+# Samply.Focus v0.9.0 2024-12-11
 
 ## Major changes
 * EHDS2 query support

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "focus"
-version = "0.9.0"
+version = "0.10.0"
 edition = "2021"
 license = "Apache-2.0"
 
@@ -16,7 +16,7 @@ chrono = "0.4.31"
 indexmap = "2.1.0"
 tokio = { version = "1.25.0", default-features = false, features = ["signal", "rt-multi-thread", "macros"] }
 beam-lib = { git = "https://github.com/samply/beam", branch = "develop", features = ["http-util"] }
-laplace_rs = {git = "https://github.com/samply/laplace-rs.git", tag = "v0.4.0" }
+laplace_rs = {git = "https://github.com/samply/laplace-rs.git", tag = "v0.5.0" }
 uuid = "1.8.0"
 rand = { default-features = false, version = "0.8.5" }
 futures-util = { version = "0.3", default-features = false, features = ["std"] }

diff --git a/deny.toml b/deny.toml
@@ -82,6 +82,7 @@ allow = [
     "BSD-3-Clause",
     "Unicode-DFS-2016",
     "Unicode-3.0",
+    "Zlib",
     #"Apache-2.0 WITH LLVM-exception",
 ]
 # List of explicitly disallowed licenses

diff --git a/resources/cql/DKTK_REPLACE_HISTOLOGY_STRATIFIER b/resources/cql/DKTK_REPLACE_HISTOLOGY_STRATIFIER
@@ -0,0 +1,4 @@
+define Histo:
+if InInitialPopulation then [Observation] else {} as List <Observation>
+
+define function Histology(histo FHIR.Observation):
diff --git a/resources/cql/DKTK_REPLACE_SPECIMEN_STRATIFIER b/resources/cql/DKTK_REPLACE_SPECIMEN_STRATIFIER
@@ -0,0 +1,4 @@
+define function SampleType(specimen FHIR.Specimen):
+specimen.type.coding.where(system = 'https://fhir.bbmri.de/CodeSystem/SampleMaterialType').code.first()
+
+define Specimen:
diff --git a/resources/cql/DKTK_STRAT_SPECIMEN_STRATIFIER b/resources/cql/DKTK_STRAT_SPECIMEN_STRATIFIER
@@ -2,4 +2,4 @@ define Specimen:
 if InInitialPopulation then [Specimen] else {} as List<Specimen>
 
 define function SampleType(specimen FHIR.Specimen):
-specimen.type.coding.where(system = 'https://fhir.bbmri.de/CodeSystem/SampleMaterialType').code.first()
+specimen.type.coding.where(system = 'https://fhir.bbmri.de/CodeSystem/SampleMaterialType').code.first()