Merge pull request #27 from poseidon-framework/poseidonHS1402

switched to poseidon-hs v1.4.0.2
poseidon-framework · Sep 26, 2023 · fa5c2bb · fa5c2bb
2 parents c67193c + 9a1614e
commit fa5c2bb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
+- 1.0.0.1: Switched to poseidon-hs v1.4.0.2
 - 1.0.0.0: Some key updates:
-	- now uses newest poseidon-hs library with improved and clarified semantics for entity selectors
+	- now uses newest poseidon-hs library (v1.4.0.0) with improved and clarified semantics for entity selectors
 	- Fstats now uses the information in the column "Genotype_Ploidy" from the Janno file to improve bias-correction. Specifically, haploid samples
 	  contribute only one chromosome to the count in the bias-correction formula.
 	- added a whitepaper to describe the mathematics of the statistics in "docs".

diff --git a/CHANGELOGRELEASE.md b/CHANGELOGRELEASE.md
@@ -1,5 +1,6 @@
-# V1.0.0.0: specify package-versions in fstats, genotype ploidy and whitepaper
-This release updates to the latest version of poseidon-hs (1.4.0.0), which introduced a major clarification and improvement of the entity-selection language, that also powers the selection language to specify groups in fstats and define the statistics.
+# V1.0.0.1: specify package-versions in fstats, genotype ploidy and whitepaper
+
+This release updates to the latest version of poseidon-hs (v1.4.0.2), which introduced a major clarification and improvement of the entity-selection language, that also powers the selection language to specify groups in fstats and define the statistics.
 
 In particular, appending a version of a package after the package-name is now possible, both in group selection and statistic definitions. For example, here is a possible fstats configuration file:
 

diff --git a/poseidon-analysis-hs.cabal b/poseidon-analysis-hs.cabal
@@ -1,5 +1,5 @@
 name:                poseidon-analysis-hs
-version:             1.0.0.0
+version:             1.0.0.1
 synopsis:            A package with analysis-tools to work with Poseidon Genotype Data
 description:         The tools in this package analyse Poseidon-formatted genotype databases, a modular system for storing genotype data from thousands of individuals.
 license:             MIT

diff --git a/stack.yaml b/stack.yaml
@@ -6,7 +6,7 @@ packages:
 
 extra-deps:
   - git: https://github.com/poseidon-framework/poseidon-hs
-    commit: 352fc2477daf491890434b1510e832634957654e
+    commit: 215e0106dc21b3cbe84287da13e47f19cb7c0e61
   - table-layout-0.9.1.0
   - data-default-instances-base-0.1.0.1
   - sequence-formats-1.7.0

diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -5,15 +5,15 @@
 
 packages:
 - completed:
-    commit: 352fc2477daf491890434b1510e832634957654e
+    commit: 215e0106dc21b3cbe84287da13e47f19cb7c0e61
     git: https://github.com/poseidon-framework/poseidon-hs
     name: poseidon-hs
     pantry-tree:
-      sha256: b96ff9cbcb6d866844f36dcdf6cd5a4eb553d95c4ae6057ce9792c831afb0a14
+      sha256: bf36052db164931ca7e91a158d9c1ec282034a4249160b620ece877d2954b7a7
       size: 44449
-    version: 1.4.0.0
+    version: 1.4.0.2
   original:
-    commit: 352fc2477daf491890434b1510e832634957654e
+    commit: 215e0106dc21b3cbe84287da13e47f19cb7c0e61
     git: https://github.com/poseidon-framework/poseidon-hs
 - completed:
     hackage: table-layout-0.9.1.0@sha256:172b8b3a06c992839a781b77e42bbce689ba87d92c260acb61d187f7e6aad7f2,7154