Skip to content

Commit 36bce75

Browse files
authored
Merge pull request #1000 from romainx/master
Bump version of R packages
2 parents 414b5d7 + 4c12832 commit 36bce75

File tree

3 files changed

+23
-17
lines changed

3 files changed

+23
-17
lines changed

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ n-docs-diff: ## number of docs/ files changed since branch from master
6868
n-other-diff: ## number of files outside docs/ changed since branch from master
6969
@git diff --name-only $(DIFF_RANGE) -- ':!docs/' | wc -l | awk '{print $$1}'
7070

71+
run/%: ## run a bash in interactive mode in a stack
72+
docker run -it --rm $(OWNER)/$(notdir $@) $(SHELL)
73+
74+
run-sudo/%: ## run a bash in interactive mode as root in a stack
75+
docker run -it --rm -u root $(OWNER)/$(notdir $@) $(SHELL)
76+
7177
tx-en: ## rebuild en locale strings and push to master (req: GH_TOKEN)
7278
@git config --global user.email "travis@travis-ci.org"
7379
@git config --global user.name "Travis CI"
@@ -87,4 +93,4 @@ test/%: ## run tests against a stack
8793
@TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest test
8894

8995
test/base-notebook: ## test supported options in the base notebook
90-
@TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest test base-notebook/test
96+
@TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest test base-notebook/test

all-spark-notebook/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ USER $NB_UID
2323

2424
# R packages
2525
RUN conda install --quiet --yes \
26-
'r-base=3.6.1' \
26+
'r-base=3.6.2' \
2727
'r-ggplot2=3.2*' \
28-
'r-irkernel=1.0*' \
29-
'r-rcurl=1.95*' \
30-
'r-sparklyr=1.0*' \
28+
'r-irkernel=1.1*' \
29+
'r-rcurl=1.98*' \
30+
'r-sparklyr=1.1*' \
3131
&& \
3232
conda clean --all -f -y && \
3333
fix-permissions $CONDA_DIR && \

datascience-notebook/Dockerfile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,26 @@ USER $NB_UID
4545

4646
# R packages including IRKernel which gets installed globally.
4747
RUN conda install --quiet --yes \
48-
'r-base=3.6.1' \
48+
'r-base=3.6.2' \
4949
'r-caret=6.0*' \
5050
'r-crayon=1.3*' \
51-
'r-devtools=2.1*' \
52-
'r-forecast=8.7*' \
53-
'r-hexbin=1.27*' \
54-
'r-htmltools=0.3*' \
55-
'r-htmlwidgets=1.3*' \
56-
'r-irkernel=1.0*' \
51+
'r-devtools=2.2*' \
52+
'r-forecast=8.10*' \
53+
'r-hexbin=1.28*' \
54+
'r-htmltools=0.4*' \
55+
'r-htmlwidgets=1.5*' \
56+
'r-irkernel=1.1*' \
5757
'r-nycflights13=1.0*' \
5858
'r-plyr=1.8*' \
5959
'r-randomforest=4.6*' \
60-
'r-rcurl=1.95*' \
60+
'r-rcurl=1.98*' \
6161
'r-reshape2=1.4*' \
62-
'r-rmarkdown=1.14*' \
62+
'r-rmarkdown=2.1*' \
6363
'r-rsqlite=2.1*' \
6464
'r-shiny=1.3*' \
65-
'r-sparklyr=1.0*' \
66-
'r-tidyverse=1.2*' \
67-
'rpy2=2.9*' \
65+
'r-sparklyr=1.1*' \
66+
'r-tidyverse=1.3*' \
67+
'rpy2=3.1*' \
6868
&& \
6969
conda clean --all -f -y && \
7070
fix-permissions $CONDA_DIR && \

0 commit comments

Comments
 (0)