Update requirements

Re-enable charm-proof (was lost @ py3 conversion).

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

Change-Id: I23092d7e0ecb5d2d9eeef784317566e05c81015e

requirements.txt

@@ -1,8 +1,4 @@
-# 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

test-requirements.txt

@@ -1,3 +1,5 @@
+charm-tools>=2.4.4
+requests>=2.18.4
 mock>=1.2
 flake8>=2.2.4,<=2.4.1
 os-testr>=0.4.1

tox.ini

@@ -39,6 +39,7 @@ basepython = python3
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = flake8 {posargs} hooks unit_tests tests actions lib
+           charm-proof
 
 [testenv:venv]
 commands = {posargs}