[Checkins] SVN: zope.app.apidoc/trunk/ - Add buildout support

Baiju M baiju.m.mail at gmail.com
Mon Mar 26 09:08:48 EDT 2007


Log message for revision 73626:
   - Add buildout support
   - Use zope.app individual eggs
  

Changed:
  _U  zope.app.apidoc/trunk/
  D   zope.app.apidoc/trunk/CHANGES.txt
  D   zope.app.apidoc/trunk/INSTALL.txt
  D   zope.app.apidoc/trunk/MANIFEST.in
  A   zope.app.apidoc/trunk/bootstrap.py
  A   zope.app.apidoc/trunk/buildout.cfg
  D   zope.app.apidoc/trunk/setup.cfg.in
  UU  zope.app.apidoc/trunk/setup.py
  D   zope.app.apidoc/trunk/test.py

-=-

Property changes on: zope.app.apidoc/trunk
___________________________________________________________________
Name: svn:ignore
   - bin
build
dist
lib
setup.cfg

   + bin
build
dist
lib
develop-eggs
eggs
parts
.installed.cfg


Deleted: zope.app.apidoc/trunk/CHANGES.txt
===================================================================
--- zope.app.apidoc/trunk/CHANGES.txt	2007-03-26 12:55:57 UTC (rev 73625)
+++ zope.app.apidoc/trunk/CHANGES.txt	2007-03-26 13:08:47 UTC (rev 73626)
@@ -1,2 +0,0 @@
-zope.app.apidoc Package Changelog
-=================================

Deleted: zope.app.apidoc/trunk/INSTALL.txt
===================================================================
--- zope.app.apidoc/trunk/INSTALL.txt	2007-03-26 12:55:57 UTC (rev 73625)
+++ zope.app.apidoc/trunk/INSTALL.txt	2007-03-26 13:08:47 UTC (rev 73626)
@@ -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.app.apidoc/trunk \
-    src/zope.app.apidoc
-  $ cd src/zope.app.apidoc
-
-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.app.apidoc
-  $ cd src/zope.app.apidoc
-  $ /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.app.apidoc

Deleted: zope.app.apidoc/trunk/MANIFEST.in
===================================================================
--- zope.app.apidoc/trunk/MANIFEST.in	2007-03-26 12:55:57 UTC (rev 73625)
+++ zope.app.apidoc/trunk/MANIFEST.in	2007-03-26 13:08:47 UTC (rev 73626)
@@ -1 +0,0 @@
-exclude setup.cfg

Added: zope.app.apidoc/trunk/bootstrap.py
===================================================================
--- zope.app.apidoc/trunk/bootstrap.py	2007-03-26 12:55:57 UTC (rev 73625)
+++ zope.app.apidoc/trunk/bootstrap.py	2007-03-26 13:08:47 UTC (rev 73626)
@@ -0,0 +1,52 @@
+##############################################################################
+#
+# Copyright (c) 2006 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.
+#
+##############################################################################
+"""Bootstrap a buildout-based project
+
+Simply run this script in a directory containing a buildout.cfg.
+The script accepts buildout command-line options, so you can
+use the -c option to specify an alternate configuration file.
+
+$Id$
+"""
+
+import os, shutil, sys, tempfile, urllib2
+
+tmpeggs = tempfile.mkdtemp()
+
+ez = {}
+exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+                     ).read() in ez
+ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+
+import pkg_resources
+
+cmd = 'from setuptools.command.easy_install import main; main()'
+if sys.platform == 'win32':
+    cmd = '"%s"' % cmd # work around spawn lamosity on windows
+
+ws = pkg_resources.working_set
+assert os.spawnle(
+    os.P_WAIT, sys.executable, sys.executable,
+    '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
+    dict(os.environ,
+         PYTHONPATH=
+         ws.find(pkg_resources.Requirement.parse('setuptools')).location
+         ),
+    ) == 0
+
+ws.add_entry(tmpeggs)
+ws.require('zc.buildout')
+import zc.buildout.buildout
+zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
+shutil.rmtree(tmpeggs)


Property changes on: zope.app.apidoc/trunk/bootstrap.py
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Added: zope.app.apidoc/trunk/buildout.cfg
===================================================================
--- zope.app.apidoc/trunk/buildout.cfg	2007-03-26 12:55:57 UTC (rev 73625)
+++ zope.app.apidoc/trunk/buildout.cfg	2007-03-26 13:08:47 UTC (rev 73626)
@@ -0,0 +1,10 @@
+[buildout]
+develop = .
+parts = test
+
+find-links = http://download.zope.org/distribution/
+
+[test]
+recipe = zc.recipe.testrunner
+defaults = ['--tests-pattern', '^f?tests$']
+eggs = zope.app.apidoc


