[Checkins] SVN: manuel/trunk/ - Conform to repository policy.
Stephan Richter
srichter at gmail.com
Wed Jun 9 21:01:46 EDT 2010
Log message for revision 113306:
- Conform to repository policy.
- Switch to using zope.testrunner instead of zope.testing due to API changes.
zope.testing is now only required for testing.
Changed:
U manuel/trunk/CHANGES.txt
A manuel/trunk/COPYRIGHT.txt
A manuel/trunk/LICENSE.txt
U manuel/trunk/buildout.cfg
U manuel/trunk/setup.py
U manuel/trunk/src/manuel/testing.py
-=-
Modified: manuel/trunk/CHANGES.txt
===================================================================
--- manuel/trunk/CHANGES.txt 2010-06-09 20:20:06 UTC (rev 113305)
+++ manuel/trunk/CHANGES.txt 2010-06-10 01:01:46 UTC (rev 113306)
@@ -1,6 +1,14 @@
CHANGES
=======
+1.2.0 (2010-06-09)
+------------------
+
+- Conform to repository policy.
+
+- Switch to using zope.testrunner instead of zope.testing due to API changes.
+ zope.testing is now only required for testing.
+
1.1.1 (2010-05-20)
------------------
Added: manuel/trunk/COPYRIGHT.txt
===================================================================
--- manuel/trunk/COPYRIGHT.txt (rev 0)
+++ manuel/trunk/COPYRIGHT.txt 2010-06-10 01:01:46 UTC (rev 113306)
@@ -0,0 +1 @@
+Zope Foundation and Contributors
\ No newline at end of file
Property changes on: manuel/trunk/COPYRIGHT.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Added: manuel/trunk/LICENSE.txt
===================================================================
--- manuel/trunk/LICENSE.txt (rev 0)
+++ manuel/trunk/LICENSE.txt 2010-06-10 01:01:46 UTC (rev 113306)
@@ -0,0 +1,44 @@
+Zope Public License (ZPL) Version 2.1
+
+A copyright notice accompanies this license document that identifies the
+copyright holders.
+
+This license has been certified as open source. It has also been designated as
+GPL compatible by the Free Software Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions in source code must retain the accompanying copyright
+notice, this list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the accompanying copyright
+notice, this list of conditions, and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Names of the copyright holders must not be used to endorse or promote
+products derived from this software without prior written permission from the
+copyright holders.
+
+4. The right to distribute this software or to use it for any purpose does not
+give you the right to use Servicemarks (sm) or Trademarks (tm) of the
+copyright
+holders. Use of them is covered by separate agreement with the copyright
+holders.
+
+5. If any files are modified, you must cause the modified files to carry
+prominent notices stating that you changed the files and the date of any
+change.
+
+Disclaimer
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Property changes on: manuel/trunk/LICENSE.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: manuel/trunk/buildout.cfg
===================================================================
--- manuel/trunk/buildout.cfg 2010-06-09 20:20:06 UTC (rev 113305)
+++ manuel/trunk/buildout.cfg 2010-06-10 01:01:46 UTC (rev 113306)
@@ -7,7 +7,7 @@
[test]
recipe = zc.recipe.testrunner
-eggs = manuel
+eggs = manuel [tests]
defaults = '--tests-pattern tests --exit-with-status -1 --auto-color'.split()
working-directory = .
@@ -45,6 +45,7 @@
PILwoTk = 1.1.6.3
Pygments = 1.0
Sphinx = 0.6.1
+distribute = 0.6.13
docutils = 0.5
iw.recipe.cmd = 0.3
nose = 0.11.1
@@ -52,7 +53,8 @@
setuptools = 0.6c11
zc.buildout = 1.2.1
zc.recipe.egg = 1.2.2
-zc.recipe.testrunner = 1.2.0
+zc.recipe.testrunner = 1.3.0
zope.exceptions = 3.6.0
zope.interface = 3.5.1
zope.testing = 3.9.1
+zope.testrunner = 4.0.0b2
Modified: manuel/trunk/setup.py
===================================================================
--- manuel/trunk/setup.py 2010-06-09 20:20:06 UTC (rev 113305)
+++ manuel/trunk/setup.py 2010-06-10 01:01:46 UTC (rev 113306)
@@ -1,5 +1,19 @@
+##############################################################################
+#
+# Copyright (c) 2004-2007 Zope Foundation 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.
+#
+##############################################################################
+"""Setup for manuel package
+"""
from setuptools import setup, find_packages
-import os
long_description = (
open('README.txt').read()
@@ -9,7 +23,7 @@
setup(
name='manuel',
- version='0',
+ version='1.2.0dev',
url = 'http://pypi.python.org/pypi/manuel',
packages=find_packages('src'),
package_dir={'':'src'},
@@ -18,9 +32,12 @@
author_email='benji at benjiyork.com',
description= 'Manuel lets you build tested documentation.',
license='ZPL',
+ extras_require={
+ 'tests': ['zope.testing']
+ },
install_requires=[
'setuptools',
- 'zope.testing >= 3.9.1',
+ 'zope.testrunner',
],
include_package_data=True,
long_description = long_description,
Modified: manuel/trunk/src/manuel/testing.py
===================================================================
--- manuel/trunk/src/manuel/testing.py 2010-06-09 20:20:06 UTC (rev 113305)
+++ manuel/trunk/src/manuel/testing.py 2010-06-10 01:01:46 UTC (rev 113306)
@@ -5,7 +5,7 @@
import os.path
import sys
import unittest
-import zope.testing.exceptions
+import zope.testrunner.exceptions
__all__ = ['TestSuite']
@@ -39,7 +39,7 @@
results = [r.formatted for r in self.regions if r.formatted]
if results:
DIVIDER = '-'*70 + '\n'
- raise zope.testing.exceptions.DocTestFailureException(
+ raise zope.testrunner.exceptions.DocTestFailureException(
'\n' + DIVIDER + DIVIDER.join(results))
def debug(self):
More information about the checkins
mailing list