Merge "Stop using openstack upper constraints"

tox.ini

@@ -8,7 +8,6 @@ ignore_basepython_conflict = True
 usedevelop = True
 basepython = python3
 deps=
-      -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
       -r{toxinidir}/requirements.txt
       -r{toxinidir}/test-requirements.txt
 commands= stestr run --slowest {posargs}
@@ -73,9 +72,3 @@ deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
-
-# Run without upper-constraints on python3.5, as since Victoria that
-# now is python3.6 only
-[testenv:py35]
-basepython = python3.5
-deps = {[testenv:lower-constraints]deps}