From 2eefce0f514bb69489496d0ec2867f0ade472031 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Thu, 4 Oct 2018 10:47:48 -0500
Subject: [PATCH] Update requirements

Fixup existing lint.

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

Change-Id: Iab32fd02667ae96dc5cc929b52e12c27d01d10c1
---
 requirements.txt                       | 20 +++++++-------------
 src/reactive/keystone_ldap_handlers.py |  2 +-
 src/test-requirements.txt              | 22 +++++++++++-----------
 test-requirements.txt                  | 10 ++++++++--
 tox.ini                                |  2 +-
 5 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4215b08..20f335d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,7 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-pbr>=1.8.0,<1.9.0
-PyYAML>=3.1.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
-dnspython>=1.12.0
-psutil>=1.1.1,<2.0.0
-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
diff --git a/src/reactive/keystone_ldap_handlers.py b/src/reactive/keystone_ldap_handlers.py
index 1375cd2..443238f 100644
--- a/src/reactive/keystone_ldap_handlers.py
+++ b/src/reactive/keystone_ldap_handlers.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # import to trigger openstack charm metaclass init
-import charm.openstack.keystone_ldap # noqa
+import charm.openstack.keystone_ldap  # noqa
 
 import charms_openstack.charm as charm
 import charms.reactive as reactive
diff --git a/src/test-requirements.txt b/src/test-requirements.txt
index 16d0adb..f013863 100644
--- a/src/test-requirements.txt
+++ b/src/test-requirements.txt
@@ -1,19 +1,18 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
+# 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.
+charm-tools>=2.4.4
 coverage>=3.6
 mock>=1.2
 flake8>=2.2.4,<=2.4.1
 os-testr>=0.4.1
-charm-tools>=2.0.0
-requests==2.6.0
-# amulet deployment helpers
-git+https://github.com/juju/charm-helpers#egg=charmhelpers
+requests>=2.18.4
 # BEGIN: Amulet OpenStack Charm Helper Requirements
 # Liberty client lower constraints
-amulet>=1.14.3,<2.0
-bundletester>=0.6.1,<1.0
+amulet>=1.14.3,<2.0;python_version=='2.7'
+bundletester>=0.6.1,<1.0;python_version=='2.7'
 aodhclient>=0.1.0
+gnocchiclient>=3.1.0,<3.2.0
 python-barbicanclient>=4.0.1
 python-ceilometerclient>=1.5.0
 python-cinderclient>=1.4.0
@@ -28,6 +27,7 @@ python-openstackclient>=1.7.0
 python-swiftclient>=2.6.0
 pika>=0.10.0,<1.0
 distro-info
+git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
 # END: Amulet OpenStack Charm Helper Requirements
-# NOTE: workaround for 14.04 pip/tox
-pytz
+pytz    # workaround for 14.04 pip/tox
+pyudev  # for ceph-* charm unit tests (not mocked?)
diff --git a/test-requirements.txt b/test-requirements.txt
index 368dbf2..ca62003 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -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
-flake8
+flake8>=2.2.4,<=2.4.1
 os-testr>=0.4.1
+requests>=2.18.4
 charms.reactive
 mock>=1.2
+nose>=1.3.7
 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
diff --git a/tox.ini b/tox.ini
index e21d581..b1acd81 100644
--- a/tox.ini
+++ b/tox.ini
@@ -48,7 +48,7 @@ deps = -r{toxinidir}/test-requirements.txt
 commands = ostestr {posargs}
 
 [testenv:pep8]
-basepython = python3.5
+basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
 commands = flake8 {posargs} src unit_tests