[Checkins] SVN: zope.documenttemplate/trunk/ Changed the version number in setup.py as well as made it import find_packages

Alexander Heavner alex at zope.com
Tue Feb 13 13:38:45 EST 2007


Log message for revision 72533:
  Changed the version number in setup.py as well as made it import find_packages
  from setuptools and then used it.
  Altered the try except statement in the __init__.py file.
  The files that were removed were no longer necessary.
  

Changed:
  _U  zope.documenttemplate/trunk/
  D   zope.documenttemplate/trunk/CHANGES.txt
  D   zope.documenttemplate/trunk/INSTALL.txt
  D   zope.documenttemplate/trunk/MANIFEST.in
  D   zope.documenttemplate/trunk/README.txt
  D   zope.documenttemplate/trunk/develop.py
  D   zope.documenttemplate/trunk/setup.cfg.in
  U   zope.documenttemplate/trunk/setup.py
  U   zope.documenttemplate/trunk/src/zope/__init__.py
  D   zope.documenttemplate/trunk/test.py

-=-

Property changes on: zope.documenttemplate/trunk
___________________________________________________________________
Name: svn:externals
   - workspace svn://svn.zope.org/repos/main/projectsupport/trunk/src/workspace

   + 


Deleted: zope.documenttemplate/trunk/CHANGES.txt
===================================================================
--- zope.documenttemplate/trunk/CHANGES.txt	2007-02-13 18:30:04 UTC (rev 72532)
+++ zope.documenttemplate/trunk/CHANGES.txt	2007-02-13 18:38:42 UTC (rev 72533)
@@ -1,27 +0,0 @@
-zope.documenttemplate Package Changelog
-=======================================
-
-zope.documenttemplate version 3.2.0 (2006/01/05)
-------------------------------------------------
-
-- Corresponds to the verison of the zope.documenttemplate package
-  shipped as part of the Zope 3.2.0 release.
-
-- 'dt_in.py': replaced another string exception, 'InError'.
-
-- Coding style cleanups.
-
-zope.documenttemplate version 3.1.0 (2005/10/03)
-------------------------------------------------
-
-- Corresponds to the verison of the zope.documenttemplate package
-  shipped as part of the Zope 3.1.0 release.
-
-- 'documenttemplate.py':  Replace use of named string exception, 'ParseError',
-  with normal exception class of the same name (from 'dt_util.py').
-
-zope.documenttemplate version 3.0.0 (2004/11/07)
-------------------------------------------------
-
-- Corresponds to the verison of the zope.documenttemplate package
-  shipped as part of the Zope X3.0.0 release.

Deleted: zope.documenttemplate/trunk/INSTALL.txt
===================================================================
--- zope.documenttemplate/trunk/INSTALL.txt	2007-02-13 18:30:04 UTC (rev 72532)
+++ zope.documenttemplate/trunk/INSTALL.txt	2007-02-13 18:38:42 UTC (rev 72533)
@@ -1,83 +0,0 @@
-Installing This Package
-=======================
-
-Prerequisites
--------------
-
-The installation steps below assume that you have the cool new 'setuptools'
-package installed in your Python.  Here is where to get it:
-
-  $ wget http://peak.telecommunity.com/dist/ez_setup.py
-  $ /path/to/your/python ez_setup.py # req. write access to 'site-packages'
-
-
-  - Docs for EasyInstall:
-    http://peak.telecommunity.com/DevCenter/EasyInstall
-
-  - Docs for setuptools:
-    http://peak.telecommunity.com/DevCenter/setuptools
-
-  - Docs for eggs:
-    http://peak.telecommunity.com/DevCenter/PythonEggs
-
-
-Installing a Development Checkout
----------------------------------
-
-Check out the package from subversion:
-
-  $ svn co svn+ssh://svn.zope.org/repos/main/zope.documenttemplate/trunk \
-    src/zope.documenttemplate
-  $ cd src/zope.documenttemplate
-
-Install it as a "devlopment egg" (which also installs its "hard"
-dependencies):
-
-  $ /path/to/your/python setup.py devel
-
-The installation of dependency eggs uses the 'setup.cfg' file in
-the checkout.  You can supply '--find-links' on the command line to
-point it at a non-standard package repository.
-
-
-Running the Tests
------------------
-
-To test the package, you will also need the 'zope.testing' package, which
-can't (yet) be automatically installed.  Eventually, you should be able to
-type:
-
-  $ /path/to/your/python setup.py test
-
-and have it install the "testing dependencies."  Today, the workaround
-is to install it manually:
-
-  $ /path/to/easy_install --find-links="...." zope.testing
-
-You can then run the tests (finally) from the checkout directory:
-
-  $ /path/to/your/python test.py
-    Running:
-      .............
-    Ran 13 tests with 0 failures and 0 errors in 0.094 seconds.
-
-
-Installing a Source Distribution
---------------------------------
-
-You can also install it from a source distribution:
-
-  $ /path/to/easy_install --find-links="...." -eb src zope.documenttemplate
-  $ cd src/zope.documenttemplate
-  $ /path/to/your/python setup.py devel
-
-
-Installing a Binary Egg
------------------------
-
-Install the package as a "binary egg" (which also installs its "hard"
-dependencies):
-
-  $ /path/to/easy_install --find-links="...." zope.documenttemplate
-
-

