[Checkins] SVN: z3c.recipe.egg_/trunk/ * Updated tests and requirements to zc.buildout 1.5.
Michael Howitz
mh at gocept.com
Thu Aug 26 02:45:25 EDT 2010
Log message for revision 115958:
* Updated tests and requirements to zc.buildout 1.5.
* Added not declared test dependency on ``zope.testing``.
* Using python's ``doctest`` module instead of deprecated
``zope.testing.doctest``.
* Fixed home page URL.
* Added change log.
Changed:
A z3c.recipe.egg_/trunk/CHANGES.txt
U z3c.recipe.egg_/trunk/setup.py
U z3c.recipe.egg_/trunk/z3c/recipe/egg/editable.txt
U z3c.recipe.egg_/trunk/z3c/recipe/egg/setup.txt
U z3c.recipe.egg_/trunk/z3c/recipe/egg/tests/tests.py
-=-
Added: z3c.recipe.egg_/trunk/CHANGES.txt
===================================================================
--- z3c.recipe.egg_/trunk/CHANGES.txt (rev 0)
+++ z3c.recipe.egg_/trunk/CHANGES.txt 2010-08-26 06:45:25 UTC (rev 115958)
@@ -0,0 +1,30 @@
+=========
+ Changes
+=========
+
+0.3 (unreleased)
+----------------
+
+* Updated tests and requirements to zc.buildout 1.5.
+
+* Added not declared test dependency on ``zope.testing``.
+
+* Using python's ``doctest`` module instead of deprecated
+ ``zope.testing.doctest``.
+
+* Fixed home page URL.
+
+* Added change log.
+
+
+0.2 (2008-06-07)
+----------------
+
+* ???
+
+0.1 (2007-10-01)
+----------------
+
+* Initial release.
+
+
Property changes on: z3c.recipe.egg_/trunk/CHANGES.txt
___________________________________________________________________
Added: svn:keywords
+ Id Rev Date
Added: svn:eol-style
+ native
Modified: z3c.recipe.egg_/trunk/setup.py
===================================================================
--- z3c.recipe.egg_/trunk/setup.py 2010-08-26 06:43:54 UTC (rev 115957)
+++ z3c.recipe.egg_/trunk/setup.py 2010-08-26 06:45:25 UTC (rev 115958)
@@ -1,14 +1,18 @@
from setuptools import setup, find_packages
-import os
+import os.path
-version = '0.3'
+def read(path):
+ return open(os.path.join(path), 'r').read() + '\n\n'
+version = '0.3dev'
+
setup(name='z3c.recipe.egg',
version=version,
description="Recipies based on zc.recipe.egg for working with source distributions.",
- long_description=open(os.path.join(os.path.dirname(__file__),
- 'README.txt')).read(),
- # Get more strings from http://www.python.org/pypi?%3Aaction=list_classifiers
+ long_description=(
+ '.. contents:: \n\n' +
+ read('README.txt') +
+ read('CHANGES.txt')),
classifiers=[
"Framework :: Plone",
"Framework :: Zope2",
@@ -19,7 +23,7 @@
keywords='',
author='Ross Patterson',
author_email='me at rpatterson.net',
- url='http://cheeseshop.python.org/pypi/z3c.recipe.egg',
+ url='http://pypi.python.org/pypi/z3c.recipe.egg',
license='ZPL',
packages=find_packages(exclude=['ez_setup']),
namespace_packages=['z3c', 'z3c.recipe'],
@@ -27,10 +31,15 @@
zip_safe=True,
install_requires=[
'setuptools',
- # -*- Extra requirements: -*-
- 'zc.recipe.egg',
+ 'zc.recipe.egg >= 1.3.0',
],
- extras_require=dict(test=['zc.buildout', 'zc.recipe.egg']),
+ extras_require=dict(
+ test=[
+ 'zc.buildout >= 1.5.0',
+ 'zc.recipe.egg',
+ 'zope.testing',
+ 'z3c.recipe.scripts',
+ ]),
entry_points="""
# -*- Entry points: -*-
[zc.buildout]
Modified: z3c.recipe.egg_/trunk/z3c/recipe/egg/editable.txt
===================================================================
--- z3c.recipe.egg_/trunk/z3c/recipe/egg/editable.txt 2010-08-26 06:43:54 UTC (rev 115957)
+++ z3c.recipe.egg_/trunk/z3c/recipe/egg/editable.txt 2010-08-26 06:45:25 UTC (rev 115958)
@@ -48,6 +48,7 @@
>>> ls(sample_buildout, 'develop-eggs')
- demoneeded.egg-link
- z3c.recipe.egg.egg-link
+ - z3c.recipe.scripts.egg-link
- zc.recipe.egg.egg-link
Multiple distributions can be specified.
@@ -135,6 +136,7 @@
Installing demoneeded.
>>> ls(sample_buildout, 'parts')
+ d buildout
>>> write(sample_buildout, 'buildout.cfg',
... """
@@ -153,6 +155,7 @@
Installing demoneeded.
>>> ls(sample_buildout, 'parts')
+ d buildout
If build-directory is specified, the source distributions will be
extracted there.
@@ -177,6 +180,7 @@
Installing demoneeded.
>>> ls(sample_buildout, 'parts')
+ d buildout
>>> ls(sample_buildout, 'src')
d demoneeded
d extdemo
Modified: z3c.recipe.egg_/trunk/z3c/recipe/egg/setup.txt
===================================================================
--- z3c.recipe.egg_/trunk/z3c/recipe/egg/setup.txt 2010-08-26 06:43:54 UTC (rev 115957)
+++ z3c.recipe.egg_/trunk/z3c/recipe/egg/setup.txt 2010-08-26 06:45:25 UTC (rev 115958)
@@ -54,7 +54,7 @@
- foo-0.0.0.tar.gz
>>> remove(sample_buildout, 'foo', 'dist', 'foo-0.0.0.tar.gz')
-
+
The setup script is also run on update.
>>> print system(buildout),
@@ -190,4 +190,5 @@
- bar.egg-link
- foo.egg-link
- z3c.recipe.egg.egg-link
+ - z3c.recipe.scripts.egg-link
- zc.recipe.egg.egg-link
Modified: z3c.recipe.egg_/trunk/z3c/recipe/egg/tests/tests.py
===================================================================
--- z3c.recipe.egg_/trunk/z3c/recipe/egg/tests/tests.py 2010-08-26 06:43:54 UTC (rev 115957)
+++ z3c.recipe.egg_/trunk/z3c/recipe/egg/tests/tests.py 2010-08-26 06:45:25 UTC (rev 115958)
@@ -1,8 +1,13 @@
-import unittest, os, shutil
-from zope.testing import doctest, renormalizing
+from zope.testing import renormalizing
+import doctest
+import os
+import re
+import shutil
+import unittest
import zc.buildout.testing
import zc.recipe.egg.tests
+
def setUp(test):
zc.recipe.egg.tests.setUp(test)
zc.buildout.testing.install_develop('z3c.recipe.egg', test)
@@ -16,9 +21,8 @@
'../setup.txt',
'../editable.txt',
setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown,
- optionflags=doctest.REPORT_NDIFF,
+ optionflags=doctest.REPORT_NDIFF|doctest.NORMALIZE_WHITESPACE,
checker=renormalizing.RENormalizing([
- zc.buildout.testing.normalize_path,]))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ zc.buildout.testing.normalize_path,
+ (re.compile('install_dir .*'), ''),
+ ]))
More information about the checkins
mailing list