Changed the version number in setup.py and also made it import find_packages

and then used find_packages.
Changed the try, except statement in __init__.py.
Removed setup.cfg.in, INSTALL.txt, develop.py, CHANGES.txt, test.py,
MANIFEST.in and README.txt because they were no longer needed.

8 files changed, 11 insertions, 203 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
deleted file mode 100644
index 8c74638..0000000
--- a/CHANGES.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-zope.pagetemplate Package Changelog
-===================================
-
-
-zope.pagetemplate version 3.2.0 (2006/01/05)
---------------------------------------------
-
-- Corresponds to the verison of the zope.pagetemplate package shipped
-  as part of the Zope 3.2.0 release.
-
-- ZPTPage macro expansion:  changed label text to match the corresponding
-  label in Zope 2 and activated the name spaces for macro expansion
-  in 'read'.  See http://www.zope.org/Collectors/Zope3-dev/199
-
-- Coding style cleanups.
-
-
-zope.pagetemplate version 3.1.0 (2005/10/03)
---------------------------------------------
-
-- Corresponds to the verison of the zope.pagetemplate package shipped
-  as part of the Zope 3.1.0 release.
-
-- Fixed apidoc and Cookie, which were using wrong descriptor class
-  (changed to 'property').  See http://www.zope.org/Collectors/Zope3-dev/387
-
-- Documentation / style / testing cleanups.
-
-
-zope.pagetemplate version 3.0.0 (2004/11/07)
---------------------------------------------
-
-- Corresponds to the verison of the zope.pagetemplate package shipped
-  as part of the Zope X3.0.0 release.
diff --git a/INSTALL.txt b/INSTALL.txt
deleted file mode 100644
index 10ddf98..0000000
--- a/INSTALL.txt
+++ /dev/null
@@ -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.pagetemplate/trunk \
-    src/zope.pagetemplate
-  $ cd src/zope.pagetemplate
-
-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.pagetemplate
-  $ cd src/zope.pagetemplate
-  $ /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.pagetemplate
-
-
diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 1cdc4fd..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1 +0,0 @@
-exclude setup.cfg
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 45a6be3..0000000
--- a/README.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-zope.pagetemplate Package Readme
-================================
-
-Overview
---------
-
-Please see 'src/zope/pagetemplate/architecture.txt'.
-
-Changes
--------
-
-See CHANGES.txt.
-
-Installation
-------------
-
-See INSTALL.txt.
-
-
-Developer Resources
--------------------
-
-- Subversion browser:
-
-  http://svn.zope.org/zope.pagetemplate/
-
-- Read-only Subversion checkout:
-
-  $ svn co svn://svn.zope.org/repos/main/zope.pagetemplate/trunk
-
-- Writable Subversion checkout:
-
-  $ svn co svn://svn.zope.org/repos/main/zope.pagetemplate/trunk
-
-- Note that the 'src/zope/pagetemplate' 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).
diff --git a/setup.cfg.in b/setup.cfg.in
deleted file mode 100644
index 1196682..0000000
--- a/setup.cfg.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[development]
-depends = zope.testing
-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1
diff --git a/setup.py b/setup.py
index 34022e8..cfc97a3 100644
--- a/setup.py
+++ b/setup.py
@@ -18,20 +18,17 @@ $Id$
 
 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.pagetemplate',
-      version='3.3-dev',
+      version='3.3dev',
       url='http://svn.zope.org/zope.pagetemplate',
       license='ZPL 2.1',
       description='Zope Page Templates',
       author='Zope Corporation and Contributors',
       author_email='zope3-dev@zope.org',
       
-      packages=['zope', 'zope.pagetemplate'],
+      packages=find_packages('src'),
       package_dir = {'': 'src'},
 
       namespace_packages=['zope',],
diff --git a/src/zope/__init__.py b/src/zope/__init__.py
new file mode 100644
index 0000000..bf99a9d
--- /dev/null
+++ b/src/zope/__init__.py
@@ -0,0 +1,8 @@
+# this is a namespace package
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    import pkgutil
+    __path__ = pkgutil.extend_path(__path__, __name__)
+
diff --git a/test.py b/test.py
deleted file mode 100644
index 3157ade..0000000
--- a/test.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-##############################################################################
-#
-# Copyright (c) 2006 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.pagetemplate',
-    '--tests-pattern', '^tests$',
-    ]
-
-sys.exit(testrunner.run(defaults))
-