aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/dist.py
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2005-07-10 15:43:08 +0000
committerPJ Eby <distutils-sig@python.org>2005-07-10 15:43:08 +0000
commit39fc2a15c4a236ae7b378ebb98aee545776d2ec1 (patch)
treec8806db2eb70d3620795df65425a0ca53d1f648d /setuptools/dist.py
parent7922a815d08c4a5ac975e785aad90c3f4c6eaabb (diff)
downloadexternal_python_setuptools-39fc2a15c4a236ae7b378ebb98aee545776d2ec1.tar.gz
external_python_setuptools-39fc2a15c4a236ae7b378ebb98aee545776d2ec1.tar.bz2
external_python_setuptools-39fc2a15c4a236ae7b378ebb98aee545776d2ec1.zip
Implement ``namespace_packages`` keyword to ``setup()``. Added keyword
summary to setuptools doc. Begin work on ``zip_safe`` flag. --HG-- branch : setuptools extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041113
Diffstat (limited to 'setuptools/dist.py')
-rw-r--r--setuptools/dist.py93
1 files changed, 67 insertions, 26 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 4fef454f..73627752 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -90,6 +90,8 @@ class Distribution(_Distribution):
self.install_requires = []
self.extras_require = {}
self.dist_files = []
+ self.zip_safe = None
+ self.namespace_packages = None
_Distribution.__init__(self,attrs)
if not have_package_data:
from setuptools.command.build_py import build_py
@@ -100,19 +102,17 @@ class Distribution(_Distribution):
self.cmdclass.setdefault('install_lib',install_lib)
self.cmdclass.setdefault('sdist',sdist)
+ def parse_command_line(self):
+ """Process features after parsing command line options"""
+ result = _Distribution.parse_command_line(self)
+ if self.features:
+ self._finalize_features()
+ return result
-
-
-
-
-
-
-
-
-
-
-
+ def _feature_attrname(self,name):
+ """Convert feature name to corresponding option attribute name"""
+ return 'with_'+name.replace('-','_')
@@ -123,10 +123,8 @@ class Distribution(_Distribution):
def finalize_options(self):
_Distribution.finalize_options(self)
-
if self.features:
self._set_global_opts_from_features()
-
if self.extra_path:
raise DistutilsSetupError(
"The 'extra_path' parameter is not needed when using "
@@ -148,19 +146,21 @@ class Distribution(_Distribution):
"strings or lists of strings containing valid project/version "
"requirement specifiers."
)
-
- def parse_command_line(self):
- """Process features after parsing command line options"""
- result = _Distribution.parse_command_line(self)
- if self.features:
- self._finalize_features()
- return result
-
-
- def _feature_attrname(self,name):
- """Convert feature name to corresponding option attribute name"""
- return 'with_'+name.replace('-','_')
-
+ if self.namespace_packages is not None:
+ try:
+ assert ''.join(self.namespace_packages)!=self.namespace_packages
+ except (TypeError,ValueError,AttributeError,AssertionError):
+ raise DistutilsSetupError(
+ "'namespace_packages' must be a sequence of strings"
+ )
+ for nsp in self.namespace_packages:
+ for name in iter_distribution_names(self):
+ if name.startswith(nsp+'.'): break
+ else:
+ raise DistutilsSetupError(
+ "Distribution contains no modules or packages for " +
+ "namespace package %r" % nsp
+ )
def _set_global_opts_from_features(self):
"""Add --with-X/--without-X options based on optional features"""
@@ -490,6 +490,47 @@ class Distribution(_Distribution):
return d
+def iter_distribution_names(distribution):
+ """Yield all packages, modules, and extensions declared by distribution"""
+
+ for pkg in distribution.packages or ():
+ yield pkg
+
+ for module in distribution.py_modules or ():
+ yield module
+
+ for ext in distribution.ext_modules or ():
+ if isinstance(ext,tuple):
+ name,buildinfo = ext
+ yield name
+ else:
+ yield ext.name
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
class Feature:
"""A subset of the distribution that can be excluded if unneeded/wanted