Merge "Use local py2 upper-constraints"

py2-constraints.txt

@@ -0,0 +1,72 @@
+voluptuous===0.11.7
+chardet===3.0.4
+enum-compat===0.0.3
+os-api-ref===1.6.2
+lxml===4.5.0
+certifi===2020.4.5.1
+alabaster===0.7.12
+pbr===5.4.5
+oslo.i18n===3.25.1
+fixtures===3.0.0
+nose===1.3.7
+nosehtmloutput===0.0.7
+sphinxcontrib-websupport===1.1.2
+ipaddress===1.0.23
+nosexcover===1.0.11
+debtcollector===1.22.0
+MarkupSafe===1.1.1
+netaddr===0.7.19
+prettytable===0.7.2
+traceback2===1.4.0
+eventlet===0.25.2
+extras===1.0.0
+reno===2.11.3
+imagesize===1.2.0
+urllib3===1.25.8
+mock===3.0.5
+PyYAML===5.3.1
+cryptography===2.9
+requests-mock===1.7.0
+unittest2===1.1.0
+Pygments===2.5.2
+requests===2.23.0
+snowballstemmer===2.0.0
+Jinja2===2.11.1
+cliff===2.18.0
+castellan===1.4.0
+coverage===5.0.4
+oslo.log===3.45.2
+docutils===0.15.2
+boto3===1.12.39
+stestr===2.6.0
+oslo.serialization===2.29.2
+testtools===2.4.0
+keystonemiddleware===9.0.0
+iso8601===0.1.12
+linecache2===1.0.0
+idna===2.9
+msgpack===0.6.2
+Sphinx===1.8.5
+oslo.config===7.0.0
+openstackdocstheme===1.31.2
+stevedore===1.32.0
+botocore===1.15.39
+cmd2===0.8.9
+os-testr===1.1.0
+xattr===0.9.7
+six===1.14.0
+dulwich===0.19.15
+GitPython===2.1.11
+wrapt===1.12.1
+rfc3986===1.4.0
+future===0.18.2
+boto===2.49.0
+monotonic===1.5
+netifaces===0.10.9
+keystoneauth1===4.0.0
+cffi===1.14.0
+Babel===2.8.0
+greenlet===0.4.15
+oslo.utils===3.42.1
+gitdb===0.6.4
+gitdb2===2.0.6

tox.ini

@@ -21,6 +21,12 @@ whitelist_externals = find
                       rm
 passenv = SWIFT_* *_proxy
 
+[testenv:py27]
+deps =
+  -c{toxinidir}/py2-constraints.txt
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/test-requirements.txt
+
 [testenv:cover]
 setenv = VIRTUAL_ENV={envdir}
          NOSE_WITH_COVERAGE=1
@@ -30,6 +36,7 @@ setenv = VIRTUAL_ENV={envdir}
 
 [testenv:pep8]
 basepython = python2.7
+deps = {[testenv:py27]deps}
 commands =
   flake8 {posargs:swift test doc setup.py}
   flake8 --filename=swift* bin
@@ -71,28 +78,33 @@ setenv = SWIFT_TEST_IN_PROCESS=1
 
 [testenv:func]
 basepython = python2.7
+deps = {[testenv:py27]deps}
 commands = ./.functests {posargs}
 
 [testenv:func-encryption]
 basepython = python2.7
+deps = {[testenv:py27]deps}
 commands = ./.functests {posargs}
 setenv = SWIFT_TEST_IN_PROCESS=1
          SWIFT_TEST_IN_PROCESS_CONF_LOADER=encryption
 
 [testenv:func-domain-remap-staticweb]
 basepython = python2.7
+deps = {[testenv:py27]deps}
 commands = ./.functests {posargs}
 setenv = SWIFT_TEST_IN_PROCESS=1
          SWIFT_TEST_IN_PROCESS_CONF_LOADER=domain_remap_staticweb
 
 [testenv:func-ec]
 basepython = python2.7
+deps = {[testenv:py27]deps}
 commands = ./.functests {posargs}
 setenv = SWIFT_TEST_IN_PROCESS=1
          SWIFT_TEST_IN_PROCESS_CONF_LOADER=ec
 
 [testenv:func-s3api]
 basepython = python2.7
+deps = {[testenv:py27]deps}
 commands = ./.functests {posargs}
 setenv = SWIFT_TEST_IN_PROCESS=1
          SWIFT_TEST_IN_PROCESS_CONF_LOADER=s3api