Merge branch 'develop' into k8s

* develop:
  Wording fix (ucbrise#234)
  RPC container content fix (ucbrise#232)
  [CLIPPER-227] Fix EWMA behavior for meters (ucbrise#228)
  One-line app registration and model deployment (ucbrise#223)
  R model deployment (ucbrise#195)
  Allow model versions to be strings (ucbrise#197)
  Base64 decoding for JSON byte data (ucbrise#214)
  Restarting on containers is no longer the default behavior (ucbrise#213)
  fixed backslash escape issue for removing remote containers (ucbrise#210)
  removed pip install findspark from run_unittests.sh (ucbrise#211)
  Fix example code in README (ucbrise#205)

README.md

@@ -58,7 +58,8 @@ eval $(minikube docker-env)
 ```
 $ pip install clipper_admin
 $ python
->>> from clipper_admin import Clipper, numpy as np
+>>> from clipper_admin import Clipper
+>>> import numpy as np
 # Start a Clipper instance on localhost
 >>> clipper = Clipper("localhost")
 Checking if Docker is running...

RPythonDockerfile

@@ -0,0 +1,39 @@
+FROM clipper/py-rpc:latest
+
+## Use Debian unstable via pinning -- new style via APT::Default-Release
+RUN echo "deb http://http.debian.net/debian sid main" > /etc/apt/sources.list.d/debian-unstable.list \
+	&& echo 'APT::Default-Release "testing";' > /etc/apt/apt.conf.d/default
+
+ENV R_BASE_VERSION 3.4.0
+
+## Now install R and littler, and create a link for littler in /usr/local/bin
+## Also set a default CRAN repo, and make sure littler knows about it too
+RUN apt-get update \
+	&& apt-get install -t unstable -y --no-install-recommends \
+		littler \
+                r-cran-littler \
+		r-base=${R_BASE_VERSION}* \
+		r-base-dev=${R_BASE_VERSION}* \
+		r-recommended=${R_BASE_VERSION}* \
+        && echo 'options(repos = c(CRAN = "https://cran.rstudio.com/"), download.file.method = "libcurl")' >> /etc/R/Rprofile.site \
+        && echo 'source("/etc/R/Rprofile.site")' >> /etc/littler.r \
+	&& ln -s /usr/share/doc/littler/examples/install.r /usr/local/bin/install.r \
+	&& ln -s /usr/share/doc/littler/examples/install2.r /usr/local/bin/install2.r \
+	&& ln -s /usr/share/doc/littler/examples/installGithub.r /usr/local/bin/installGithub.r \
+	&& ln -s /usr/share/doc/littler/examples/testInstalled.r /usr/local/bin/testInstalled.r \
+	&& install.r docopt \
+	&& rm -rf /tmp/downloaded_packages/ /tmp/*.rds \
+	&& rm -rf /var/lib/apt/lists/*
+
+
+
+
+RUN conda install rpy2
+
+COPY containers/R/r_python_container.py /container/
+
+CMD ["python", "/container/r_python_container.py"]
+
+
+
+# vim: set filetype=dockerfile:

bin/build_docker_images.sh

@@ -33,4 +33,5 @@ time docker build -t clipper/python-container -f ./PythonContainerDockerfile ./
 time docker build -t clipper/pyspark-container -f ./PySparkContainerDockerfile ./
 time docker build -t clipper/sklearn_cifar_container -f ./SklearnCifarDockerfile ./
 time docker build -t clipper/tf_cifar_container -f ./TensorFlowCifarDockerfile ./
+time docker build -t clipper/r_python_container -f ./RPythonDockerfile ./
 cd -

bin/run_unittests.sh

@@ -132,7 +132,6 @@ function run_integration_tests {
   else
     echo "Found Spark at $SPARK_HOME"
   fi
-  pip install findspark
   python ../integration-tests/clipper_manager_tests.py
   python ../integration-tests/deploy_pyspark_models.py
   python ../integration-tests/deploy_pyspark_pipeline_models.py