Update requirements files

Sync up requirement files with global-requirements,
and set tox default envs to be 'py3' over 'py35'

Change-Id: Ic78246a4a75b88027b4896664874d1efc587582c

requirements.txt

@@ -1,19 +1,21 @@
-# pinned versions to reassess:
-Babel!=2.4.0,>=2.3.4
+pbr>=5.2.0
 
-pbr>=3.0.0
+Babel>=2.6.0
+decorator>=4.4.0
+django-rest-swagger>=2.2.0
+djangorestframework>=3.9.4
+jsonfield>=2.0.2
+keystoneauth1>=3.14.0
+keystonemiddleware>=6.0.0
+python-cinderclient>=4.1.0
+python-keystoneclient>=3.19.0
+python-neutronclient>=6.12.0
+python-novaclient>=14.0.0
+python-octaviaclient>=1.8.0
+PyYAML>=5.1
+six>=1.12.0
+
+# Address soon:
 Django>=1.11,<1.12
-decorator>=4.0.11
-djangorestframework>=3.6.2
-keystoneauth1>=2.19.0
-keystonemiddleware>=4.20.0
-python-cinderclient>=2.0.1
-python-neutronclient>=6.2.0
-python-novaclient>=8.0.0
-python-keystoneclient>=3.10.0
-python-octaviaclient>=1.0.0
-six>=1.10.0
-jsonfield>=2.0.1
-django-rest-swagger>=2.1.2
-pyyaml>=3.12
+# was pinned because of django 1.11
 mysqlclient>=1.3.10,<1.4

test-requirements.txt

@@ -1,8 +1,8 @@
-mock==1.2.0
-flake8>=3.0.4
-coverage>=4.4.1
-sphinx!=1.6.1,>=1.5.1
-os-api-ref>=1.0.0 # Apache-2.0
-sphinx-catalystcloud-theme>=0.0.1 # MIT
-sphinx-rtd-theme>=0.2.4
-doc8
+coverage>=4.5.3
+doc8>=0.8.0
+flake8>=3.7.7
+mock>=3.0.5
+os-api-ref>=1.6.1 # Apache-2.0
+sphinx-rtd-theme>=0.4.3
+sphinx<1.9;python_version=="2.7"
+sphinx>=1.8.5;python_version>"3.6"

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35,pep8,cover_report
+envlist = py27,py3,pep8,cover_report
 skipsdist = True
 
 [testenv]