Merge branch 'master' into update-terra-jupyter-hail-to-hail-0.2.125

DataBiosphere · Oct 27, 2023 · ab8924a · ab8924a
2 parents c0a1341 + 04dc728
commit ab8924a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/config/conf.json b/config/conf.json
@@ -135,7 +135,7 @@
                 "r"
             ],
             "packages" : {},
-            "version" : "2.2.4",
+            "version" : "2.2.5",
             "automated_flags" : {
                 "include_in_ui" : false,
                 "generate_docs" : false,

diff --git a/terra-jupyter-aou/CHANGELOG.md b/terra-jupyter-aou/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.2.5 - 2023-10-27
+- Update `hail` to `0.2.125`
+  - See https://hail.is/docs/0.2/change_log.html#version-0-2-125) for details
+
+Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.5`
+
 ## 2.2.4 - 2023-10-06
 - Update `terra-jupyter-gatk` to `2.3.4`
   - Update `terra-jupyter-python` to `1.1.4`

diff --git a/terra-jupyter-aou/Dockerfile b/terra-jupyter-aou/Dockerfile
@@ -48,7 +48,7 @@ ENV PYTHONPATH $PYTHONPATH:/usr/lib/spark/python
 
 ENV PYSPARK_PYTHON=python3
 
-ENV HAIL_VERSION=0.2.120
+ENV HAIL_VERSION=0.2.125
 
 RUN find $JUPYTER_HOME/scripts -name '*.sh' -type f | xargs chmod +x \
     && $JUPYTER_HOME/scripts/kernel/kernelspec.sh $JUPYTER_HOME/scripts/kernel /opt/conda/share/jupyter/kernels \