[Checkins] SVN: RestrictedPython/trunk/ - Use buildout

Baiju M baiju.m.mail at gmail.com
Sat Mar 17 01:52:34 EDT 2007


Log message for revision 73256:
   - Use buildout
   - Removed obsolete files
   - Incremented version to 3.4dev
  

Changed:
  _U  RestrictedPython/trunk/
  D   RestrictedPython/trunk/CHANGES.txt
  U   RestrictedPython/trunk/README.txt
  A   RestrictedPython/trunk/bootstrap.py
  A   RestrictedPython/trunk/buildout.cfg
  D   RestrictedPython/trunk/develop.py
  D   RestrictedPython/trunk/setup.cfg.in
  U   RestrictedPython/trunk/setup.py
  D   RestrictedPython/trunk/test.py
  D   RestrictedPython/trunk/workspace/

-=-

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

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


Deleted: RestrictedPython/trunk/CHANGES.txt
===================================================================
--- RestrictedPython/trunk/CHANGES.txt	2007-03-16 21:53:29 UTC (rev 73255)
+++ RestrictedPython/trunk/CHANGES.txt	2007-03-17 05:52:33 UTC (rev 73256)
@@ -1,27 +0,0 @@
-RestrictedPython Package Changelog
-==================================
-
-RestrictedPython version 3.2.0 (2006/01/05)
--------------------------------------------
-
-- Corresponds to the verison of the RestrictedPython package shipped as part of
-  the Zope 3.2.0 release.
-
-- No changes from 3.1.0.
-
-RestrictedPython version 3.1.0 (2005/10/03)
--------------------------------------------
-
-- Corresponds to the verison of the RestrictedPython package shipped as part of
-  the Zope 3.1.0 release.
-
-- Removed unused fossil module, 'SafeMapping'.
-
-- Replaced use of deprecated 'whrandom' module with 'random' (aliased to
-  'whrandom' for backward compatibility).
-
-RestrictedPython version 3.0.0 (2004/11/07)
--------------------------------------------
-
-- Corresponds to the verison of the RestrictedPython package shipped as part of
-  the Zope X3.0.0 release.

Modified: RestrictedPython/trunk/README.txt
===================================================================
--- RestrictedPython/trunk/README.txt	2007-03-16 21:53:29 UTC (rev 73255)
+++ RestrictedPython/trunk/README.txt	2007-03-17 05:52:33 UTC (rev 73256)
@@ -1,37 +1,36 @@
-RestrictedPython Package Readme
-===============================
+****************
+RestrictedPython
+****************
 
-Overview
---------
-
 Restricted execution enviromant, supporting untrusted code / templates.
 
-Changes
--------
+Releases
+********
 
-See CHANGES.txt.
+==================
+3.2.0 (2006/01/05)
+==================
 
-Installation
-------------
+- Corresponds to the verison of the RestrictedPython package shipped
+  as part of the Zope 3.2.0 release.
 
-See INSTALL.txt.
+- No changes from 3.1.0.
 
+==================
+3.1.0 (2005/10/03)
+==================
 
-Developer Resources
--------------------
+- Corresponds to the verison of the RestrictedPython package shipped
+  as part of the Zope 3.1.0 release.
 
-- Subversion browser:
+- Removed unused fossil module, 'SafeMapping'.
 
-  http://svn.zope.org/RestrictedPython/
+- Replaced use of deprecated 'whrandom' module with 'random' (aliased
+  to 'whrandom' for backward compatibility).
 
-- Read-only Subversion checkout:
+==================
+3.0.0 (2004/11/07)
+==================
 
-  $ svn co svn://svn.zope.org/repos/main/RestrictedPython/trunk
-
-- Writable Subversion checkout:
-
-  $ svn co svn://svn.zope.org/repos/main/RestrictedPython/trunk
-
-- Note that the 'src/RestrictedPython' 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).
+- Corresponds to the verison of the RestrictedPython package shipped
+  as part of the Zope X3.0.0 release.

Added: RestrictedPython/trunk/bootstrap.py
===================================================================
--- RestrictedPython/trunk/bootstrap.py	2007-03-16 21:53:29 UTC (rev 73255)
+++ RestrictedPython/trunk/bootstrap.py	2007-03-17 05:52:33 UTC (rev 73256)
@@ -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: RestrictedPython/trunk/bootstrap.py
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Added: RestrictedPython/trunk/buildout.cfg
===================================================================
--- RestrictedPython/trunk/buildout.cfg	2007-03-16 21:53:29 UTC (rev 73255)
+++ RestrictedPython/trunk/buildout.cfg	2007-03-17 05:52:33 UTC (rev 73256)
@@ -0,0 +1,9 @@
+[buildout]
+develop = .
+parts = test
+
+find-links = http://download.zope.org/distribution/
+
+[test]
+recipe = zc.recipe.testrunner
+eggs = RestrictedPython


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

Deleted: RestrictedPython/trunk/develop.py
===================================================================
--- RestrictedPython/trunk/develop.py	2007-03-16 21:53:29 UTC (rev 73255)
+++ RestrictedPython/trunk/develop.py	2007-03-17 05:52:33 UTC (rev 73256)
@@ -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: RestrictedPython/trunk/setup.cfg.in
===================================================================
--- RestrictedPython/trunk/setup.cfg.in	2007-03-16 21:53:29 UTC (rev 73255)
+++ RestrictedPython/trunk/setup.cfg.in	2007-03-17 05:52:33 UTC (rev 73256)
@@ -1,6 +0,0 @@
-[development]
-depends = zope.testing
-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1

Modified: RestrictedPython/trunk/setup.py
===================================================================
--- RestrictedPython/trunk/setup.py	2007-03-16 21:53:29 UTC (rev 73255)
+++ RestrictedPython/trunk/setup.py	2007-03-17 05:52:33 UTC (rev 73256)
@@ -18,25 +18,31 @@
 
 import os
 
-try:
-    from setuptools import setup, Extension
-except ImportError, e:
-    from distutils.core import setup, Extension
+from setuptools import setup, Extension
 
-setup(name='RestrictedPython',
-      version='1.0',
-      url='http://svn.zope.org/RestrictedPython',
+def read(*rnames):
+    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+
+name = 'RestrictedPython'
+setup(name=name,
+      version='3.4dev',
+      url='http://svn.zope.org/'+name,
       license='ZPL 2.1',
       description='Restricted Python executiion handlers',
       author='Zope Corporation and Contributors',
       author_email='zope3-dev at zope.org',
-      long_description='',
-      
-      packages=['RestrictedPython'],
-      package_dir = {'': os.path.join(os.path.dirname(__file__), 'src')},
+      long_description=(
+        read('README.txt')
+        + '\n' +
+        'Download\n'
+        '**********************\n'
+        ),
 
+      packages = ['RestrictedPython'],
+      package_dir = {'': 'src'},
+
       tests_require = ['zope.testing'],
-      install_requires=[],
+      install_requires = ['setuptools'],
       include_package_data = True,
 
       zip_safe = False,

Deleted: RestrictedPython/trunk/test.py
===================================================================
--- RestrictedPython/trunk/test.py	2007-03-16 21:53:29 UTC (rev 73255)
+++ RestrictedPython/trunk/test.py	2007-03-17 05:52:33 UTC (rev 73256)
@@ -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', 'RestrictedPython',
-    '--tests-pattern', '^tests$',
-    ]
-
-sys.exit(testrunner.run(defaults))
-



More information about the Checkins mailing list