Updated setup.py and requirements

Updated setup.py to have correct test-requirements.
Updated requirements and test-requirements to contain
the proper packages.

Change-Id: Ib3ec3abaf2cc0eb27e0ff3ad4574207eee088611

docs/changelog.rst

@@ -33,3 +33,7 @@ Changes in Version 1.0.3
 * Fixed various typos in the documentation.
 * Fix duplicate debug log message issue that can occur when multiple client
   objects are created.
+* Updated setup.py package requirements to be consistent with the ones
+  defined in requirements.txt.
+* Updated setup.py package test-requirements to be consistent with the ones
+  defined in test-requirements.txt.

requirements.txt

@@ -1,3 +1 @@
-eventlet
-paramiko>=1.13.0
-Werkzeug
+httplib2>=0.6.0

setup.py

@@ -17,7 +17,7 @@ setup(
   keywords=["hp", "lefthand", "storevirtual", "rest"],
   requires=['httplib2(>=0.6.0)'],
   install_requires=['httplib2 >= 0.6.0'],
-  tests_require=["nose", "werkzeug", "nose-testconfig"],
+  tests_require=["nose", "nose-testconfig", "flask", "Werkzeug", "flake8"],
   license="Apache License, Version 2.0",
   packages=find_packages(),
   provides=['hplefthandclient'],
@@ -32,6 +32,5 @@ setup(
      'Programming Language :: Python :: 2.7',
      'Programming Language :: Python :: 3.0',
      'Topic :: Internet :: WWW/HTTP',
-     
      ]
   )

test-requirements.txt

@@ -1,4 +1,6 @@
 nose
 nose-testconfig
-flake8
 flask
+Werkzeug
+
+flake8 # Used by tox