Fix constraints URL enforcement for lower-constraints

Due to the upper-constraints argument being hard coded in the
install_command, even jobs like lower-constraints will end up getting
the latest upper-constraints installed.

The correct way to handle the constraints is to separate it out into
deps. This allows the l-c job to properly set what constraints to use.

Also fixes constraints URL to the preferred static path.

Change-Id: I92b6ee8ea5afdb16367a5b6d939e65e2fa48190d
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>

lower-constraints.txt

@@ -74,7 +74,7 @@ pep8==1.5.7
 pika-pool==0.1.3
 pika==0.10.0
 prettytable==0.7.2
-psycopg2==2.6.2
+psycopg2==2.7
 pycadf==2.7.0
 pyflakes==0.8.1
 Pygments==2.2.0

test-requirements.txt

@@ -7,7 +7,7 @@ hacking>=1.1.0,<1.2.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 pep8>=1.5.7
-psycopg2>=2.6.2 # LGPL/ZPL
+psycopg2>=2.7 # LGPL/ZPL
 PyMySQL>=0.7.6 # MIT License
 python-subunit>=1.0.0 # Apache-2.0/BSD
 os-api-ref>=1.4.0 # Apache-2.0

tox.ini

@@ -5,11 +5,13 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-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}
          LANGUAGE=en_US
          LC_ALL=en_US.utf-8
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+   -r{toxinidir}/requirements.txt
+   -r{toxinidir}/test-requirements.txt
 whitelist_externals = bash
                       find
                       rm