Merge branch 'develop' into bwindels/registerasregularuser github/bwindels/registerasregularuser bwindels/registerasregularuser

1 files changed, 8 insertions, 0 deletions

diff --git a/.travis.yml b/.travis.yml

index b3ee66da8f..2077f6af72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,9 @@ matrix:
     env: TOX_ENV=py27
 
   - python: 2.7
+    env: TOX_ENV=py27-old
+
+  - python: 2.7
     env: TOX_ENV=py27-postgres TRIAL_FLAGS="-j 4"
     services:
       - postgresql
@@ -32,6 +35,11 @@ matrix:
     env: TOX_ENV=py36
 
   - python: 3.6
+    env: TOX_ENV=py36-postgres TRIAL_FLAGS="-j 4"
+    services:
+      - postgresql
+
+  - python: 3.6
     env: TOX_ENV=check_isort
 
   - python: 3.6