Revert "Try using py35 insetad of py36"

This reverts commit 4b28ec9a2a218a0d41336b0152c2042c57e81339.

.travis.yml

@@ -18,12 +18,12 @@ matrix:
       env: TOX_ENV=py27-azure
     - python: 2.7
       env: TOX_ENV=py27-openstack
-    - python: 3.5
-      env: TOX_ENV=py35-aws
-    - python: 3.5
-      env: TOX_ENV=py35-azure
-    - python: 3.5
-      env: TOX_ENV=py35-openstack
+    - python: 3.6
+      env: TOX_ENV=py36-aws
+    - python: 3.6
+      env: TOX_ENV=py36-azure
+    - python: 3.6
+      env: TOX_ENV=py36-openstack
     - python: pypy-5.3.1
       env: TOX_ENV=pypy-aws
     - python: pypy-5.3.1
@@ -64,7 +64,7 @@ install:
     - pip install coveralls
     - pip install codecov
 script:
-    - tox -r -e $TOX_ENV
+    - travis_wait 30 tox -r -e $TOX_ENV
 after_script:
     - |
       case "$TRAVIS_EVENT_TYPE" in

tox.ini

@@ -12,7 +12,7 @@
 # mock providers.
 
 [tox]
-envlist = {py27,py35,pypy}-{aws,azure,openstack}
+envlist = {py27,py36,pypy}-{aws,azure,openstack}
 
 [testenv]
 commands = flake8 cloudbridge test setup.py