Update requirements
Fixup existing lint. Also remove tests/charm-helpers if present, in favor of the pip-installed charm-helpers. Change-Id: Iab32fd02667ae96dc5cc929b52e12c27d01d10c1
This commit is contained in:
parent
807193aafc
commit
2eefce0f51
|
@ -1,13 +1,7 @@
|
||||||
# The order of packages is significant, because pip processes them in the order
|
# This file is managed centrally. If you find the need to modify this as a
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
# one-off, please don't. Intead, consult #openstack-charms and ask about
|
||||||
# process, which may cause wedges in the gate later.
|
# requirements management in charms via bot-control. Thank you.
|
||||||
pbr>=1.8.0,<1.9.0
|
#
|
||||||
PyYAML>=3.1.0
|
# Build requirements
|
||||||
simplejson>=2.2.0
|
charm-tools>=2.4.4
|
||||||
netifaces>=0.10.4
|
simplejson
|
||||||
netaddr>=0.7.12,!=0.7.16
|
|
||||||
Jinja2>=2.6 # BSD License (3 clause)
|
|
||||||
six>=1.9.0
|
|
||||||
dnspython>=1.12.0
|
|
||||||
psutil>=1.1.1,<2.0.0
|
|
||||||
charm-tools
|
|
||||||
|
|
|
@ -1,19 +1,18 @@
|
||||||
# The order of packages is significant, because pip processes them in the order
|
# This file is managed centrally. If you find the need to modify this as a
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
# one-off, please don't. Intead, consult #openstack-charms and ask about
|
||||||
# process, which may cause wedges in the gate later.
|
# requirements management in charms via bot-control. Thank you.
|
||||||
|
charm-tools>=2.4.4
|
||||||
coverage>=3.6
|
coverage>=3.6
|
||||||
mock>=1.2
|
mock>=1.2
|
||||||
flake8>=2.2.4,<=2.4.1
|
flake8>=2.2.4,<=2.4.1
|
||||||
os-testr>=0.4.1
|
os-testr>=0.4.1
|
||||||
charm-tools>=2.0.0
|
requests>=2.18.4
|
||||||
requests==2.6.0
|
|
||||||
# amulet deployment helpers
|
|
||||||
git+https://github.com/juju/charm-helpers#egg=charmhelpers
|
|
||||||
# BEGIN: Amulet OpenStack Charm Helper Requirements
|
# BEGIN: Amulet OpenStack Charm Helper Requirements
|
||||||
# Liberty client lower constraints
|
# Liberty client lower constraints
|
||||||
amulet>=1.14.3,<2.0
|
amulet>=1.14.3,<2.0;python_version=='2.7'
|
||||||
bundletester>=0.6.1,<1.0
|
bundletester>=0.6.1,<1.0;python_version=='2.7'
|
||||||
aodhclient>=0.1.0
|
aodhclient>=0.1.0
|
||||||
|
gnocchiclient>=3.1.0,<3.2.0
|
||||||
python-barbicanclient>=4.0.1
|
python-barbicanclient>=4.0.1
|
||||||
python-ceilometerclient>=1.5.0
|
python-ceilometerclient>=1.5.0
|
||||||
python-cinderclient>=1.4.0
|
python-cinderclient>=1.4.0
|
||||||
|
@ -28,6 +27,7 @@ python-openstackclient>=1.7.0
|
||||||
python-swiftclient>=2.6.0
|
python-swiftclient>=2.6.0
|
||||||
pika>=0.10.0,<1.0
|
pika>=0.10.0,<1.0
|
||||||
distro-info
|
distro-info
|
||||||
|
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
|
||||||
# END: Amulet OpenStack Charm Helper Requirements
|
# END: Amulet OpenStack Charm Helper Requirements
|
||||||
# NOTE: workaround for 14.04 pip/tox
|
pytz # workaround for 14.04 pip/tox
|
||||||
pytz
|
pyudev # for ceph-* charm unit tests (not mocked?)
|
||||||
|
|
|
@ -1,7 +1,13 @@
|
||||||
|
# This file is managed centrally. If you find the need to modify this as a
|
||||||
|
# one-off, please don't. Intead, consult #openstack-charms and ask about
|
||||||
|
# requirements management in charms via bot-control. Thank you.
|
||||||
|
#
|
||||||
# Lint and unit test requirements
|
# Lint and unit test requirements
|
||||||
flake8
|
flake8>=2.2.4,<=2.4.1
|
||||||
os-testr>=0.4.1
|
os-testr>=0.4.1
|
||||||
|
requests>=2.18.4
|
||||||
charms.reactive
|
charms.reactive
|
||||||
mock>=1.2
|
mock>=1.2
|
||||||
|
nose>=1.3.7
|
||||||
coverage>=3.6
|
coverage>=3.6
|
||||||
git+https://github.com/openstack/charms.openstack.git#egg=charms-openstack
|
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -48,7 +48,7 @@ deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = ostestr {posargs}
|
commands = ostestr {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3.5
|
basepython = python3
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = flake8 {posargs} src unit_tests
|
commands = flake8 {posargs} src unit_tests
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue