4.0.1 (civisanalytics#45)

* bump to 4.0.1 and add a few reqs

.circleci/config.yml

@@ -7,5 +7,5 @@ jobs:
      - run: docker build -t civisanalytics/datascience-r .
      - run: docker run civisanalytics/datascience-r /bin/bash -c "echo BUILDS OK"
      - run: docker run civisanalytics/datascience-r Rscript -e "sessionInfo(package=NULL)"
-     - run: docker run civisanalytics/datascience-r python -c "import civis; print(civis.__version__)"
+     - run: docker run civisanalytics/datascience-r python3 -c "import civis; print(civis.__version__)"
      - run: docker run civisanalytics/datascience-r Rscript -e "packageVersion('civis')"

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.
 
+## [4.0.1] - 2020-05-23
+
+- rocker/verse -> 4.0.1
+- python is removed, replaced by explicit calls to either python2 or python3
+- added patchwork, gt, and packrat R packages
+- civis-r -> 3.0.0
+- civis-python -> 1.14.0 (installed by default in python3)
+
 ## [3.3.0] - 2020-04-13
 
 - rocker/verse -> 3.6.2

Dockerfile

@@ -1,4 +1,4 @@
-FROM rocker/verse:3.6.2
+FROM rocker/verse:4.0.1
 MAINTAINER [email protected]
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --no-install-recommends && \
@@ -12,28 +12,24 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --no-install-recommends &&
         libsodium-dev \
         libx11-dev \
         mesa-common-dev \
+        python3-pip \
+        python3-setuptools \
         wget && \
     apt-get clean -y && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # tuck the python client here just in case
 COPY ./requirements-python.txt /requirements-python.txt
-RUN curl -s https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
-    python get-pip.py && \
-    pip install -r requirements-python.txt && \
-    rm -rf ~/.cache/pip && \
-    rm -f get-pip.py
-
-# set cran to be default backup to set MRAN repo
-# RUN echo "options(repos = c(options('repos'), 'https://cran.rstudio.com/'), download.file.method = 'libcurl')" >> /usr/local/lib/R/etc/Rprofile.site
+RUN pip3 install -r requirements-python.txt && \
+    rm -rf ~/.cache/pip    
 
 COPY ./requirements.txt /requirements.txt
 RUN Rscript -e 'install.packages(readLines("requirements.txt"))'
 
-RUN Rscript -e 'install.packages("civis")' && \
+RUN Rscript -e 'install.packages("civis", repos="https://cran.rstudio.com")' && \
   Rscript -e "library(civis)"
 
-ENV VERSION=3.3.0 \
-    VERSION_MAJOR=3 \
-    VERSION_MINOR=3 \
+ENV VERSION=4.0.0 \
+    VERSION_MAJOR=4 \
+    VERSION_MINOR=0 \
     VERSION_MICRO=0

requirements-python.txt

@@ -1,3 +1,3 @@
-civis==1.11.0
-pubnub==4.0.12
-joblib==0.11
+cbor2==4.1.2
+pubnub>=4.5
+civis

requirements.txt

@@ -11,9 +11,12 @@ ggrepel
 glmnet
 gridExtra
 gsubfn
+gt
 htmltools
 leaflet
 maps
+packrat
+patchwork
 pROC
 ranger
 randomForest