Update requirements

* bump pbr>=2.0
* bump hacking to unblock pep8 gate
* removed workaround in tox.ini

Change-Id: I508a68b0351900ca1132441b88679d183e00af90
This commit is contained in:
Anton Studenov 2017-03-01 22:18:07 +03:00 committed by Ilya Shakhat
parent f42eba7522
commit 34edf10456
5 changed files with 27 additions and 27 deletions

View File

@ -2,15 +2,15 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
pbr>=1.6 pbr>=2.0.0 # Apache-2.0
ansible>=2.0 ansible>=2.0
appdirs>=1.3.0 # MIT License appdirs>=1.3.0 # MIT License
jsonschema>=2.0.0,!=2.5.0,<3.0.0 # MIT jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
iso8601>=0.1.9 iso8601>=0.1.11 # MIT
oslo.i18n>=1.5.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0
oslo.utils!=2.6.0,>=2.4.0 # Apache-2.0 oslo.utils>=3.20.0 # Apache-2.0
pyghmi>=1.0.3 # Apache-2.0 pyghmi>=1.0.9 # Apache-2.0
PyYAML>=3.1.0 # MIT PyYAML>=3.10.0 # MIT
six>=1.9.0 six>=1.9.0 # MIT

View File

@ -26,7 +26,7 @@ console_scripts =
[extras] [extras]
libvirt = libvirt =
libvirt-python>=1.2.5 # LGPLv2+ libvirt-python>=1.2.5 # LGPLv2+
[build_sphinx] [build_sphinx]
source-dir = doc/source source-dir = doc/source

View File

@ -25,5 +25,5 @@ except ImportError:
pass pass
setuptools.setup( setuptools.setup(
setup_requires=['pbr'], setup_requires=['pbr>=2.0.0'],
pbr=True) pbr=True)

View File

@ -2,23 +2,23 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
hacking<0.11,>=0.10.0 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
pytest>=2.7,<=3.0.2 # MIT pytest<=3.0.2,>=2.7 # MIT
pytest-cov>=2.2.1,<=2.3.1 # MIT pytest-cov<=2.3.1,>=2.2.1 # MIT
pytest-html>=1.10.0,<=1.10.0 # Mozilla Public License 2.0 (MPL 2.0) pytest-html<=1.10.0,>=1.10.0 # Mozilla Public License 2.0 (MPL 2.0)
pytest-logging==2015.11.4 # Apache-2.0 pytest-logging==2015.11.4 # Apache-2.0
coverage>=3.6 coverage>=4.0 # Apache-2.0
ddt>=1.0.1 ddt>=1.0.1 # MIT
mock>=1.2 mock>=2.0 # BSD
python-subunit>=0.0.18 python-subunit>=0.0.18 # Apache-2.0/BSD
sphinx!=1.3b1,<1.4,>=1.2.1 # BSD sphinx>=1.5.1 # BSD
sphinxcontrib-programoutput sphinxcontrib-programoutput # BSD
oslosphinx>=4.7.0 # Apache-2.0 oslosphinx>=4.7.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0
testrepository>=0.0.18 testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 testscenarios>=0.4 # Apache-2.0/BSD
testtools>=1.4.0 testtools>=1.4.0 # MIT
# releasenotes # releasenotes
reno>=1.6.2 # Apache2 reno>=1.8.0 # Apache-2.0

View File

@ -1,5 +1,5 @@
[tox] [tox]
minversion = 2.0 minversion = 2.6
envlist = pep8-constraints,py27-constraints,py35-constraints,cover envlist = pep8-constraints,py27-constraints,py35-constraints,cover
skipsdist = True skipsdist = True
@ -14,10 +14,10 @@ whitelist_externals =
find find
rm rm
# TODO(astudenov): replace libvirt-python with extras option from tox 2.4
deps = deps =
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
libvirt-python>=1.2.5 extras =
libvirt
commands = commands =
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
py.test -vvvv --html={envlogdir}/pytest_results.html --self-contained-html --durations=10 "os_faults/tests/unit" {posargs} py.test -vvvv --html={envlogdir}/pytest_results.html --self-contained-html --durations=10 "os_faults/tests/unit" {posargs}