#32 #61 fix requirements.txt and upgrade existing Docker to Ubuntu 16.04

docker/Dockerfile

@@ -1,44 +1,60 @@
-FROM ubuntu:14.04
-# FROM python:2.7  would be preferred but trickier
-# TODO: use a more lightweight Linux distro than Ubuntu
+FROM ubuntu:16.04
 
 MAINTAINER just@justobjects.nl
 
 # Configure timezone and locale
 ARG IMAGE_TIMEZONE="Europe/Amsterdam"
-# set time right adn configure timezone and locale
-RUN echo "$IMAGE_TIMEZONE" > /etc/timezone && \
-	dpkg-reconfigure -f noninteractive tzdata
 
-# Optional: Use local cached debs from host (saves your bandwidth!)
-# Change ip below to that of your apt-cacher-ng host
-# Or comment this line out if you do not with to use caching
-# ADD 71-apt-cacher-ng /etc/apt/apt.conf.d/71-apt-cacher-ng
-
-RUN export DEBIAN_FRONTEND=noninteractive TERM=linux && \
-  echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-
-RUN apt-get update && \
-	apt-get install -y software-properties-common
+# Set time right and configure timezone and locale
+RUN \
+	apt-get update && \
+	apt-get install -y tzdata && \
+	echo "$IMAGE_TIMEZONE" > /etc/timezone && \
+	dpkg-reconfigure -f noninteractive tzdata && \
+	export DEBIAN_FRONTEND=noninteractive TERM=linux && \
+    echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
 # Use UbuntuGIS for latest GDAL, Proj.4, GEOS etc
-RUN apt-add-repository ppa:ubuntugis/ubuntugis-unstable
-RUN apt-get update && \
-	apt-get install -y git \
-    libgeos-dev \
-    python-lxml \
-    python-gdal \
-    libgdal-dev \
-    build-essential \
-    python-dev \
-    python-setuptools \
-    gdal-bin
-
-# Get latest Stetl from git
-RUN git clone https://github.com/geopython/stetl /opt/stetl
-
-# Use Stetl installer
-RUN cd /opt/stetl; python setup.py install
+RUN \
+	apt-get install -y software-properties-common && \
+	apt-add-repository ppa:ubuntugis/ubuntugis-unstable && \
+	apt-get update && \
+	apt-get install -y \
+		git \
+	    libgeos-dev \
+	    python-lxml \
+	    libxml2-dev libxslt-dev \
+	    python-gdal \
+	    libgdal-dev \
+	    build-essential \
+	    python-dev \
+	    python-setuptools \
+	    python-pip \
+	    gdal-bin
+
+# Add Python extra packages
+RUN \
+	pip install \
+		pytz \
+		requests \
+		geohash \
+		Cython \
+		numpy \
+		pandas \
+		scipy \
+		scikit-learn==0.18  \
+		influxdb \
+		seaborn \
+		matplotlib \
+		nose2 \
+		mock
+
+# Get latest Stetl from git and use Stetl installer
+RUN \
+	git clone https://github.com/geopython/stetl /opt/stetl && \
+	cd /opt/stetl && \
+    python setup.py install && \
+    nose2
 
 # Allow docker run
 ENTRYPOINT ["/usr/local/bin/stetl"]

requirements-dev.txt

@@ -1,7 +1,3 @@
-psycopg2
-lxml
-Jinja2
-argparse ; python_version < '2.7'
 nose2
 cov-core
 mock

setup.py

@@ -32,7 +32,7 @@
 with open('CHANGES.txt', 'r') as f:
     changes = f.read()
 
-with open('requirements.txt') as f:
+with open('requirements-main.txt') as f:
     requirements = f.read().splitlines()
 
 setup(