diff --git a/lower-constraints.txt b/lower-constraints.txt index 678661c10..bc2f21bc3 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -116,7 +116,7 @@ sqlalchemy-migrate==0.11.0 SQLAlchemy==1.0.10 sqlparse==0.2.4 statsd==3.2.2 -stestr==2.0.0 +stestr==1.0.0 stevedore==1.20.0 Tempita==0.5.2 testrepository==0.0.20 diff --git a/requirements.txt b/requirements.txt index c25b0d647..ef6c0557e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ alembic>=0.8.10 # MIT Babel!=2.4.0,>=2.3.4 # BSD construct<2.9,>=2.8.10 # MIT eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT -Flask!=0.11,<1.0,>=0.10 # BSD +Flask!=0.11,>=0.10 # BSD futurist>=1.2.0 # Apache-2.0 ironic-lib>=2.5.0 # Apache-2.0 jsonpath-rw<2.0,>=1.2.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index de1744fd8..aced9f89b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,7 +8,7 @@ hacking>=1.0.0,<1.2.0 # Apache-2.0 mock>=2.0.0 # BSD sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD openstackdocstheme>=1.18.1 # Apache-2.0 -os-testr>=1.0.0 # Apache-2.0 +stestr>=1.0.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD testresources>=2.0.0 # Apache-2.0/BSD diff --git a/tox.ini b/tox.ini index a7835efcc..3b93a678e 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ install_command = pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://git.opens deps = -r{toxinidir}/test-requirements.txt commands = - ostestr {posargs} + stestr run {posargs} setenv = VIRTUAL_ENV={envdir} PYTHONDONTWRITEBYTECODE=1 @@ -27,7 +27,7 @@ setenv = PYTHON=coverage run --branch --omit='*test*' --source ironic_inspector --parallel-mode commands = coverage erase - ostestr {posargs} + stestr run {posargs} coverage combine coverage report -m --omit='*test*' --fail-under 90 coverage html -d ./cover --omit='*test*'