Deleted: zope.documenttemplate/trunk/MANIFEST.in
===================================================================
--- zope.documenttemplate/trunk/MANIFEST.in	2007-02-13 18:30:04 UTC (rev 72532)
+++ zope.documenttemplate/trunk/MANIFEST.in	2007-02-13 18:38:42 UTC (rev 72533)
@@ -1 +0,0 @@
-exclude setup.cfg

Deleted: zope.documenttemplate/trunk/README.txt
===================================================================
--- zope.documenttemplate/trunk/README.txt	2007-02-13 18:30:04 UTC (rev 72532)
+++ zope.documenttemplate/trunk/README.txt	2007-02-13 18:38:42 UTC (rev 72533)
@@ -1,37 +0,0 @@
-zope.documenttemplate Package Readme
-=======================
-
-Overview
---------
-
-Lorem ipsum delorem.
-
-Changes
--------
-
-See CHANGES.txt.
-
-Installation
-------------
-
-See INSTALL.txt.
-
-
-Developer Resources
--------------------
-
-- Subversion browser:
-
-  http://svn.zope.org/zope.documenttemplate/
-
-- Read-only Subversion checkout:
-
-  $ svn co svn://svn.zope.org/repos/main/zope.documenttemplate/trunk
-
-- Writable Subversion checkout:
-
-  $ svn co svn://svn.zope.org/repos/main/zope.documenttemplate/trunk
-
-- Note that the 'src/zope/documenttemplate' package is acutally a
-  'svn:externals' link to the corresponding package in the Zope3 trunk
-  (or to a specific tag, for released versions of the package).

Deleted: zope.documenttemplate/trunk/develop.py
===================================================================
--- zope.documenttemplate/trunk/develop.py	2007-02-13 18:30:04 UTC (rev 72532)
+++ zope.documenttemplate/trunk/develop.py	2007-02-13 18:38:42 UTC (rev 72533)
@@ -1,21 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004 Zope Corporation 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.
-#
-##############################################################################
-"""Workspace configuration wrapper script
-
-$Id$
-"""
-
-import workspace.develop
-
-workspace.develop.main()

Deleted: zope.documenttemplate/trunk/setup.cfg.in
===================================================================
--- zope.documenttemplate/trunk/setup.cfg.in	2007-02-13 18:30:04 UTC (rev 72532)
+++ zope.documenttemplate/trunk/setup.cfg.in	2007-02-13 18:38:42 UTC (rev 72533)
@@ -1,4 +0,0 @@
-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1

Modified: zope.documenttemplate/trunk/setup.py
===================================================================
--- zope.documenttemplate/trunk/setup.py	2007-02-13 18:30:04 UTC (rev 72532)
+++ zope.documenttemplate/trunk/setup.py	2007-02-13 18:38:42 UTC (rev 72533)
@@ -18,23 +18,17 @@
 
 import os
 
-try:
-    from setuptools import setup, Extension
-except ImportError, e:
-    from distutils.core import setup, Extension
+from setuptools import setup, find_packages
 
 setup(name='zope.documenttemplate',
-      version='3.3-dev',
+      version='3.3dev',
       url='http://svn.zope.org/zope.documenttemplate',
       license='ZPL 2.1',
       description='Zope3 Document Template Markup Language (DTML)',
       author='Zope Corporation and Contributors',
       author_email='zope3-dev at zope.org',
       
-      packages=['zope',
-                'zope.documenttemplate',
-                'zope.documenttemplate.untrusted',
-               ],
+      packages=find_packages('src'),
       package_dir = {'': 'src'},
 
       namespace_packages=['zope',],

Modified: zope.documenttemplate/trunk/src/zope/__init__.py
===================================================================
--- zope.documenttemplate/trunk/src/zope/__init__.py	2007-02-13 18:30:04 UTC (rev 72532)
+++ zope.documenttemplate/trunk/src/zope/__init__.py	2007-02-13 18:38:42 UTC (rev 72533)
@@ -1,7 +1,10 @@
-# namespace package boilerplate
+# this is a namespace package
 try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError, e:
-    from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    import pkgutil
+    __path__ = pkgutil.extend_path(__path__, __name__)
 
+
+

Deleted: zope.documenttemplate/trunk/test.py
===================================================================
--- zope.documenttemplate/trunk/test.py	2007-02-13 18:30:04 UTC (rev 72532)
+++ zope.documenttemplate/trunk/test.py	2007-02-13 18:38:42 UTC (rev 72533)
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-##############################################################################
-#
-# Copyright (c) 2004 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (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.
-#
-##############################################################################
-"""Sample test script using zope.testing.testrunner
-
-see zope.testing testrunner.txt
-
-$Id$
-"""
-
-import os, sys
-
-src = os.path.join(os.path.split(sys.argv[0])[0], 'src')
-sys.path.insert(0, src) # put at beginning to avoid one in site_packages
-
-from zope.testing import testrunner
-
-defaults = [
-    '--path', src,
-    '--package', 'zope.documenttemplate',
-    '--tests-pattern', '^tests$',
-    ]
-
-# XXX:  'untrusted' tests fail due to dependency on zope.security.
-sys.exit(testrunner.run(defaults))
-



More information about the Checkins mailing list