[Checkins] SVN: zope.publisher/trunk/ Changed the version number in setup.py and used find_packages to define

Alexander Heavner alex at zope.com
Tue Feb 13 17:25:01 EST 2007


Log message for revision 72564:
  Changed the version number in setup.py and used find_packages to define
  'packages'.
  Removed setup.cfg.in, INSTALL.txt, CHANGES.txt, test.py, MANIFEST.in and
  README.txt because they are no longer needed.
  

Changed:
  D   zope.publisher/trunk/CHANGES.txt
  D   zope.publisher/trunk/INSTALL.txt
  D   zope.publisher/trunk/MANIFEST.in
  D   zope.publisher/trunk/README.txt
  D   zope.publisher/trunk/setup.cfg.in
  U   zope.publisher/trunk/setup.py
  D   zope.publisher/trunk/test.py

-=-
Deleted: zope.publisher/trunk/CHANGES.txt
===================================================================
--- zope.publisher/trunk/CHANGES.txt	2007-02-13 22:14:34 UTC (rev 72563)
+++ zope.publisher/trunk/CHANGES.txt	2007-02-13 22:25:00 UTC (rev 72564)
@@ -1,2 +0,0 @@
-zope.publisher Package Changelog
-================================

Deleted: zope.publisher/trunk/INSTALL.txt
===================================================================
--- zope.publisher/trunk/INSTALL.txt	2007-02-13 22:14:34 UTC (rev 72563)
+++ zope.publisher/trunk/INSTALL.txt	2007-02-13 22:25:00 UTC (rev 72564)
@@ -1,80 +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.publisher/trunk \
-    src/zope.publisher
-  $ cd src/zope.publisher
-
-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.publisher
-  $ cd src/zope.publisher
-  $ /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.publisher

Deleted: zope.publisher/trunk/MANIFEST.in
===================================================================
--- zope.publisher/trunk/MANIFEST.in	2007-02-13 22:14:34 UTC (rev 72563)
+++ zope.publisher/trunk/MANIFEST.in	2007-02-13 22:25:00 UTC (rev 72564)
@@ -1 +0,0 @@
-exclude setup.cfg

Deleted: zope.publisher/trunk/README.txt
===================================================================
--- zope.publisher/trunk/README.txt	2007-02-13 22:14:34 UTC (rev 72563)
+++ zope.publisher/trunk/README.txt	2007-02-13 22:25:00 UTC (rev 72564)
@@ -1,39 +0,0 @@
-zope.publisher Package Readme
-=============================
-
-Overview
---------
-
-Python Object Publisher -- Publish Python objects on web servers.
-
-Provide an apply-like facility that works with any mapping object.
-
-Changes
--------
-
-See CHANGES.txt.
-
-Installation
-------------
-
-See INSTALL.txt.
-
-
-Developer Resources
--------------------
-
-- Subversion browser:
-
-  http://svn.zope.org/zope.publisher/
-
-- Read-only Subversion checkout:
-
-  $ svn co svn://svn.zope.org/repos/main/zope.publisher/trunk
-
-- Writable Subversion checkout:
-
-  $ svn co svn+ssh://userid@svn.zope.org/repos/main/zope.publisher/trunk
-
-- Note that the 'src/zope/publisher 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.publisher/trunk/setup.cfg.in
===================================================================
--- zope.publisher/trunk/setup.cfg.in	2007-02-13 22:14:34 UTC (rev 72563)
+++ zope.publisher/trunk/setup.cfg.in	2007-02-13 22:25:00 UTC (rev 72564)
@@ -1,6 +0,0 @@
-[development]
-depends = zope.testing
-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1

Modified: zope.publisher/trunk/setup.py
===================================================================
--- zope.publisher/trunk/setup.py	2007-02-13 22:14:34 UTC (rev 72563)
+++ zope.publisher/trunk/setup.py	2007-02-13 22:25:00 UTC (rev 72564)
@@ -18,13 +18,10 @@
 
 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.publisher',
-      version='3.3-dev',
+      version='3.3dev',
       url='http://svn.zope.org/zope.publisher',
       license='ZPL 2.1',
       description='Zope publisher',
@@ -34,11 +31,8 @@
                        "Provide an apply-like facility that"
                        "works with any mapping object.",
 
-      packages = ['zope',
-                  'zope.publisher',
-                  'zope.publisher.interfaces',
-                  'zope.publisher.tests'],
-      package_dir = {'': 'src'},
+      packages=find_packages('src'),
+	  package_dir = {'': 'src'},
 
       namespace_packages=['zope',],
       tests_require = ['zope.testing'],

Deleted: zope.publisher/trunk/test.py
===================================================================
--- zope.publisher/trunk/test.py	2007-02-13 22:14:34 UTC (rev 72563)
+++ zope.publisher/trunk/test.py	2007-02-13 22:25:00 UTC (rev 72564)
@@ -1,36 +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.publisher',
-    '--tests-pattern', '^tests$',
-    ]
-
-sys.exit(testrunner.run(defaults))
-



More information about the Checkins mailing list