[Checkins] SVN: zope.component/trunk/ Altered setup.py in order to
import and then use find_packages.
Alexander Heavner
alex at zope.com
Tue Feb 13 11:02:13 EST 2007
Log message for revision 72517:
Altered setup.py in order to import and then use find_packages.
__init__.py was altered in order to import in a different way.
The files that have been removed were no longer needed since an
egg is being created.
Changed:
_U zope.component/trunk/
D zope.component/trunk/CHANGES.txt
D zope.component/trunk/INSTALL.txt
D zope.component/trunk/MANIFEST.in
D zope.component/trunk/README.txt
D zope.component/trunk/TODO.txt
D zope.component/trunk/develop.py
D zope.component/trunk/setup.cfg.in
U zope.component/trunk/setup.py
U zope.component/trunk/src/zope/__init__.py
D zope.component/trunk/test.py
-=-
Property changes on: zope.component/trunk
___________________________________________________________________
Name: svn:externals
- workspace svn://svn.zope.org/repos/main/projectsupport/trunk/src/workspace
+
Deleted: zope.component/trunk/CHANGES.txt
===================================================================
--- zope.component/trunk/CHANGES.txt 2007-02-13 15:54:55 UTC (rev 72516)
+++ zope.component/trunk/CHANGES.txt 2007-02-13 16:02:12 UTC (rev 72517)
@@ -1,39 +0,0 @@
-zope.component Package Changelog
-================================
-
-zope.component version 3.2.0.2 (2006/04/15)
----------------------------------------------
-
-- Fix packaging bug: 'package_dir' must be a *relative* path.
-
-zope.component version 3.2.0.1 (2006/04/14)
----------------------------------------------
-
-- Packaging change: suppress inclusion of 'setup.cfg' in 'sdist' builds.
-
-zope.component version 3.2.0 (2006/01/05)
------------------------------------------
-
-- Corresponds to the verison of the zope.component package shipped as part of
- the Zope 3.2.0 release.
-
-- Deprecated services and related APIS. The adapter and utility registries
- are now available directly via the site manager's 'adapters' and 'utilities'
- attributes, respectively. Services are accessible, but deprecated, and
- will be removed in Zope 3.3.
-
-- Deprectaed all presentation-related APIS, including all view-related
- API functions. Use the adapter API functions instead.
- See http://dev.zope.org/Zope3/ImplementViewsAsAdapters`
-
-- Deprecated 'contextdependent' package: site managers are now looked up
- via a thread global, set during URL traversal. The 'context' argument
- is now always optional, and should no longer be passed.
-
-- TODO: other major changes?
-
-zope.component version 3.0.0 (2004/11/07)
------------------------------------------
-
-- Corresponds to the verison of the zope.component package shipped as part of
- the Zope X3.0.0 release.
Deleted: zope.component/trunk/INSTALL.txt
===================================================================
--- zope.component/trunk/INSTALL.txt 2007-02-13 15:54:55 UTC (rev 72516)
+++ zope.component/trunk/INSTALL.txt 2007-02-13 16:02:12 UTC (rev 72517)
@@ -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.component/trunk \
- src/zope.component
- $ cd src/zope.component
-
-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-component
- $ cd src/zope.component
- $ /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-component
-
-
Deleted: zope.component/trunk/MANIFEST.in
===================================================================
--- zope.component/trunk/MANIFEST.in 2007-02-13 15:54:55 UTC (rev 72516)
+++ zope.component/trunk/MANIFEST.in 2007-02-13 16:02:12 UTC (rev 72517)
@@ -1 +0,0 @@
-exclude setup.cfg
Deleted: zope.component/trunk/README.txt
===================================================================
--- zope.component/trunk/README.txt 2007-02-13 15:54:55 UTC (rev 72516)
+++ zope.component/trunk/README.txt 2007-02-13 16:02:12 UTC (rev 72517)
@@ -1,44 +0,0 @@
-zope.component Package Readme
-=============================
-
-Overview
---------
-
-This package represents the core of the Zope Component Architecture.
-Together with the 'zope.interface' package, it provides facilities for
-defining, registering and looking up components.
-
-Please see 'src/zope/component/README.txt' for a more detailed explanation
-of the component architecture.
-
-
-Changes
--------
-
-See CHANGES.txt.
-
-
-Installation
-------------
-
-See INSTALL.txt.
-
-
-Developer Resources
--------------------
-
-- Subversion browser:
-
- http://svn.zope.org/zope.component/
-
-- Read-only Subversion checkout:
-
- $ svn co svn://svn.zope.org/repos/main/zope.component/trunk
-
-- Writable Subversion checkout:
-
- $ svn co svn://svn.zope.org/repos/main/zope.component/trunk
-
-- Note that the 'src/zope/component' 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.component/trunk/TODO.txt
===================================================================
--- zope.component/trunk/TODO.txt 2007-02-13 15:54:55 UTC (rev 72516)
+++ zope.component/trunk/TODO.txt 2007-02-13 16:02:12 UTC (rev 72517)
@@ -1 +0,0 @@
- - Remove zope.testing dependency
Deleted: zope.component/trunk/develop.py
===================================================================
--- zope.component/trunk/develop.py 2007-02-13 15:54:55 UTC (rev 72516)
+++ zope.component/trunk/develop.py 2007-02-13 16:02:12 UTC (rev 72517)
@@ -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.component/trunk/setup.cfg.in
===================================================================
--- zope.component/trunk/setup.cfg.in 2007-02-13 15:54:55 UTC (rev 72516)
+++ zope.component/trunk/setup.cfg.in 2007-02-13 16:02:12 UTC (rev 72517)
@@ -1,6 +0,0 @@
-[development]
-depends = zope.testing
-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1
Modified: zope.component/trunk/setup.py
===================================================================
--- zope.component/trunk/setup.py 2007-02-13 15:54:55 UTC (rev 72516)
+++ zope.component/trunk/setup.py 2007-02-13 16:02:12 UTC (rev 72517)
@@ -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.component',
- version='3.4-dev',
+ version='3.4dev',
url='http://svn.zope.org/zope.component',
license='ZPL 2.1',
description='Core of the Zope Component Architecture',
@@ -35,11 +32,7 @@
"and looking up components. There are two basic"
"kinds of components: adapters and utilities.",
- packages=['zope',
- 'zope.component',
- 'zope.component.bbb',
- 'zope.component.testfiles',
- ],
+ packages = find_packages('src'),
package_dir = {'': 'src'},
namespace_packages=['zope',],
Modified: zope.component/trunk/src/zope/__init__.py
===================================================================
--- zope.component/trunk/src/zope/__init__.py 2007-02-13 15:54:55 UTC (rev 72516)
+++ zope.component/trunk/src/zope/__init__.py 2007-02-13 16:02:12 UTC (rev 72517)
@@ -1,7 +1,7 @@
-# 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.component/trunk/test.py
===================================================================
--- zope.component/trunk/test.py 2007-02-13 15:54:55 UTC (rev 72516)
+++ zope.component/trunk/test.py 2007-02-13 16:02:12 UTC (rev 72517)
@@ -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.component',
- '--tests-pattern', '^f?tests$',
- ]
-
-sys.exit(testrunner.run(defaults))
-
More information about the Checkins
mailing list