[Checkins] SVN: zc.vault/trunk/ Use eggs instead of zope3 checkout.
Zvezdan Petkovic
zvezdan at zope.com
Fri Apr 8 17:18:35 EDT 2011
Log message for revision 121357:
Use eggs instead of zope3 checkout.
Also:
- Use doctest instead of zope.testing.doctest.
- Update tests to run with ZTK.
Changed:
A zc.vault/trunk/CHANGES.txt
U zc.vault/trunk/README.txt
U zc.vault/trunk/buildout.cfg
U zc.vault/trunk/setup.py
U zc.vault/trunk/src/zc/vault/README.txt
U zc.vault/trunk/src/zc/vault/tests.py
U zc.vault/trunk/src/zc/vault/versions.txt
-=-
Added: zc.vault/trunk/CHANGES.txt
===================================================================
--- zc.vault/trunk/CHANGES.txt (rev 0)
+++ zc.vault/trunk/CHANGES.txt 2011-04-08 21:18:35 UTC (rev 121357)
@@ -0,0 +1,25 @@
+=======
+CHANGES
+=======
+
+0.11 (unreleased)
+=================
+
+- Use eggs instead of zope3 checkout.
+- Use Python's `doctest` module instead of the deprecated
+ `zope.testing.doctest`.
+- Update tests to run with ZTK 1.0.
+
+
+0.10 (2008-03-04)
+=================
+
+- Add a dependency on `rwproperty` instead of using a copy of it.
+- Add `zc.vault.versions.Traversable`.
+- Fix a bug for rename after freeze in r <= 78553.
+
+
+0.9 (2006-12-03)
+================
+
+Initial egg release.
Property changes on: zc.vault/trunk/CHANGES.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: zc.vault/trunk/README.txt
===================================================================
--- zc.vault/trunk/README.txt 2011-04-08 20:40:07 UTC (rev 121356)
+++ zc.vault/trunk/README.txt 2011-04-08 21:18:35 UTC (rev 121357)
@@ -1,2 +1,9 @@
-Low-level versioning support similar to revision control systems, with an
-example usage and several example add-ons. ZODB-friendly.
+*********
+zc.vault
+*********
+
+The `zc.vault` package provides a low-level versioning support similar
+to revision control systems, with an example usage and several example
+add-ons. It's ZODB-friendly.
+
+.. See ``src/zc/vault/README.txt`` for details.
Modified: zc.vault/trunk/buildout.cfg
===================================================================
--- zc.vault/trunk/buildout.cfg 2011-04-08 20:40:07 UTC (rev 121356)
+++ zc.vault/trunk/buildout.cfg 2011-04-08 21:18:35 UTC (rev 121357)
@@ -1,15 +1,12 @@
[buildout]
develop = .
-parts = zope3 test
+parts = py test
-find-links = http://download.zope.org/distribution/
+[py]
+recipe = zc.recipe.egg
+eggs = zc.vault
+interpreter = py
[test]
recipe = zc.recipe.testrunner
-eggs = zc.vault
-extra-paths = parts/zope3/src
-
-[zope3]
-recipe = zc.recipe.zope3checkout
-url = svn://svn.zope.org/repos/main/Zope3/branches/3.3
-
+eggs = zc.vault [test]
Modified: zc.vault/trunk/setup.py
===================================================================
--- zc.vault/trunk/setup.py 2011-04-08 20:40:07 UTC (rev 121356)
+++ zc.vault/trunk/setup.py 2011-04-08 21:18:35 UTC (rev 121357)
@@ -1,26 +1,88 @@
+"""Low-level versioning support"""
+
+import os
from setuptools import setup, find_packages
+
+def read(*rnames):
+ return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+
+
+tests_require = [
+ 'transaction',
+ 'zope.annotation',
+ 'zope.app.component',
+ 'zope.app.folder',
+ 'zope.app.testing',
+ 'zope.testing',
+ ]
+
+
setup(
name="zc.vault",
- version="0.10",
+ version="0.11dev",
+ author='Zope Project',
+ author_email='zope-dev at zope.org',
+ description=__doc__,
+ long_description='\n\n'.join([
+ read('README.txt'),
+ '.. contents::',
+ '\n'.join([
+ 'Detailed Documentation',
+ '**********************',
+ ]),
+ read('src', 'zc', 'vault', 'README.txt'),
+ read('CHANGES.txt'),
+ ]),
+ license='ZPL 2.1',
+ keywords="Zope Zope3 version control vault",
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Web Environment',
+ 'Framework :: Zope3',
+ 'Intended Audience :: Developers',
+ 'License :: OSI Approved :: Zope Public License',
+ 'Natural Language :: English',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Topic :: Internet :: WWW/HTTP',
+ 'Topic :: Software Development :: Libraries :: Python Modules',
+ ],
+ url='http://pypi.python.org/pypi/zc.vault',
+ packages=find_packages('src'),
+ package_dir={'': 'src'},
+ namespace_packages=['zc'],
+ include_package_data=True,
+ zip_safe=False,
install_requires=[
+ 'rwproperty',
'setuptools',
+ 'zc.copy',
+ 'zc.freeze',
+ 'zc.objectlog',
'zc.relationship',
- 'zc.freeze',
- 'rwproperty',
+ 'zc.shortcut',
+ 'ZODB3',
+ 'zope.app.container',
+ 'zope.app.intid',
+ 'zope.app.keyreference',
+ 'zope.cachedescriptors',
+ 'zope.component',
+ 'zope.copypastemove',
+ 'zope.event',
+ 'zope.i18n',
+ 'zope.i18nmessageid',
+ 'zope.interface',
+ 'zope.lifecycleevent',
+ 'zope.location',
+ 'zope.proxy',
+ 'zope.publisher',
+ 'zope.schema',
+ 'zope.traversing',
],
-# dependency_links=['http://download.zope.org/distribution/',],
- packages=find_packages('src'),
- include_package_data=True,
- package_dir= {'':'src'},
-
- namespace_packages=['zc'],
-
- zip_safe=False,
- author='Zope Project',
- author_email='zope3-dev at zope.org',
- description=open("README.txt").read(),
- long_description=open("src/zc/vault/README.txt").read(),
- license='ZPL 2.1',
- keywords="zope zope3",
+ extras_require=dict(
+ test=tests_require,
+ ),
+ tests_require=tests_require,
+ test_suite='zc.vault.tests.test_suite',
)
Modified: zc.vault/trunk/src/zc/vault/README.txt
===================================================================
--- zc.vault/trunk/src/zc/vault/README.txt 2011-04-08 20:40:07 UTC (rev 121356)
+++ zc.vault/trunk/src/zc/vault/README.txt 2011-04-08 21:18:35 UTC (rev 121357)
@@ -1430,8 +1430,27 @@
copy between inventories. At the time of writing, this use case is
unnecessary, and doing so will have unspecified behavior.
-See also [#rename_after_freeze]_ for an important test case.
+.. topic:: A test for a subtle bug in revision <= 78553
+ One important case, at least for the regression testing is an
+ attempt to rename an item after the vault has been frozen.
+ Since we have just committed, this is the right time to try that.
+ Let's create a local copy of an inventory and try to rename some
+ items on it.
+
+ >>> v.manifest._z_frozen
+ True
+ >>> l = Inventory(Manifest(v.manifest))
+ >>> l.manifest._z_frozen
+ False
+ >>> l.contents('abe').items()
+ [('old_donald', <Demo u'd1'>), ('new_donald', <Demo u'Demo-2'>)]
+ >>> l.contents('abe')('old_donald').moveTo(l.contents('abe'), 'bob')
+ >>> l.contents('abe')('new_donald').moveTo(l.contents('abe'), 'donald')
+ >>> l.contents('abe').items()
+ [('bob', <Demo u'd1'>), ('donald', <Demo u'Demo-2'>)]
+
+
We have now discussed the core API for the vault system for basic use. A
number of other use cases are important, however:
@@ -2474,41 +2493,19 @@
-----------
-...commit messages? Could be added to event, so object log could use.
+.. Other topics.
-Need commit datetime stamp, users. Handled now by objectlog.
+ ...commit messages? Could be added to event, so object log could use.
-Show traversal adapters that use zc.shortcut code...
+ Need commit datetime stamp, users. Handled now by objectlog.
-Talk about tokens.
+ Show traversal adapters that use zc.shortcut code...
-Then talk about use case of having a reference be updated to a given object
-within a vault...
+ Talk about tokens.
-...a vault mirror that also keeps track of hierarchy?
+ Then talk about use case of having a reference be updated to a given object
+ within a vault...
-A special reference that knows both vault and token?
+ ...a vault mirror that also keeps track of hierarchy?
-
-Footnotes
-=========
-
-.. [#rename_after_freeze] A test for a subtle bug in revision <= 78553
-
-One important case, at least for the regression testing is an attempt to
-rename an item after the vault has been frozen. Since we have just
-committed, this is the right time to try that. Let's create a local
-copy of an inventory and try to rename some items on it.
-
- >>> v.manifest._z_frozen
- True
- >>> l = Inventory(Manifest(v.manifest))
- >>> l.manifest._z_frozen
- False
- >>> l.contents('abe').items()
- [('old_donald', <Demo u'd1'>), ('new_donald', <Demo u'Demo-2'>)]
- >>> l.contents('abe')('old_donald').moveTo(l.contents('abe'), 'bob')
- >>> l.contents('abe')('new_donald').moveTo(l.contents('abe'), 'donald')
- >>> l.contents('abe').items()
- [('bob', <Demo u'd1'>), ('donald', <Demo u'Demo-2'>)]
-
+ A special reference that knows both vault and token?
Modified: zc.vault/trunk/src/zc/vault/tests.py
===================================================================
--- zc.vault/trunk/src/zc/vault/tests.py 2011-04-08 20:40:07 UTC (rev 121356)
+++ zc.vault/trunk/src/zc/vault/tests.py 2011-04-08 21:18:35 UTC (rev 121357)
@@ -11,13 +11,14 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Relationship tests
+"""Vault tests
-$Id$
"""
+
+import doctest
import unittest
import re
-from zope.testing import doctest, renormalizing
+from zope.testing import renormalizing
import zope.testing.module
# these are used by setup
@@ -144,8 +145,7 @@
tests = (
doctest.DocFileSuite(
'README.txt',
- setUp=setUp, tearDown=tearDown, checker=checker,
- optionflags=doctest.INTERPRET_FOOTNOTES),
+ setUp=setUp, tearDown=tearDown, checker=checker),
doctest.DocFileSuite(
'versions.txt',
setUp=setUp, tearDown=tearDown),
@@ -178,6 +178,3 @@
pass
return unittest.TestSuite(tests)
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Modified: zc.vault/trunk/src/zc/vault/versions.txt
===================================================================
--- zc.vault/trunk/src/zc/vault/versions.txt 2011-04-08 20:40:07 UTC (rev 121356)
+++ zc.vault/trunk/src/zc/vault/versions.txt 2011-04-08 21:18:35 UTC (rev 121357)
@@ -166,7 +166,7 @@
>>> traversable.traverse('5', [])
Traceback (most recent call last):
...
- TraversalError: '5'
+ LocationError: '5'
With this stuff, I usually like to make sure we can actually commit the
transaction.
More information about the checkins
mailing list