Fix lower-constraints

The 'install_command' section was being overridden in 'tox.ini', meaning
we were never using the constraints 'lower-constraints.txt'. Fix this
and update the few requirements necessary.

- oslo.db so we get Ifb2c59c2cfbd615b04570b31fcfe868f4ffea3c6 which is
  necessary for Python 3.7 support
- python-glanceclient so we get the HTTP error messages expected in unit
  tests since I1608f82eeaa6ff4c5ac55f57989bb1cfe17dbdc7. This also
  necessitates updating keystoneauth1.
- The minimum of Sphinx is bumped to 1.7.0 to avoid the need to
  blacklist multiple 1.6.x versions

In addition, these minimums are reflected in test-requirements.txt and
requirements.txt. This is expected by the 'requirements-check' job in
the gate.

Change-Id: Ib96387c1e295a2c92debf761893708d110e544c5
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

lower-constraints.txt

@@ -36,7 +36,7 @@ jmespath==0.9.3
 jsonpatch==1.21
 jsonpointer==2.0
 jsonschema==2.6.0
-keystoneauth1==3.4.0
+keystoneauth1==3.14.0
 linecache2==1.0.0
 logilab-common==1.4.1
 lxml==4.1.1
@@ -62,7 +62,7 @@ oslo.cache==1.29.0
 oslo.concurrency==3.26.0
 oslo.config==5.2.0
 oslo.context==2.20.0
-oslo.db==4.35.0
+oslo.db==4.40.0
 oslo.i18n==3.20.0
 oslo.log==3.37.0
 oslo.serialization==2.25.0
@@ -86,7 +86,7 @@ pyperclip==1.6.0
 python-cinderclient==3.5.0
 python-dateutil==2.7.0
 python-editor==1.0.3
-python-glanceclient==2.9.1
+python-glanceclient==2.16.0
 python-keystoneclient==3.15.0
 python-mimeparse==1.6.0
 python-neutronclient==6.7.0
@@ -103,7 +103,7 @@ Routes==2.4.1
 simplejson==3.13.2
 six==1.11.0
 snowballstemmer==1.2.1
-Sphinx==1.6.5
+Sphinx==1.7.0
 sphinxcontrib-websupport==1.0.1
 SQLAlchemy==1.2.5
 sqlalchemy-migrate==0.11.0

requirements.txt

@@ -1,34 +1,34 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-Babel!=2.4.0 # BSD
-botocore # Apache-2.0
-cryptography!=2.0 # BSD/Apache-2.0
-eventlet!=0.18.3,!=0.20.1,!=0.21.0 # MIT
-greenlet # MIT
-httplib2 # MIT
-lxml!=3.7.0 # BSD
-oslo.cache # Apache-2.0
-oslo.config!=4.3.0,!=4.4.0 # Apache-2.0
-oslo.concurrency # Apache-2.0
-oslo.context # Apache-2.0
-oslo.db # Apache-2.0
-oslo.log # Apache-2.0
-oslo.serialization!=2.19.1 # Apache-2.0
-oslo.service!=1.28.1 # Apache-2.0
-oslo.utils # Apache-2.0
-Paste # MIT
-PasteDeploy # MIT
-pbr!=2.1.0 # Apache-2.0
-keystoneauth1 # Apache-2.0
-python-cinderclient # Apache-2.0
-python-glanceclient # Apache-2.0
-python-keystoneclient!=2.1.0 # Apache-2.0
-python-neutronclient # Apache-2.0
-python-novaclient # Apache-2.0
-python-openstackclient # Apache-2.0
-Routes # MIT
-six # MIT
-SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8 # MIT
-sqlalchemy-migrate # Apache-2.0
-WebOb # MIT
+Babel>=2.5.3 # BSD
+botocore>=1.9.7 # Apache-2.0
+cryptography>=2.1.4 # BSD/Apache-2.0
+eventlet>=0.20.0 # MIT
+greenlet>=0.4.13 # MIT
+httplib2>=0.10.3 # MIT
+keystoneauth1>=3.14.0 # Apache-2.0
+lxml>=4.1.1 # BSD
+oslo.cache>=1.29.0 # Apache-2.0
+oslo.config>=5.2.0 # Apache-2.0
+oslo.concurrency>=3.26.0 # Apache-2.0
+oslo.context>=2.20.0 # Apache-2.0
+oslo.db>=4.40.0 # Apache-2.0
+oslo.log>=3.37.0 # Apache-2.0
+oslo.serialization>=2.25.0 # Apache-2.0
+oslo.service>=1.30.0 # Apache-2.0
+oslo.utils>=3.36.0 # Apache-2.0
+Paste>=2.0.3 # MIT
+PasteDeploy>=1.5.2 # MIT
+pbr>=3.1.1 # Apache-2.0
+python-cinderclient>=3.5.0 # Apache-2.0
+python-glanceclient>=2.16.0 # Apache-2.0
+python-keystoneclient>=3.15.0 # Apache-2.0
+python-neutronclient>=6.7.0 # Apache-2.0
+python-novaclient>=10.1.0 # Apache-2.0
+python-openstackclient>=3.14.0 # Apache-2.0
+Routes>=2.4.1 # MIT
+six>=1.11.0 # MIT
+SQLAlchemy>=1.2.5 # MIT
+sqlalchemy-migrate>=0.11.0 # Apache-2.0
+WebOb>=1.7.4 # MIT

test-requirements.txt

@@ -3,16 +3,17 @@
 # process, which may cause wedges in the gate later.
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 
-coverage!=4.4 # Apache-2.0
-fixtures # Apache-2.0/BSD
-mock # BSD
-nose # LGPL
-oslotest # Apache-2.0
-os-testr # Apache-2.0
+coverage>=4.5.1 # Apache-2.0
+fixtures>=3.0.0 # Apache-2.0/BSD
+mock>=2.0.0 # BSD
+nose>=1.3.7 # LGPL
+oslotest>=3.3.0 # Apache-2.0
+os-testr>=1.0.0 # Apache-2.0
 pylint==1.4.5 # GPLv2
-python-subunit # Apache-2.0/BSD
-sphinx!=1.6.6,!=1.6.7 # BSD
-testrepository # Apache-2.0/BSD
-testtools # MIT
-openstackdocstheme # Apache-2.0
-os-api-ref # Apache-2.0
+python-subunit>=1.2.0 # Apache-2.0/BSD
+sphinx>=1.7.0,<2.0.0;python_version=='2.7' # BSD
+sphinx>=1.7.0;python_version>='3.4' # BSD
+testrepository>=0.0.20 # Apache-2.0/BSD
+testtools>=2.3.0 # MIT
+openstackdocstheme>=1.20.0 # Apache-2.0
+os-api-ref>=1.5.0 # Apache-2.0

tox.ini

@@ -10,12 +10,13 @@ whitelist_externals = bash
                       find
                       rm
                       env
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          LANG=en_US.UTF-8
          LANGUAGE=en_US:en
          LC_ALL=C
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -r{toxinidir}/test-requirements.txt
 commands =
   find . -type f -name "*.pyc" -delete
   rm -f .testrepository/times.dbm
@@ -84,4 +85,7 @@ basepython = python3
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt
+commands =
+  {[testenv]commands}
+  stestr --test-path 'ec2api/tests/unit' run '{posargs}'
+  stestr slowest