Merge branch 'master' into optimize-time-series-data

.gitignore

@@ -1,2 +1,5 @@
+
 env/*
 pocwww.egg*
+pocwww/__pycache__/*
+pocwww.egg-info/*

README.txt

@@ -1,29 +1,12 @@
-POC Web Interface
-===============================
+# Henry Pump POC Web Interface
 
-Getting Started
----------------
+## Installation
+1. Install Python 3 & venv with `sudo apt-get install python3 python3-venv`
 
-- Change directory into your newly created project.
+2. From the root of the POC-Java-www directory, run `python3 -m venv env` to create the virtual environment.
 
-    cd POC Web Interface
+3. Update the install of pip `env/binpip install --upgrade pip setuptools`
 
-- Create a Python virtual environment.
+4. Install the python module `env/bin/pip install .`
 
-    python3 -m venv env
-
-- Upgrade packaging tools.
-
-    env/bin/pip install --upgrade pip setuptools
-
-- Install the project in editable mode with its testing requirements.
-
-    env/bin/pip install -e ".[testing]"
-
-- Run your project's tests.
-
-    env/bin/pytest
-
-- Run your project.
-
-    env/bin/pserve development.ini
+5. Test the web server `env/bin/pserve production.ini`

production.ini

@@ -10,7 +10,7 @@ pyramid.debug_authorization = false
 pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.default_locale_name = en
-mongo_uri = mongodb://localhost:27017/poc
+mongo_uri = mongodb://poc_www:HenryPump1903@localhost:27017/poc
 
 
 #---------- Pipeline Configuration ----------