Update requirements

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

Change-Id: Ib9b2906654e153d55cf9110b4b1b90a2ee0a0932

requirements.txt

@@ -1,2 +1,3 @@
-charm-tools
+# Build requirements
+charm-tools>=2.4.4
 simplejson

src/test-requirements.txt

@@ -1,26 +1,2 @@
-# 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.
-coverage>=3.6
-mock>=1.2
-flake8>=2.2.4,<=2.4.1
-os-testr>=0.4.1
-requests==2.6.0
-aodhclient>=0.1.0
-python-barbicanclient>=4.0.1
-python-ceilometerclient>=1.5.0
-python-cinderclient>=1.4.0
-python-designateclient>=1.5
-python-glanceclient>=1.1.0
-python-heatclient>=0.8.0
-python-keystoneclient>=1.7.1
-python-neutronclient>=3.1.0
-python-novaclient>=2.30.1
-python-openstackclient>=1.7.0
-python-swiftclient>=2.6.0
-pika>=0.10.0,<1.0
-distro-info
-# END: Amulet OpenStack Charm Helper Requirements
-# NOTE: workaround for 14.04 pip/tox
-pytz
+# zaza
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza

test-requirements.txt

@@ -1,8 +1,15 @@
 # Lint and unit test requirements
 flake8
 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
+netifaces   # vault
+hvac        # vault
+psycopg2    # vault
+tenacity    # vault
+pbr             # vault
+cryptography    # vault