Merge "Update Agent Requirements.txt"

requirements.txt

@@ -1,23 +1,23 @@
-requests>=2.7.0,<2.8
+requests
 
-oslo.config<2.5.0
-oslo.concurrency<2.7.0
-oslo.i18n<=2.6.0
-oslo.log<1.12.0
-oslo.middleware<2.9.0
-oslo.serialization<1.10.0
-oslo.utils<2.6.0
+oslo.config
+oslo.concurrency
+oslo.i18n
+oslo.log
+oslo.middleware
+oslo.serialization
+oslo.utils
 
-PyYAML>=3.11,<3.12
+PyYAML
 gearman>=2.0.2,<2.1
-httplib2>=0.9.1,<1.0
-netaddr>=0.7.4
+httplib2
+netaddr
 ntplib>=0.3.2,<0.4
-psutil>=2.2.1,<3.1.0
-pymongo>=3.0.3,<3.1
-python-memcached>=1.54,<2.0
+#psutil>=2.2.1,<3.1.0
+pymongo
+python-memcached
 python-monascaclient>=1.0.22,<1.1
-redis>=2.10.3,<2.11
-simplejson>=3.7.3,<3.9
+redis
+simplejson
 supervisor>=3.1.3,<3.2
-tornado>=4.2,<4.3
+tornado

tox.ini

@@ -11,6 +11,7 @@ setenv =
     DISCOVER_DIRECTORY=tests
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+       psutil==3.0.1
 whitelist_externals = bash
                       find
 commands =