Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Jupyter and RStudio for 3.19 release #488

Merged
merged 8 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions config/community_images.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@
},
{
"id": "RStudio",
"label": "RStudio (R 4.3.2, Bioconductor 3.18, Python 3.10.12)",
"version": "3.18.0",
"updated": "2023-11-07",
"packages": "https://raw.githubusercontent.com/anvilproject/anvil-docker/main/anvil-rstudio-bioconductor/info/anvil-rstudio-bioconductor-3.18.0-versions.json",
"image": "us.gcr.io/broad-dsp-gcr-public/anvil-rstudio-bioconductor:3.18.0",
"label": "RStudio (R 4.4.0, Bioconductor 3.19, Python 3.10.12)",
"version": "3.19.0",
"updated": "2024-05-13",
"packages": "https://raw.githubusercontent.com/anvilproject/anvil-docker/main/anvil-rstudio-bioconductor/info/anvil-rstudio-bioconductor-3.19.0-versions.json",
"image": "us.gcr.io/broad-dsp-gcr-public/anvil-rstudio-bioconductor:3.19.0",
"requiresSpark": false,
"isRStudio": true
},
{
"id": "LegacyRStudio",
"label": "RStudio (R 4.3.1, Bioconductor 3.17, Python 3.10.12)",
"version": "3.17.1",
"updated": "2023-09-13",
"packages": "https://raw.githubusercontent.com/anvilproject/anvil-docker/main/anvil-rstudio-bioconductor/info/anvil-rstudio-bioconductor-3.17.1-versions.json",
"image": "us.gcr.io/broad-dsp-gcr-public/anvil-rstudio-bioconductor:3.17.1",
"label": "RStudio (R 4.3.3, Bioconductor 3.18, Python 3.10.12)",
"version": "3.18.1",
"updated": "2024-05-13",
"packages": "https://raw.githubusercontent.com/anvilproject/anvil-docker/main/anvil-rstudio-bioconductor/info/anvil-rstudio-bioconductor-3.18.1-versions.json",
"image": "us.gcr.io/broad-dsp-gcr-public/anvil-rstudio-bioconductor:3.18.1",
"requiresSpark": false,
"isRStudio": true
}]
37 changes: 25 additions & 12 deletions config/conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"tidyverse"
]
},
"version" : "2.2.4",
"version" : "2.2.5",
"automated_flags" : {
"generate_docs" : true,
"include_in_ui" : true,
Expand Down Expand Up @@ -83,7 +83,9 @@
"tools" : [
"python"
],
"packages" : {},
"packages" : {

},
"version" : "1.1.3",
"automated_flags" : {
"generate_docs" : true,
Expand All @@ -99,8 +101,10 @@
"tools" : [
"r"
],
"packages" : {},
"version" : "2.2.4",
"packages" : {

},
"version" : "2.2.5",
"automated_flags" : {
"include_in_ui" : false,
"generate_docs" : true,
Expand All @@ -117,8 +121,10 @@
"python",
"r"
],
"packages" : {},
"version" : "2.3.6",
"packages" : {

},
"version" : "2.3.7",
"automated_flags" : {
"include_in_ui" : true,
"generate_docs" : true,
Expand All @@ -134,8 +140,10 @@
"python",
"r"
],
"packages" : {},
"version" : "2.2.11",
"packages" : {

},
"version" : "2.2.12",
"automated_flags" : {
"include_in_ui" : false,
"generate_docs" : false,
Expand All @@ -150,7 +158,9 @@
"tools" : [
"r"
],
"packages" : {},
"packages" : {

},
"version" : "0.1.1",
"automated_flags" : {
"include_in_ui" : false,
Expand All @@ -163,8 +173,11 @@
{
"name" : "wondershaper",
"base_label" : "wondershaper",
"tools" : [],
"packages" : {},
"tools" : [
],
"packages" : {

},
"version" : "0.0.1",
"automated_flags" : {
"include_in_ui" : false,
Expand All @@ -175,4 +188,4 @@
}
}
]
}
}
7 changes: 7 additions & 0 deletions terra-jupyter-aou/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 2.2.12 - 2024-05-15T15:36:28.616710060Z

- Update `terra-jupyter-r` to `2.2.5`
- Update for R 4.4.0 and Bioc 3.19

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.12`

## 2.2.11 - 2024-04-10
- Update `hail` to `0.2.130`
- See https://hail.is/docs/0.2/change_log.html#version-0-2-130) for details
Expand Down
2 changes: 1 addition & 1 deletion terra-jupyter-aou/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.6
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.7

USER root

Expand Down
7 changes: 7 additions & 0 deletions terra-jupyter-bioconductor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 2.2.5 - 2024-05-15T15:36:28.576892790Z

- Update `terra-jupyter-r` to `2.2.5`
- Update for R 4.4.0 and Bioc 3.19

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-bioconductor:2.2.5`

## 2.2.4 - 2023-11-14T15:56:44.470211534Z

- Update `terra-jupyter-r` to `2.2.4`
Expand Down
2 changes: 1 addition & 1 deletion terra-jupyter-bioconductor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.4
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.5
7 changes: 7 additions & 0 deletions terra-jupyter-gatk/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 2.3.7 - 2024-05-15T15:36:28.602743427Z

- Update `terra-jupyter-r` to `2.2.5`
- Update for R 4.4.0 and Bioc 3.19

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.7`

## 2.3.6 - 2023-11-27

- Update Samtools to `1.18`
Expand Down
9 changes: 4 additions & 5 deletions terra-jupyter-gatk/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.5 AS python

FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.4
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.5

USER root

Expand Down Expand Up @@ -90,14 +90,13 @@ COPY cnn-models.patch /etc/gatk-$GATK_VERSION/cnn-models.patch

RUN patch -u /opt/conda/lib/python3.10/site-packages/vqsr_cnn/vqsr_cnn/models.py -i /etc/gatk-$GATK_VERSION/cnn-models.patch

# Older version of nbconvert fail to convert notebooks to html
RUN pip3 install "nbconvert>=7.7.3"
# Newer version of nbconvert fail to convert notebooks to html
RUN pip3 install --ignore-installed python-dateutil==2.8.2 \
&& pip3 install "nbconvert==7.11.0"


ENV PIP_USER=true

ENV USER jupyter

USER $USER


6 changes: 6 additions & 0 deletions terra-jupyter-r/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 2.2.5 - 2024-05-15T15:36:28.555690376Z

- Update for R 4.4.0 and Bioc 3.19

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.5`

## 2.2.4 - 2023-11-14T15:56:44.443656567Z

- Bioconductor 3.18 release
Expand Down
6 changes: 3 additions & 3 deletions terra-jupyter-r/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ USER root
COPY scripts $JUPYTER_HOME/scripts

# Add env vars to identify binary package installation
ENV TERRA_R_PLATFORM="terra-jupyter-r-2.2.4"
ENV TERRA_R_PLATFORM_BINARY_VERSION=3.18
ENV TERRA_R_PLATFORM="terra-jupyter-r-2.2.5"
ENV TERRA_R_PLATFORM_BINARY_VERSION=3.19

# Install protobuf 3.20.3. Note this version comes from base deep learning image. Use `conda list` to see what's installed
RUN cd /tmp \
Expand Down Expand Up @@ -132,7 +132,7 @@ RUN pip3 -V \

RUN R -e 'install.packages("BiocManager")' \
## check version
&& R -e 'BiocManager::install(version="3.18", ask=FALSE)' \
&& R -e 'BiocManager::install(version="3.19", ask=FALSE)' \
&& R -e 'BiocManager::install(c( \
"boot", \
"class", \
Expand Down
Loading