Merge lp:~markwash/network-service/test-cleanup into lp:~rajarammallya/network-service/melange_framework

[Mark Washenberger]

Remove seemingly unneeded dependencies from tools/pip-requires and got pep8 working a bit better after running tests.

[Rajaram Mallya (rajarammallya)]

Thanks. We had just copied over all the pep8 stuff from glance:-)

review: Approve

[Mark Washenberger (markwash)]

Btw, I am working on an email to you guys if any of my merge props seem confusing at this time.

=== modified file 'run_tests.py'
--- run_tests.py	2011-05-09 12:53:47 +0000
+++ run_tests.py	2011-05-24 03:33:33 +0000
@@ -269,10 +269,11 @@
 
 
 if __name__ == '__main__':
+    working_dir = os.path.abspath(os.path.join("tests", "unit"))
     c = config.Config(stream=sys.stdout,
                       env=os.environ,
                       verbosity=3,
-                      workingDir=os.path.abspath(os.path.join("tests","unit")))
+                      workingDir=working_dir)
 
     runner = MelangeTestRunner(stream=c.stream,
                             verbosity=c.verbosity,

=== modified file 'run_tests.sh'
--- run_tests.sh	2011-05-09 12:43:45 +0000
+++ run_tests.sh	2011-05-24 03:33:33 +0000
@@ -79,5 +79,5 @@
 #
 PEP8_EXCLUDE=vcsversion.py
 PEP8_OPTIONS="--exclude=$PEP8_EXCLUDE --repeat --show-pep8 --show-source"
-PEP8_INCLUDE="bin/* melange tests tools setup.py run_tests.py"
+PEP8_INCLUDE="bin/* melange tests tools run_tests.py"
 run_tests && pep8 $PEP8_OPTIONS $PEP8_INCLUDE || exit 1

=== modified file 'tools/pip-requires'
--- tools/pip-requires	2011-05-12 09:25:25 +0000
+++ tools/pip-requires	2011-05-24 03:33:33 +0000
@@ -1,20 +1,10 @@
-greenlet>=0.3.1
 SQLAlchemy>=0.6.3
 pep8==0.5.0
-pylint==0.19
-anyjson
 eventlet>=0.9.12
 PasteDeploy
 routes
 webob
 webtest
-wsgiref
 nose
-sphinx
-argparse
-mox==0.5.0
-swift
--f http://pymox.googlecode.com/files/mox-0.5.0.tar.gz
 sqlalchemy-migrate>=0.6
-bzr
 netaddr