Browse Source

Merge "Pin tox to stein" into stable/stein

changes/71/653171/1
Zuul 2 years ago
committed by Gerrit Code Review
parent
commit
d459136bb1
  1. 4
      requirements.txt
  2. 8
      tox.ini

4
requirements.txt

@ -14,10 +14,6 @@ requests>=2.14.2 # Apache-2.0
six>=1.10.0 # MIT
SQLAlchemy>=1.2.0 # MIT
# These repos are installed from git in OpenStack CI if the job
# configures them as required-projects
neutron # Apache-2.0
# The comment below indicates this project repo is current with neutron-lib
# and should receive neutron-lib consumption patches as they are released
# in neutron-lib. It also implies the project will stay current with TC

8
tox.ini

@ -1,5 +1,5 @@
[tox]
envlist = py27-dev,py35-dev,pep8-dev
envlist = py27-dev,py35-dev,pep8-dev,lower-constraints
minversion = 2.0
skipsdist = True
@ -8,9 +8,10 @@ usedevelop = True
setenv = VIRTUAL_ENV={envdir}
PYTHONWARNINGS=default::DeprecationWarning
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable%2Fstein}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
neutron>=14.0.0,<15.0.0
whitelist_externals =
find
commands =
@ -21,7 +22,7 @@ commands =
# https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs
# note that order is important to ensure dependencies don't override
commands =
pip install -q -e "git+https://git.openstack.org/openstack/neutron#egg=neutron"
pip install -q -e "git+https://git.openstack.org/openstack/neutron.git@stable/stein#egg=neutron"
[testenv:py27-dev]
commands =
@ -86,3 +87,4 @@ deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
neutron>=14.0.0,<15.0.0
Loading…
Cancel
Save