[Checkins] SVN: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/ - Don't add a namespace_packages for flat packages,
Christophe Combelles
ccomb at free.fr
Tue Mar 30 20:40:52 EDT 2010
Log message for revision 110350:
- Don't add a namespace_packages for flat packages,
- Reverse the order of the namespace_packages
- Add more tests
Changed:
U bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/setup.py_tmpl
U bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py
U bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/bluebream.txt
U bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/test_bluebream.py
-=-
Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/setup.py_tmpl
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/setup.py_tmpl 2010-03-31 00:02:56 UTC (rev 110349)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/setup.py_tmpl 2010-03-31 00:40:51 UTC (rev 110350)
@@ -15,7 +15,7 @@
license=${repr(license_name)|empty},
package_dir={'': 'src'},
packages=find_packages('src'),
- namespace_packages=${repr(namespace_packages)},
+ ${len(namespace_packages) and 'namespace_packages=%s,' % repr(namespace_packages) or ''}
include_package_data=True,
zip_safe=${repr(bool(zip_safe))|False},
install_requires=['setuptools',
Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py 2010-03-31 00:02:56 UTC (rev 110349)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py 2010-03-31 00:40:51 UTC (rev 110350)
@@ -51,9 +51,9 @@
vars['package'] = re.sub('[^A-Za-z0-9.]+', '_', vars['project']).lower()
vars['main_package'] = vars['package'].split('.')[-1]
self.ns_split = vars['project'].split('.')
- vars['namespace_packages'] = [
+ vars['namespace_packages'] = list(reversed([
vars['package'].rsplit('.', i)[0]
- for i in range(1,len(self.ns_split))]
+ for i in range(1,len(self.ns_split))]))
vars['ns_prefix'] = '.'.join(self.ns_split[:-1]) + '.'
if len(self.ns_split) == 1:
vars['ns_prefix'] = ''
@@ -61,7 +61,8 @@
return templates.Template.check_vars(self, vars, cmd)
def write_files(self, command, output_dir, vars):
- "Add namespace packages and move the main package to the last level"
+ """Add namespace packages and move the main package to the last level
+ """
if not command.options.verbose:
command.verbose = 0
templates.Template.write_files(self, command, output_dir, vars)
Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/bluebream.txt
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/bluebream.txt 2010-03-31 00:02:56 UTC (rev 110349)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/bluebream.txt 2010-03-31 00:40:51 UTC (rev 110350)
@@ -68,6 +68,12 @@
sample/src/sample/securitypolicy.zcml
sample/src/sample/startup.py
sample/src/sample.egg-info/PKG-INFO
+sample/src/sample.egg-info/SOURCES.txt
+sample/src/sample.egg-info/dependency_links.txt
+sample/src/sample.egg-info/entry_points.txt
+sample/src/sample.egg-info/requires.txt
+sample/src/sample.egg-info/top_level.txt
+sample/src/sample.egg-info/zip-safe
sample/src/sample/tests/__init__.py
sample/src/sample/tests/ftesting.zcml
sample/src/sample/tests/tests.py
@@ -84,6 +90,11 @@
sample/var/filestorage/README.txt
sample/var/log/README.txt
+>>> print open(os.path.join('sample', 'setup.py')).read()
+from setuptools import setup, find_packages
+...
+ shell = sample.debug:Shell
+...
We can also create a project with a namespace:
----------------------------------------------
@@ -148,8 +159,17 @@
sample.main/var/filestorage/README.txt
sample.main/var/log/README.txt
+We check the namespace is ok:
+>>> print open(os.path.join('sample.main', 'setup.py')).read()
+from setuptools import setup, find_packages
+...
+ namespace_packages=['sample'],
+...
+shell = sample.main.debug:Shell
+...
+
Another project with two levels of namespace:
---------------------------------------------
@@ -214,3 +234,12 @@
sample.app.main/var/filestorage/README.txt
sample.app.main/var/log/README.txt
+We check the namespace is ok:
+
+>>> print open(os.path.join('sample.app.main', 'setup.py')).read()
+from setuptools import setup, find_packages
+...
+ namespace_packages=['sample', 'sample.app'],
+...
+shell = sample.app.main.debug:Shell
+...
Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/test_bluebream.py
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/test_bluebream.py 2010-03-31 00:02:56 UTC (rev 110349)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/test_bluebream.py 2010-03-31 00:40:51 UTC (rev 110350)
@@ -27,6 +27,7 @@
'bluebream.txt',
setUp=easy_install_SetUp,
tearDown=zc.buildout.testing.buildoutTearDown,
+ optionflags=doctest.ELLIPSIS | doctest.NORMALIZE_WHITESPACE,
checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings,
More information about the checkins
mailing list