Skip to content

Commit

Permalink
Merge pull request #19 from civisanalytics/civp-18712
Browse files Browse the repository at this point in the history
[CIVP-18712] R -> 3.5.3, civis -> 2.0.0, IRkernel -> 1.0.0
  • Loading branch information
patr1ckm authored Jun 25, 2019
2 parents 8ea81f6 + f5cc57d commit 60f5a09
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ 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.7.0] - 2019-06-21

### Changed

- rocker/verse -> 3.5.3
- R -> 3.5.3
- civis-r -> 2.0.0
- IRkernel -> 1.0.0

# [1.6.1] - 2019-05-13
###Changed
- civis-jupyter-notebooks v0.4.2 -> v1.0.0 (#18)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rocker/verse:3.5.2
FROM rocker/verse:3.5.3
MAINTAINER [email protected]

ENV DEFAULT_KERNEL=ir \
Expand Down
4 changes: 2 additions & 2 deletions setup.R
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Install civis R client
options(unzip='internal');
devtools::install_github('civisanalytics/civis-r', ref = 'v1.6.1', upgrade_dependencies = FALSE);
devtools::install_github('civisanalytics/civis-r', ref = 'v2.0.0', upgrade_dependencies = FALSE);

# Install R Kernel for Jupyter
install.packages(c('IRdisplay', 'pbdZMQ'))
devtools::install_github('IRkernel/IRkernel', ref = '0.7.1', upgrade_dependencies = FALSE);
devtools::install_github('IRkernel/IRkernel', ref = '1.0.0', upgrade_dependencies = FALSE);

# kernel name = ir
IRkernel::installspec()

0 comments on commit 60f5a09

Please sign in to comment.