Commit 36bce751 authored by Peter Parente's avatar Peter Parente Committed by GitHub

Merge pull request #1000 from romainx/master

Bump version of R packages
parents 414b5d74 4c128327
......@@ -68,6 +68,12 @@ n-docs-diff: ## number of docs/ files changed since branch from master
n-other-diff: ## number of files outside docs/ changed since branch from master
@git diff --name-only $(DIFF_RANGE) -- ':!docs/' | wc -l | awk '{print $$1}'
run/%: ## run a bash in interactive mode in a stack
docker run -it --rm $(OWNER)/$(notdir $@) $(SHELL)
run-sudo/%: ## run a bash in interactive mode as root in a stack
docker run -it --rm -u root $(OWNER)/$(notdir $@) $(SHELL)
tx-en: ## rebuild en locale strings and push to master (req: GH_TOKEN)
@git config --global user.email "travis@travis-ci.org"
@git config --global user.name "Travis CI"
......@@ -87,4 +93,4 @@ test/%: ## run tests against a stack
@TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest test
test/base-notebook: ## test supported options in the base notebook
@TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest test base-notebook/test
@TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest test base-notebook/test
\ No newline at end of file
......@@ -23,11 +23,11 @@ USER $NB_UID
# R packages
RUN conda install --quiet --yes \
'r-base=3.6.1' \
'r-base=3.6.2' \
'r-ggplot2=3.2*' \
'r-irkernel=1.0*' \
'r-rcurl=1.95*' \
'r-sparklyr=1.0*' \
'r-irkernel=1.1*' \
'r-rcurl=1.98*' \
'r-sparklyr=1.1*' \
&& \
conda clean --all -f -y && \
fix-permissions $CONDA_DIR && \
......
......@@ -45,26 +45,26 @@ USER $NB_UID
# R packages including IRKernel which gets installed globally.
RUN conda install --quiet --yes \
'r-base=3.6.1' \
'r-base=3.6.2' \
'r-caret=6.0*' \
'r-crayon=1.3*' \
'r-devtools=2.1*' \
'r-forecast=8.7*' \
'r-hexbin=1.27*' \
'r-htmltools=0.3*' \
'r-htmlwidgets=1.3*' \
'r-irkernel=1.0*' \
'r-devtools=2.2*' \
'r-forecast=8.10*' \
'r-hexbin=1.28*' \
'r-htmltools=0.4*' \
'r-htmlwidgets=1.5*' \
'r-irkernel=1.1*' \
'r-nycflights13=1.0*' \
'r-plyr=1.8*' \
'r-randomforest=4.6*' \
'r-rcurl=1.95*' \
'r-rcurl=1.98*' \
'r-reshape2=1.4*' \
'r-rmarkdown=1.14*' \
'r-rmarkdown=2.1*' \
'r-rsqlite=2.1*' \
'r-shiny=1.3*' \
'r-sparklyr=1.0*' \
'r-tidyverse=1.2*' \
'rpy2=2.9*' \
'r-sparklyr=1.1*' \
'r-tidyverse=1.3*' \
'rpy2=3.1*' \
&& \
conda clean --all -f -y && \
fix-permissions $CONDA_DIR && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment