Index: van/pydeb/tests/extras.txt =================================================================== --- van/pydeb/tests/extras.txt (revision 115616) +++ van/pydeb/tests/extras.txt (working copy) @@ -15,11 +15,11 @@ The basic case: package depends directly on all extra dependencies ------------------------------------------------------------------ -zope.component has a 'zcml' extra, we should check that by the the dependencies -of this extra are shown in the depends and provides line: +zope.component has a 'zcml' extra, we should check that all the dependencies +of this extra are shown in the depends line: >>> runit('van-pydeb depends --egg-info %s' % zope_component) - python-pkg-resources, python-z3c.recipe.sphinxdoc, python-zodb, python-zope, python-zope.configuration, python-zope.event, python-zope.hookable, python-zope.i18nmessageid, python-zope.interface, python-zope.location, python-zope.proxy, python-zope.security, python-zope.testing + python-pkg-resources, python-z3c.recipe.sphinxdoc, python-zodb, python-zope.configuration, python-zope.event, python-zope.hookable, python-zope.i18nmessageid, python-zope.interface, python-zope.location, python-zope.proxy, python-zope.security, python-zope.testing We can have create a provides line for all extras: @@ -29,11 +29,11 @@ Moving an extra's dependencies into "Suggests:" ----------------------------------------------- -We notice that the "docs" dependency us not a hard one and decide to exclude it +We notice that the "docs" dependency is not a hard one and decide to exclude it (it goes into Suggests:): >>> runit('van-pydeb depends --egg-info %s --exclude-extra docs' % zope_component) - python-pkg-resources, python-zodb, python-zope, python-zope.configuration, python-zope.event, python-zope.hookable, python-zope.i18nmessageid, python-zope.interface, python-zope.location, python-zope.proxy, python-zope.security, python-zope.testing + python-pkg-resources, python-zodb, python-zope.configuration, python-zope.event, python-zope.hookable, python-zope.i18nmessageid, python-zope.interface, python-zope.location, python-zope.proxy, python-zope.security, python-zope.testing We could also exclude it from the "provides" list: @@ -46,7 +46,7 @@ Now we decide to move the 'zcml' extra to it's own metapackage, thus we need to separate out it's dependencies: >>> runit('van-pydeb depends --egg-info %s --exclude-extra docs --exclude-extra zcml' % zope_component) - python-pkg-resources, python-zodb, python-zope, python-zope.event, python-zope.hookable, python-zope.interface, python-zope.location, python-zope.testing + python-pkg-resources, python-zodb, python-zope.event, python-zope.hookable, python-zope.interface, python-zope.location, python-zope.testing >>> runit('van-pydeb depends --egg-info %s --extra zcml' % zope_component) python-zope.configuration, python-zope.i18nmessageid, python-zope.proxy, python-zope.security @@ -79,4 +79,4 @@ The --override-bdep command line option can be used to override mappings of binary dependencies. >>> runit('van-pydeb depends --egg-info %s --exclude-extra docs --override-bdep "setuptools python-setuptools" --override-bdep "ZODB3 python-zodb3"' % zope_component) - python-setuptools, python-zodb3, python-zope, python-zope.configuration, python-zope.event, python-zope.hookable, python-zope.i18nmessageid, python-zope.interface, python-zope.location, python-zope.proxy, python-zope.security, python-zope.testing + python-setuptools, python-zodb3, python-zope.configuration, python-zope.event, python-zope.hookable, python-zope.i18nmessageid, python-zope.interface, python-zope.location, python-zope.proxy, python-zope.security, python-zope.testing Index: van/pydeb/__init__.py =================================================================== --- van/pydeb/__init__.py (revision 115616) +++ van/pydeb/__init__.py (working copy) @@ -212,7 +212,7 @@ >>> here = os.path.dirname(__file__) >>> ex1 = os.path.join(here, 'tests', 'dummy.foo.egg-info') >>> exitcode = main(['bin', 'depends', '--egg-info', ex1]) - python-bar (<< 0.3~c~pre1), python-dummy, python-foo (>> 0.1), python-foobar + python-bar (<< 0.3~c~pre1), python-foo (>> 0.1), python-foobar >>> exitcode 0 """ @@ -285,16 +285,6 @@ pydeps.add('%s (%s %s)' % (pkg, op, dpkg_version)) else: pydeps.add(pkg) - # Let's depend on the namespace pacakges as well. - # this is a pretty ugly way to get __init__.py into the namespace packages - # which seems to be necessary. - # though testing it out on ubuntu gutsy said it wasnt, it was on Debian etch - # - # Perhaps we could remove this a bit later - namespace_pkgs = dist._get_metadata('namespace_packages.txt') - for pkg in namespace_pkgs: - bin_pkg = py_to_bin(pkg) - pydeps.add(bin_pkg) if extras is not None: # only give the dependencies of the metapackage pydeps = pydeps - _get_debian_dependencies(file, exclude_extras=dist.extras) Index: CHANGES.txt =================================================================== --- CHANGES.txt (revision 115616) +++ CHANGES.txt (working copy) @@ -4,7 +4,7 @@ 1.3.3 (unreleased) ------------------ -* None yet. +* No longer add namespace packages to depends (LP: #619294). 1.3.2 (2010-06-22) ------------------