Merge pull request #369 from blueyed/fix-tests

requirements/testing.txt: bump cryptography to 2.0.3

Author: jpadilla

.travis.yml

@@ -1,75 +1,121 @@
-python: '3.5'
-
+sudo: false
 language: python
-
 cache: pip
-sudo: false
 
-env:
-    - TOX_ENV=py27-flake8
-    - TOX_ENV=py27-docs
+matrix:
+  fast_finish: true
+  include:
+    - python: 2.7
+      env: TOX_ENV=py27-flake8
+    - python: 2.7
+      env: TOX_ENV=py27-docs
+
+    - python: 2.7
+      env: TOX_ENV=py27-django1.8-drf3.1
+    - python: 2.7
+      env: TOX_ENV=py27-django1.8-drf3.2
+    - python: 2.7
+      env: TOX_ENV=py27-django1.8-drf3.3
+    - python: 2.7
+      env: TOX_ENV=py27-django1.8-drf3.4
+    - python: 2.7
+      env: TOX_ENV=py27-django1.8-drf3.5
+    - python: 2.7
+      env: TOX_ENV=py27-django1.8-drf3.6
 
-    - TOX_ENV=py27-django1.8-drf3.1
-    - TOX_ENV=py27-django1.8-drf3.2
-    - TOX_ENV=py27-django1.8-drf3.3
-    - TOX_ENV=py27-django1.8-drf3.4
-    - TOX_ENV=py27-django1.8-drf3.5
-    - TOX_ENV=py27-django1.8-drf3.6
+    - python: 2.7
+      env: TOX_ENV=py27-django1.9-drf3.1
+    - python: 2.7
+      env: TOX_ENV=py27-django1.9-drf3.2
+    - python: 2.7
+      env: TOX_ENV=py27-django1.9-drf3.3
+    - python: 2.7
+      env: TOX_ENV=py27-django1.9-drf3.4
+    - python: 2.7
+      env: TOX_ENV=py27-django1.9-drf3.5
+    - python: 2.7
+      env: TOX_ENV=py27-django1.9-drf3.6
 
-    - TOX_ENV=py27-django1.9-drf3.1
-    - TOX_ENV=py27-django1.9-drf3.2
-    - TOX_ENV=py27-django1.9-drf3.3
-    - TOX_ENV=py27-django1.9-drf3.4
-    - TOX_ENV=py27-django1.9-drf3.5
-    - TOX_ENV=py27-django1.9-drf3.6
+    - python: 2.7
+      env: TOX_ENV=py27-django1.10-drf3.4
+    - python: 2.7
+      env: TOX_ENV=py27-django1.10-drf3.5
+    - python: 2.7
+      env: TOX_ENV=py27-django1.10-drf3.6
 
-    - TOX_ENV=py27-django1.10-drf3.4
-    - TOX_ENV=py27-django1.10-drf3.5
-    - TOX_ENV=py27-django1.10-drf3.6
-    
-    - TOX_ENV=py27-django1.11-drf3.4
-    - TOX_ENV=py27-django1.11-drf3.5
-    - TOX_ENV=py27-django1.11-drf3.6
+    - python: 2.7
+      env: TOX_ENV=py27-django1.11-drf3.4
+    - python: 2.7
+      env: TOX_ENV=py27-django1.11-drf3.5
+    - python: 2.7
+      env: TOX_ENV=py27-django1.11-drf3.6
 
-    - TOX_ENV=py33-django1.8-drf3.1
-    - TOX_ENV=py33-django1.8-drf3.2
-    - TOX_ENV=py33-django1.8-drf3.3
-    - TOX_ENV=py33-django1.8-drf3.4
-    - TOX_ENV=py33-django1.8-drf3.5
-    - TOX_ENV=py33-django1.8-drf3.6
+    - python: 3.3
+      env: TOX_ENV=py33-django1.8-drf3.1
+    - python: 3.3
+      env: TOX_ENV=py33-django1.8-drf3.2
+    - python: 3.3
+      env: TOX_ENV=py33-django1.8-drf3.3
+    - python: 3.3
+      env: TOX_ENV=py33-django1.8-drf3.4
+    - python: 3.3
+      env: TOX_ENV=py33-django1.8-drf3.5
+    - python: 3.3
+      env: TOX_ENV=py33-django1.8-drf3.6
 
