From d9427bffe1a5c6203a32ec6e1c22323119d80ad0 Mon Sep 17 00:00:00 2001 From: Luciano Lo Giudice Date: Tue, 7 Sep 2021 16:26:31 -0300 Subject: [PATCH] Update dependencies Many required libraries defined in test-requirements.txt, requirements.txt and wheelhouse were unneeded and/or used deprecated versions. --- requirements.txt | 22 ++-------------------- src/wheelhouse.txt | 3 ++- test-requirements.txt | 21 +++++---------------- 3 files changed, 9 insertions(+), 37 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2316401..d5d4a8d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,21 +1,3 @@ -# This file is managed centrally by release-tools and should not be modified -# within individual charm repos. See the 'global' dir contents for available -# choices of *requirements.txt files for OpenStack Charms: -# https://github.com/openstack-charmers/release-tools -# -# TODO: Distill the func test requirements from the lint/unit test -# requirements. They are intertwined. Also, Zaza itself should specify -# all of its own requirements and if it doesn't, fix it there. -# -pbr>=1.8.0,<1.9.0 -simplejson>=2.2.0 -netifaces>=0.10.4 -netaddr>=0.7.12,!=0.7.16 -Jinja2>=2.6 # BSD License (3 clause) -six>=1.9.0 +simplejson +charm-tools>=2.4.4 -# dnspython 2.0.0 dropped py3.5 support -dnspython<2.0.0; python_version < '3.6' -dnspython; python_version >= '3.6' - -psutil>=1.1.1,<2.0.0 diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index ebd9154..7ea207d 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -1,2 +1,3 @@ #layer-basic uses wheelhouse to install python dependencies -psutil \ No newline at end of file +psutil +git+https://github.com/juju/charm-helpers.git#egg=charmhelpers diff --git a/test-requirements.txt b/test-requirements.txt index 7d9c258..f5cb22b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,18 +1,7 @@ -# This file is managed centrally by release-tools and should not be modified -# within individual charm repos. See the 'global' dir contents for available -# choices of *requirements.txt files for OpenStack Charms: -# https://github.com/openstack-charmers/release-tools -# -# TODO: Distill the func test requirements from the lint/unit test -# requirements. They are intertwined. Also, Zaza itself should specify -# all of its own requirements and if it doesn't, fix it there. -# -charm-tools>=2.4.4 -requests>=2.18.4 mock>=1.2 -flake8>=2.2.4,<=2.4.1 -stestr>=2.2.0 +flake8 coverage>=4.5.2 -pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking) -git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0' -git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack +os-testr>=0.4.1 +charms.reactive +git+https://github.com/openstack/charms.openstack.git#egg=charms-openstack +git+https://github.com/juju/charm-helpers.git#egg=charmhelpers