Merge pull request #255 from rovercode/development

Push to Production

Author: cabarnes

.travis.yml

@@ -1,6 +1,7 @@
 sudo: true
 services:
 - postgresql
+- docker
 addons:
   postgresql: "9.4"
 env:
@@ -9,7 +10,7 @@ before_install:
 - sudo apt-get update -qq
 - sudo apt-get install -qq build-essential gettext python-dev zlib1g-dev libpq-dev
   xvfb
-- sudo apt-get install -qq libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms1-dev
+- sudo apt-get install -qq libtiff5-dev libjpeg8-dev libfreetype6-dev liblcms2-dev
   libwebp-dev
 - sudo apt-get install -qq graphviz-dev python-setuptools python3-dev python-virtualenv
   python-pip
@@ -36,6 +37,19 @@ language: python
 python:
 - '3.6'
 deploy:
+# TODO: Re-add when ECR exists
+#  - provider: script
+#    script: bash ecr-deploy.sh alpha
+#    on:
+#      branch: alpha
+#  - provider: script
+#    script: bash ecr-deploy.sh beta
+#    on:
+#      branch: beta
+#  - provider: script
+#    script: bash ecr-deploy.sh prod
+#    on:
+#      branch: prod
   - provider: codedeploy
     access_key_id: AKIAIIORSR4VN3YQY2YQ
     secret_access_key:

Pipfile

@@ -9,19 +9,19 @@ python_version = "3.6"
 [dev-packages]
 pylint = "~=2.1.1"
 pylint-django = "~=2.0.2"
-prospector = "~=1.1.6.2"
+prospector = "==1.1.6.2"
 coverage = "~=4.5.1"
 django-coverage-plugin = "~=1.6.0"
 django-extensions = "~=2.1.0"
 django-test-plus = "~=1.1.0"
 django-debug-toolbar = "~=1.11"
 ipdb = "~=0.11"
-pytest-django = "~=3.4.5"
+pytest-django = "~=3.5.0"
 pytest-sugar = "~=0.9.1"
 pytest-cov = "~=2.5.1"
 pytest-asyncio = "~=0.10.0"
 Sphinx = "~=1.7.5"
-Werkzeug = "~=0.14.1"
+Werkzeug = "~=0.15.3"
 factory_boy = "~=2.11.1"
 sphinx-autobuild = "~=0.7.1"
 sphinx-rtd-theme = "~=0.4.0"

Pipfile.lock

@@ -32,10 +32,10 @@ Install `docker <https://docs.docker.com/engine/installation/>`_ and `docker-com
 
 .. code-block:: bash
 
-    $ git clone --recursive https://github.com/aninternetof/rovercode-web.git && cd rovercode-web
+    $ git clone --recursive https://github.com/rovercode/rovercode-web.git && cd rovercode-web
     $ sudo docker-compose -f dev.yml build
     $ sudo docker-compose -f dev.yml up
-    $ google-chrome localhost:8000
+    $ google-chrome localhost:8000/docs
 
 Basic Commands
 --------------