From a8a10a51388161efae1d178c7418ae1470c19c81 Mon Sep 17 00:00:00 2001 From: Patrick Miller Date: Fri, 21 Jun 2019 14:20:20 -0500 Subject: [PATCH] 3.0.0 (#34) * 3.0.0 * add zoo * update changelog --- CHANGELOG.md | 8 ++++++++ Dockerfile | 13 ++++++++----- requirements-python.txt | 2 +- requirements.txt | 1 + 4 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 requirements.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 0344c3b..d695b2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,14 @@ Version number changes (major.minor.micro) in this package denote the following: - A minor version will increase if one or more packages contained in the Docker image add new, backwards-compatible features, or if a new package is added to the Docker image. - A major version will increase if there are any backwards-incompatible changes in any of the packages contained in this Docker image, or any other backwards-incompabile changes in the execution environment. +# [3.0.0] - 2019-06-21 + +- rocker/verse -> 3.5.3 +- civis-r -> 2.0.0 +- civis-python -> 1.10.0 +- added `requirements.txt` +- added package `zoo` + ## [2.8.0] - 2019-02-12 - rocker/verse -> 3.5.2 diff --git a/Dockerfile b/Dockerfile index eef671e..cda8cae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/verse:3.5.2 +FROM rocker/verse:3.5.3 MAINTAINER support@civisanalytics.com RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --no-install-recommends && \ @@ -16,11 +16,14 @@ RUN curl -s https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \ rm -rf ~/.cache/pip && \ rm -f get-pip.py -RUN Rscript -e "devtools::install_github('civisanalytics/civis-r', ref = 'v1.6.1', upgrade_dependencies = FALSE);" +RUN Rscript -e "devtools::install_github('civisanalytics/civis-r', ref = 'v2.0.0', upgrade_dependencies = FALSE);" + +COPY ./requirements.txt /requirements.txt +RUN Rscript -e 'install.packages(readLines("requirements.txt"))' RUN Rscript -e "library(civis)" -ENV VERSION=2.8.0 \ - VERSION_MAJOR=2 \ - VERSION_MINOR=8 \ +ENV VERSION=3.0.0 \ + VERSION_MAJOR=3 \ + VERSION_MINOR=0 \ VERSION_MICRO=0 diff --git a/requirements-python.txt b/requirements-python.txt index 101d4a5..40d0e43 100644 --- a/requirements-python.txt +++ b/requirements-python.txt @@ -1,3 +1,3 @@ -civis==1.9.3 +civis==1.10.0 pubnub==4.0.12 joblib==0.11 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..d15dc45 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +zoo