[Checkins] SVN: zope.contenttype/trunk/ Alterted the setup.py file
to import find_packages and use it.
Alexander Heavner
alex at zope.com
Tue Feb 13 11:24:38 EST 2007
Log message for revision 72520:
Alterted the setup.py file to import find_packages and use it.
The files that have been removed were no longer needed after the creation
of the egg
Changed:
D zope.contenttype/trunk/CHANGES.txt
D zope.contenttype/trunk/INSTALL.txt
D zope.contenttype/trunk/MANIFEST.in
D zope.contenttype/trunk/README.txt
D zope.contenttype/trunk/setup.cfg.in
U zope.contenttype/trunk/setup.py
D zope.contenttype/trunk/test.py
-=-
Deleted: zope.contenttype/trunk/CHANGES.txt
===================================================================
--- zope.contenttype/trunk/CHANGES.txt 2007-02-13 16:15:35 UTC (rev 72519)
+++ zope.contenttype/trunk/CHANGES.txt 2007-02-13 16:24:37 UTC (rev 72520)
@@ -1,2 +0,0 @@
-zope.contenttype Package Changelog
-==================================
Deleted: zope.contenttype/trunk/INSTALL.txt
===================================================================
--- zope.contenttype/trunk/INSTALL.txt 2007-02-13 16:15:35 UTC (rev 72519)
+++ zope.contenttype/trunk/INSTALL.txt 2007-02-13 16:24:37 UTC (rev 72520)
@@ -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.contenttype/trunk \
- src/zope.contenttype
- $ cd src/zope.contenttype
-
-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.contenttype
- $ cd src/zope.contenttype
- $ /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.contenttype
Deleted: zope.contenttype/trunk/MANIFEST.in
===================================================================
--- zope.contenttype/trunk/MANIFEST.in 2007-02-13 16:15:35 UTC (rev 72519)
+++ zope.contenttype/trunk/MANIFEST.in 2007-02-13 16:24:37 UTC (rev 72520)
@@ -1 +0,0 @@
-exclude setup.cfg
Deleted: zope.contenttype/trunk/README.txt
===================================================================
--- zope.contenttype/trunk/README.txt 2007-02-13 16:15:35 UTC (rev 72519)
+++ zope.contenttype/trunk/README.txt 2007-02-13 16:24:37 UTC (rev 72520)
@@ -1,37 +0,0 @@
-zope.contenttype Package Readme
-===============================
-
-Overview
---------
-
-A utility module for content-type handling.
-
-Changes
--------
-
-See CHANGES.txt.
-
-Installation
-------------
-
-See INSTALL.txt.
-
-
-Developer Resources
--------------------
-
-- Subversion browser:
-
- http://svn.zope.org/zope.contenttype/
-
-- Read-only Subversion checkout:
-
- $ svn co svn://svn.zope.org/repos/main/zope.contenttype/trunk
-
-- Writable Subversion checkout:
-
- $ svn co svn+ssh://userid@svn.zope.org/repos/main/zope.contenttype/trunk
-
-- Note that the 'src/zope/contenttype 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.contenttype/trunk/setup.cfg.in
===================================================================
--- zope.contenttype/trunk/setup.cfg.in 2007-02-13 16:15:35 UTC (rev 72519)
+++ zope.contenttype/trunk/setup.cfg.in 2007-02-13 16:24:37 UTC (rev 72520)
@@ -1,6 +0,0 @@
-[development]
-depends = zope.testing
-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1
Modified: zope.contenttype/trunk/setup.py
===================================================================
--- zope.contenttype/trunk/setup.py 2007-02-13 16:15:35 UTC (rev 72519)
+++ zope.contenttype/trunk/setup.py 2007-02-13 16:24:37 UTC (rev 72520)
@@ -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.contenttype',
- version='3.4-dev',
+ version='3.4dev',
url='http://svn.zope.org/zope.contenttype',
license='ZPL 2.1',
description='Zope contenttype',
@@ -32,9 +29,7 @@
author_email='zope3-dev at zope.org',
long_description="A utility module for content-type handling.",
- packages=['zope',
- 'zope.contenttype',
- 'zope.contenttype.tests'],
+ packages=find_packages('src'),
package_dir = {'': 'src'},
namespace_packages=['zope',],
Deleted: zope.contenttype/trunk/test.py
===================================================================
--- zope.contenttype/trunk/test.py 2007-02-13 16:15:35 UTC (rev 72519)
+++ zope.contenttype/trunk/test.py 2007-02-13 16:24:37 UTC (rev 72520)
@@ -1,41 +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
-
-here = os.path.abspath(os.path.dirname(sys.argv[0]))
-
-# Remove this directory from path:
-sys.path[:] = [p for p in sys.path if os.path.abspath(p) != here]
-
-src = os.path.join(here, '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.contenttype',
- '--tests-pattern', '^tests$',
- ]
-
-sys.exit(testrunner.run(defaults))
-
More information about the Checkins
mailing list