Property changes on: zope.app.apidoc/trunk/buildout.cfg
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: zope.app.apidoc/trunk/setup.cfg.in
===================================================================
--- zope.app.apidoc/trunk/setup.cfg.in	2007-03-26 12:55:57 UTC (rev 73625)
+++ zope.app.apidoc/trunk/setup.cfg.in	2007-03-26 13:08:47 UTC (rev 73626)
@@ -1,6 +0,0 @@
-[development]
-depends = zope.testing
-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1

Modified: zope.app.apidoc/trunk/setup.py
===================================================================
--- zope.app.apidoc/trunk/setup.py	2007-03-26 12:55:57 UTC (rev 73625)
+++ zope.app.apidoc/trunk/setup.py	2007-03-26 13:08:47 UTC (rev 73626)
@@ -18,35 +18,56 @@
 
 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.app.apidoc',
-      version='3.4-dev',
-      url='http://svn.zope.org/zope.app.apidoc',
-      license='ZPL 2.1',
-      description='Zope apidoc',
-      author='Zope Corporation and Contributors',
-      author_email='zope3-dev at zope.org',
-      long_description="This Zope 3 package provides fully dynamic"
-                       "API documentation of Zope 3 and registered"
-                       "add-on components.",
+setup(name = 'zope.app.apidoc',
+      version = '3.4dev',
+      url = 'http://svn.zope.org/zope.app.apidoc',
+      license = 'ZPL 2.1',
+      description = 'Zope apidoc',
+      author = 'Zope Corporation and Contributors',
+      author_email = 'zope3-dev at zope.org',
+      long_description = "This Zope 3 package provides fully dynamic"
+                         "API documentation of Zope 3 and registered"
+                         "add-on components.",
 
-      packages=['zope', 'zope.app', 'zope.app.apidoc',
-                'zope.app.apidoc.bookmodule',
-                'zope.app.apidoc.browser',
-                'zope.app.apidoc.codemodule',
-                'zope.app.apidoc.codemodule.browser',
-                'zope.app.apidoc.typemodule',
-                'zope.app.apidoc.utilitymodule',
-                'zope.app.apidoc.zcmlmodule'],
+      packages = find_packages('src'),
       package_dir = {'': 'src'},
 
-      namespace_packages=['zope', 'zope.app'],
+      namespace_packages = ['zope', 'zope.app'],
       tests_require = ['zope.testing'],
-      install_requires=['zope.interface'],
+      install_requires = ['setuptools',
+                          'mechanize',
+                          'zope.annotation',
+                          'zope.app.appsetup',
+                          'zope.app.basicskin',
+                          'zope.app.component',
+                          'zope.app.container',
+                          'zope.app.onlinehelp',
+                          'zope.app.preference',
+                          'zope.app.publisher',
+                          'zope.app.renderer',
+                          'zope.app.skins',
+                          'zope.app.testing',
+                          'zope.app.tree',
+                          'zope.app.tree.browser',
+                          'zope.app.zcmlfiles',
+                          'zope.cachedescriptors',
+                          'zope.component',
+                          'zope.configuration',
+                          'zope.deprecation',
+                          'zope.i18n',
+                          'zope.interface',
+                          'zope.location',
+                          'zope.proxy',
+                          'zope.publisher',
+                          'zope.publisher.interfaces',
+                          'zope.schema',
+                          'zope.security',
+                          'zope.testbrowser',
+                          'zope.testing',
+                          'zope.traversing',
+                          ],
       include_package_data = True,
 
       zip_safe = False,


Property changes on: zope.app.apidoc/trunk/setup.py
___________________________________________________________________
Name: svn:keywords
   + Id

Deleted: zope.app.apidoc/trunk/test.py
===================================================================
--- zope.app.apidoc/trunk/test.py	2007-03-26 12:55:57 UTC (rev 73625)
+++ zope.app.apidoc/trunk/test.py	2007-03-26 13:08:47 UTC (rev 73626)
@@ -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: test.py 70876 2006-10-22 07:42:56Z baijum $
-"""
-
-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.app.apidoc',
-    '--tests-pattern', '^f?tests$',
-    ]
-
-sys.exit(testrunner.run(defaults))
-



More information about the Checkins mailing list