openstack
/
charm-barbican
Code Issues Proposed changes

Update requirements 

Also remove tests/charm-helpers if present, in favor
of the pip-installed charm-helpers.

Change-Id: I0f6d9122a10e1b73073830e48c920e4001f0d356
This commit is contained in:
Ryan Beisner 2018-10-04 10:47:08 -05:00
parent 1d3d99b6af
commit f12029cccd
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
requirements.txt
View File

@ -1,2 +1,7 @@
charm-tools # 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.
#
# Build requirements
charm-tools>=2.4.4
simplejson simplejson

23
src/test-requirements.txt
View File

@ -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
@ -21,12 +20,14 @@ python-designateclient>=1.5
python-glanceclient>=1.1.0 python-glanceclient>=1.1.0
python-heatclient>=0.8.0 python-heatclient>=0.8.0
python-keystoneclient>=1.7.1 python-keystoneclient>=1.7.1
python-manilaclient>=1.8.1
python-neutronclient>=3.1.0 python-neutronclient>=3.1.0
python-novaclient>=2.30.1 python-novaclient>=2.30.1
python-openstackclient>=1.7.0 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?)

10
test-requirements.txt
View File

@ -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