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.

Sign up for GitHub

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

[CIVP-17803] [CIVP-17774] 1.6.0 #16

Merged
merged 2 commits into from
Feb 18, 2019
+9 −3
Merged

[CIVP-17803] [CIVP-17774] 1.6.0 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86e370a
ENH civis-r 1.5.0
patr1ckm Jun 21, 2018
bf95432
rocker/verse -> 3.5.2, civis-r -> 1.6.1
patr1ckm Feb 18, 2019
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

# [1.6.0] - 2019-02-18
- rocker/verse -> 3.5.2
- R -> 3.5.2
- civis-r -> 1.6.1

# [1.5.0] - 2018-05-08
- Migrate CircleCI build from v1.0 to v2.0
- Upgraded civis-r to 1.4.0
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rocker/verse:3.5.0
FROM rocker/verse:3.5.2
MAINTAINER [email protected]

ENV DEFAULT_KERNEL=ir \
Expand Down Expand Up @@ -34,7 +34,8 @@ RUN chmod +x /tini
# TODO: investigate
RUN ln -s /bin/tar/ /bin/gtar

RUN pip install civis-jupyter-notebook==${CIVIS_JUPYTER_NOTEBOOK_VERSION} && \
RUN pip install notebook==5.4.1 \
civis-jupyter-notebook==${CIVIS_JUPYTER_NOTEBOOK_VERSION} && \
civis-jupyter-notebooks-install

COPY ./setup.R /setup.R
Expand Down
2 changes: 1 addition & 1 deletion setup.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Install civis R client
options(unzip='internal');
devtools::install_github('civisanalytics/civis-r', ref = 'v1.4.0', upgrade_dependencies = FALSE);
devtools::install_github('civisanalytics/civis-r', ref = 'v1.6.1', upgrade_dependencies = FALSE);

# Install R Kernel for Jupyter
install.packages(c('IRdisplay', 'pbdZMQ'))
Expand Down