Merge pull request #258 from ComputerScienceHouse/develop

Author: mxmeinhold

.travis.yml

@@ -1,6 +1,8 @@
 language: python
 python:
   - "3.6"
+services:
+  - "docker"
 
 install:
   - "pip install -r requirements.txt"
@@ -11,3 +13,4 @@ install:
   - "npm install"
 script:
   - "gulp production"
+  - "docker build -t conditional ."

requirements.txt

@@ -2,7 +2,7 @@ alembic~=0.9.8
 astroid~=2.2.5
 blinker~=1.4
 click~=6.7
-csh-ldap~=2.2
+git+git://github.com/mxmeinhold/csh_ldap@c441add834405761758bea981fd5286f2abcaf93#egg=csh_ldap
 Flask~=1.1.0
 Flask-Migrate~=2.1.1
 Flask-Gzip~=0.2
@@ -17,7 +17,7 @@ Mako~=1.0.7
 MarkupSafe~=1.0
 mccabe~=0.6.1
 oic~=0.11.0
-psycopg2~=2.7.4
+psycopg2~=2.8.5
 pyldap~=2.4.45
 pylint~=2.3.1
 python-dateutil~=2.6.1