[Checkins] SVN: z3c.macro/trunk/ Get ready for a new release that fixes some package data.

Stephan Richter srichter at cosmos.phy.tufts.edu
Thu Nov 1 15:47:10 EDT 2007


Log message for revision 81365:
  Get ready for a new release that fixes some package data.
  

Changed:
  _U  z3c.macro/trunk/
  A   z3c.macro/trunk/CHANGES.txt
  U   z3c.macro/trunk/setup.py
  _U  z3c.macro/trunk/src/
  U   z3c.macro/trunk/src/z3c/__init__.py
  U   z3c.macro/trunk/src/z3c/macro/README.txt
  U   z3c.macro/trunk/src/z3c/macro/zcml.txt

-=-

Property changes on: z3c.macro/trunk
___________________________________________________________________
Name: svn:ignore
   + .installed.cfg
bin
build
dist
develop-eggs
parts


Added: z3c.macro/trunk/CHANGES.txt
===================================================================
--- z3c.macro/trunk/CHANGES.txt	                        (rev 0)
+++ z3c.macro/trunk/CHANGES.txt	2007-11-01 19:47:10 UTC (rev 81365)
@@ -0,0 +1,16 @@
+=======
+CHANGES
+=======
+
+1.1.0 (2007-11-01)
+------------------
+
+- Update package info data.
+
+- Add z3c namespace package declaration.
+
+
+1.0.0 (2007-09-30)
+------------------
+
+- Initial release.


Property changes on: z3c.macro/trunk/CHANGES.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: z3c.macro/trunk/setup.py
===================================================================
--- z3c.macro/trunk/setup.py	2007-11-01 18:58:05 UTC (rev 81364)
+++ z3c.macro/trunk/setup.py	2007-11-01 19:47:10 UTC (rev 81365)
@@ -21,19 +21,23 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-setup (
+setup(
     name='z3c.macro',
-    version='1.0.0',
+    version='1.1.0',
     author = "Roger Ineichen and the Zope Community",
     author_email = "zope3-dev at zope.org",
     description = "Simpler definition of ZPT macros.",
     long_description=(
         read('README.txt')
-        + '\n' +
+        + '\n\n' +
         'Detailed Documentation\n'
-        '**********************\n'
-        + '\n' +
+        '======================\n'
+        + '\n\n' +
         read('src', 'z3c', 'macro', 'README.txt')
+        + '\n\n' +
+        read('src', 'z3c', 'macro', 'zcml.txt')
+        + '\n\n' +
+        read('CHANGES.txt')
         ),
     license = "ZPL 2.1",
     keywords = "zope3 macro pagetemplate zpt",
@@ -47,13 +51,14 @@
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',
         'Framework :: Zope3'],
-    url = 'http://svn.zope.org/z3c.macro',
+    url = 'http://cheeseshop.python.org/pypi/z3c.macro',
     packages = find_packages('src'),
-    include_package_data = True,
     package_dir = {'':'src'},
     namespace_packages = ['z3c'],
     extras_require = dict(
-        test = ['zope.app.testing', 'zope.testing'],
+        test = ['z3c.template',
+                'zope.app.testing',
+                'zope.testing'],
         ),
     install_requires = [
         'setuptools',
@@ -67,6 +72,6 @@
         'zope.schema',
         'zope.tales',
         ],
-    dependency_links = ['http://download.zope.org/distribution'],
+    include_package_data = True,
     zip_safe = False,
     )


Property changes on: z3c.macro/trunk/src
___________________________________________________________________
Name: svn:ignore
   + z3c.macro.egg-info


Modified: z3c.macro/trunk/src/z3c/__init__.py
===================================================================
--- z3c.macro/trunk/src/z3c/__init__.py	2007-11-01 18:58:05 UTC (rev 81364)
+++ z3c.macro/trunk/src/z3c/__init__.py	2007-11-01 19:47:10 UTC (rev 81365)
@@ -1,16 +1,5 @@
-##############################################################################
-#
-# Copyright (c) 2006 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""
-$Id$
-"""
+# this is a namespace package
+try:
+    __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+    pass

Modified: z3c.macro/trunk/src/z3c/macro/README.txt
===================================================================
--- z3c.macro/trunk/src/z3c/macro/README.txt	2007-11-01 18:58:05 UTC (rev 81364)
+++ z3c.macro/trunk/src/z3c/macro/README.txt	2007-11-01 19:47:10 UTC (rev 81365)
@@ -3,7 +3,7 @@
 =====
 
 This package provides a adapter and a TALES expression for a expliciter and
-flexibler macro handling using the adapter registry for macros. 
+flexibler macro handling using the adapter registry for macros.
 
 We start with creating a content object that is used as a view context later:
 
@@ -16,7 +16,7 @@
 
   >>> content = Content()
 
-We also create a temp dir for sample templates which we define later for 
+We also create a temp dir for sample templates which we define later for
 testing:
 
   >>> import os, tempfile
@@ -55,7 +55,7 @@
 ------------------------------
 
 The ``macro`` expression will look up the name of the macro, call a adapter
-providing IMacroTemplate and uses them or fills a slot if defined in the 
+providing IMacroTemplate and uses them or fills a slot if defined in the
 ``macro`` expression.
 
 Let's create a page template using the ``navigation`` macros:
@@ -78,7 +78,7 @@
   ... ''')
 
 As you can see, we used the ``macro`` expression to simply look up a macro
-called navigation whihc get inserted and replaces the HTML content at this 
+called navigation whihc get inserted and replaces the HTML content at this
 place.
 
 Let's now create a view using this page template:

Modified: z3c.macro/trunk/src/z3c/macro/zcml.txt
===================================================================
--- z3c.macro/trunk/src/z3c/macro/zcml.txt	2007-11-01 18:58:05 UTC (rev 81364)
+++ z3c.macro/trunk/src/z3c/macro/zcml.txt	2007-11-01 19:47:10 UTC (rev 81365)
@@ -2,7 +2,7 @@
 Macro directive
 ===============
 
-A macro directive can be used for register macros. Take a look at the 
+A macro directive can be used for register macros. Take a look at the
 README.txt which explains the macro TALES expression.
 
   >>> import sys
@@ -67,7 +67,7 @@
 
   >>> from z3c.macro import interfaces
   >>> view = View(content, request)
-  >>> zope.component.getMultiAdapter((content, view, request), 
+  >>> zope.component.getMultiAdapter((content, view, request),
   ...     interface=interfaces.IMacroTemplate, name='title')
   [('version', '1.6'), ('mode', 'html'), ('setPosition', (5, 4)),...
   [(u'define-macro', u'title', 'metal')]))]...



More information about the Checkins mailing list