-    - TOX_ENV=py34-django1.8-drf3.1
-    - TOX_ENV=py34-django1.8-drf3.2
-    - TOX_ENV=py34-django1.8-drf3.3
-    - TOX_ENV=py34-django1.8-drf3.4
-    - TOX_ENV=py34-django1.8-drf3.5
-    - TOX_ENV=py34-django1.8-drf3.6
+    - python: 3.4
+      env: TOX_ENV=py34-django1.8-drf3.1
+    - python: 3.4
+      env: TOX_ENV=py34-django1.8-drf3.2
+    - python: 3.4
+      env: TOX_ENV=py34-django1.8-drf3.3
+    - python: 3.4
+      env: TOX_ENV=py34-django1.8-drf3.4
+    - python: 3.4
+      env: TOX_ENV=py34-django1.8-drf3.5
+    - python: 3.4
+      env: TOX_ENV=py34-django1.8-drf3.6
 
-    - TOX_ENV=py34-django1.9-drf3.1
-    - TOX_ENV=py34-django1.9-drf3.2
-    - TOX_ENV=py34-django1.9-drf3.3
-    - TOX_ENV=py34-django1.9-drf3.4
-    - TOX_ENV=py34-django1.9-drf3.5
-    - TOX_ENV=py34-django1.9-drf3.6
+    - python: 3.4
+      env: TOX_ENV=py34-django1.9-drf3.1
+    - python: 3.4
+      env: TOX_ENV=py34-django1.9-drf3.2
+    - python: 3.4
+      env: TOX_ENV=py34-django1.9-drf3.3
+    - python: 3.4
+      env: TOX_ENV=py34-django1.9-drf3.4
+    - python: 3.4
+      env: TOX_ENV=py34-django1.9-drf3.5
+    - python: 3.4
+      env: TOX_ENV=py34-django1.9-drf3.6
 
-    - TOX_ENV=py34-django1.10-drf3.4
-    - TOX_ENV=py34-django1.10-drf3.5
-    - TOX_ENV=py34-django1.10-drf3.6
-    
-    - TOX_ENV=py34-django1.11-drf3.4
-    - TOX_ENV=py34-django1.11-drf3.5
-    - TOX_ENV=py34-django1.11-drf3.6
+    - python: 3.4
+      env: TOX_ENV=py34-django1.10-drf3.4
+    - python: 3.4
+      env: TOX_ENV=py34-django1.10-drf3.5
+    - python: 3.4
+      env: TOX_ENV=py34-django1.10-drf3.6
 
-    - TOX_ENV=py35-django1.10-drf3.4
-    - TOX_ENV=py35-django1.10-drf3.5
-    - TOX_ENV=py35-django1.10-drf3.6
-    
-    - TOX_ENV=py35-django1.11-drf3.4
-    - TOX_ENV=py35-django1.11-drf3.5
-    - TOX_ENV=py35-django1.11-drf3.6
+    - python: 3.4
+      env: TOX_ENV=py34-django1.11-drf3.4
+    - python: 3.4
+      env: TOX_ENV=py34-django1.11-drf3.5
+    - python: 3.4
+      env: TOX_ENV=py34-django1.11-drf3.6
 
-matrix:
-  fast_finish: true
+    - python: 3.5
+      env: TOX_ENV=py35-django1.10-drf3.4
+    - python: 3.5
+      env: TOX_ENV=py35-django1.10-drf3.5
+    - python: 3.5
+      env: TOX_ENV=py35-django1.10-drf3.6
+
+    - python: 3.5
+      env: TOX_ENV=py35-django1.11-drf3.4
+    - python: 3.5
+      env: TOX_ENV=py35-django1.11-drf3.5
+    - python: 3.5
+      env: TOX_ENV=py35-django1.11-drf3.6
 
 install:
     - pip install tox

requirements/testing.txt

@@ -1,7 +1,4 @@
-# PyTest for running the tests.
 pytest==2.6.4
 pytest-django==2.8.0
 pytest-cov==1.6
-
-# Mocking the datetime module.
-cryptography==1.2.3
+cryptography==2.0.3