From 44544e587a36a44c17ef609b5c2eb2e61d67d6d9 Mon Sep 17 00:00:00 2001 From: Dror Kagan Date: Thu, 28 Feb 2013 11:02:50 -0800 Subject: [PATCH] remove the namespace_packages from setup.py In reddwarf's setup.py, the method setuptool.setup() currently accepts a parameter for namespace_packages, and it shouldn't. Change-Id: Ica1fbebd5cbd5943c3a1b322d14a280737bc0542 fixes: bug #1136189 --- .coveragerc | 4 +--- setup.py | 1 - tox.ini | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.coveragerc b/.coveragerc index 45e8572b9c..42c30db1b7 100644 --- a/.coveragerc +++ b/.coveragerc @@ -2,9 +2,7 @@ [run] branch = True -source=.tox/cover/lib/python2.7/site-packages/reddwarf -# replace with previous line once the python path issue is resolved and the tox.ini is fixed accordingly -# source=reddwarf +source=reddwarf omit=*reddwarf/tests*,*reddwarf/openstack/common* [report] diff --git a/setup.py b/setup.py index 473034e4dc..5b42174482 100644 --- a/setup.py +++ b/setup.py @@ -54,5 +54,4 @@ setuptools.setup(name='reddwarf', 'bin/reddwarf-manage', ], py_modules=[], - namespace_packages=['reddwarf'], ) diff --git a/tox.ini b/tox.ini index 9fb071977a..c81ec16371 100644 --- a/tox.ini +++ b/tox.ini @@ -22,9 +22,7 @@ commands = pep8 --repeat --show-source --ignore=E125 --exclude=.venv,.tox,dist,d basepython = python2.7 commands = coverage erase - coverage run -m subunit.run discover ./reddwarf/tests/unittests -# replace with above line once the python path issue is resolved -# python setup.py testr --coverage + python setup.py testr --coverage coverage run -a run_tests.py coverage html coverage report