[Checkins] SVN: zope.app.fssync/branches/jim-hack/ Setup changes in preparation for a new release.
Amos Latteier
amos at latteier.com
Wed Mar 11 15:11:53 EDT 2009
Log message for revision 97911:
Setup changes in preparation for a new release.
Changed:
A zope.app.fssync/branches/jim-hack/CHANGES.txt
U zope.app.fssync/branches/jim-hack/README.txt
U zope.app.fssync/branches/jim-hack/setup.py
-=-
Added: zope.app.fssync/branches/jim-hack/CHANGES.txt
===================================================================
--- zope.app.fssync/branches/jim-hack/CHANGES.txt (rev 0)
+++ zope.app.fssync/branches/jim-hack/CHANGES.txt 2009-03-11 19:11:52 UTC (rev 97911)
@@ -0,0 +1,18 @@
+Changes
+=======
+
+3.5
+---
+
+* Added -v --verbose switches to zsync status command. Verbose is off
+ by default.
+
+* Added support for avoiding conflicts after commiting metadata files.
+
+* Added 'resolved' as an alias for the 'resolve' command.
+
+* Added a 'merge' command. It allows merging changes from one checkout
+ to another.
+
+* Added ssh network transport. The client can now use zsync+ssh://
+ urls to communicate with the server.
Modified: zope.app.fssync/branches/jim-hack/README.txt
===================================================================
--- zope.app.fssync/branches/jim-hack/README.txt 2009-03-11 18:59:29 UTC (rev 97910)
+++ zope.app.fssync/branches/jim-hack/README.txt 2009-03-11 19:11:52 UTC (rev 97911)
@@ -1,12 +1,11 @@
-******
-FSSync
-******
+File Synchronization for Zope3
+==============================
.. contents::
-The FSSync project (zope.app.fssync) provides support for filesystem
+The FSSync project (zope.app.fssync) provides support for filesystem
synchronization of Zope3 content that resides in a ZODB. This package defines
-a Web-based API with basic support for some standard zope.app content
+a Web-based API with basic support for some standard zope.app content
types and the standard security policy.
This project is build on top of the more general zope.fssync package
@@ -14,26 +13,26 @@
need a pure Python API which is independent of the ZODB and the Zope3
security machinery you should look at zope.fssync.
-FSSync includes a command line client that resembles svn or cvs. Type
+FSSync includes a command line client that resembles svn or cvs. Type::
bin/zsync help
-
-for available commands and further information. If you want to see the zsync
-client in action you can run the demo application:
+for available commands and further information. If you want to see the zsync
+client in action you can run the demo application::
+
bin/demo start
Open http://localhost:8080/manage in your browser and login with
``zsync`` as your username and password. Add a ``demo`` folder with
some files via the ZMI. After that run the command line client for an
-initial checkout:
+initial checkout::
bin/zsync checkout http://zsync:zsync@localhost:8080/demo ./parts/checkout
-Edit one of the files in the checkout directory and commit the changes:
+Edit one of the files in the checkout directory and commit the changes::
bin/zsync commit ./parts/checkout
-
+
The modified file should now be available on the server.
@@ -41,7 +40,7 @@
---
Zsync now supports communication over ssh in addition to http. ssh
-urls look like:
+urls look like::
zsync+ssh://user:passwd@host:port/path
@@ -55,14 +54,14 @@
There is an example ssh server in src/zope/app/fssync/demo_server.py
To use it, first make sure that zope is running. Then start the
-server:
+server::
sudo bin/demo-ssh-server
This starts a demo ssh server on port 2200. The server must be run as
root in order to read the ssh host keys.
-In another window use the zsync client to connect to it.
+In another terminal use the zsync client to connect to it::
bin/zsync co zsync+ssh://zsync:zsync@localhost:2200/demo parts/co2
@@ -83,10 +82,10 @@
entry-points = zsync=zope.app.fssync.main:main
If you want to use zope.app.fssync in your own application you propably have
-to define application specific serializers and deserializers. See
+to define application specific serializers and deserializers. See::
zope/app/fssync/fssync.txt
-
+
for further documentation. You probably also need your own zsync script with
additional dependencies. Simply add the necessary eggs to the corresponding
buildout snippet of your project.
Modified: zope.app.fssync/branches/jim-hack/setup.py
===================================================================
--- zope.app.fssync/branches/jim-hack/setup.py 2009-03-11 18:59:29 UTC (rev 97910)
+++ zope.app.fssync/branches/jim-hack/setup.py 2009-03-11 19:11:52 UTC (rev 97911)
@@ -2,21 +2,38 @@
from setuptools import setup, find_packages, Extension
+def read(*rnames):
+ return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+
setup(name='zope.app.fssync',
- version = '3.4.0b1',
- url='http://svn.zope.org/zope.app.fssync',
- license='ZPL 2.1',
- description='Zope app fssync',
- author='Zope Corporation and Contributors',
- author_email='zope3-dev at zope.org',
- long_description="Filesystem synchronization for Zope 3 Applications.",
-
- packages=find_packages('src'),
- package_dir = {'': 'src'},
-
- namespace_packages=['zope',],
- tests_require = ['zope.testing'],
- extras_require = dict(
+ version = '3.5',
+ url = 'http://pypi.python.org/pypi/zope.app.fssync',
+ license = 'ZPL 2.1',
+ description = "Filesystem synchronization utility for Zope 3.",
+ author= 'Zope Corporation and Contributors',
+ author_email= 'zope3-dev at zope.org',
+ long_description = (read('README.txt')
+ + '\n\n' +
+ read('CHANGES.txt')
+ ),
+ packages=find_packages('src'),
+ package_dir = {'': 'src'},
+ namespace_packages=['zope', 'zope.app'],
+
+ keywords = "zope3 serialization synchronization",
+ classifiers = [
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Web Environment',
+ 'Intended Audience :: Developers',
+ 'License :: OSI Approved :: Zope Public License',
+ 'Programming Language :: Python',
+ 'Natural Language :: English',
+ 'Operating System :: OS Independent',
+ 'Topic :: Internet :: WWW/HTTP',
+ 'Framework :: Zope3'],
+
+ tests_require = ['zope.testing'],
+ extras_require = dict(
app = ['zope.app.appsetup',
'zope.app.authentication',
'zope.app.component',
@@ -31,27 +48,27 @@
'zope.app.wsgi',
]
),
- install_requires=['setuptools',
- 'paramiko',
- 'zope.dublincore',
- 'zope.fssync',
- 'zope.i18nmessageid',
- 'zope.interface',
- 'zope.proxy',
- 'zope.testbrowser',
- 'zope.traversing',
- 'zope.xmlpickle',
- 'zope.app.catalog',
- 'zope.app.component',
- 'zope.app.dtmlpage',
- 'zope.app.file',
- 'zope.app.folder',
- 'zope.app.module',
- 'zope.app.securitypolicy',
- 'zope.app.zcmlfiles',
- 'zope.app.zptpage'
- ],
- include_package_data = True,
-
- zip_safe = False,
- )
+ install_requires=['setuptools',
+ 'paramiko',
+ 'zope.dublincore',
+ 'zope.fssync >= 3.5',
+ 'zope.i18nmessageid',
+ 'zope.interface',
+ 'zope.proxy',
+ 'zope.testbrowser',
+ 'zope.traversing',
+ 'zope.xmlpickle',
+ 'zope.app.catalog',
+ 'zope.app.component',
+ 'zope.app.dtmlpage',
+ 'zope.app.file',
+ 'zope.app.folder',
+ 'zope.app.module',
+ 'zope.app.securitypolicy',
+ 'zope.app.zcmlfiles',
+ 'zope.app.zptpage'
+ ],
+ include_package_data = True,
+
+ zip_safe = False,
+ )
More information about the Checkins
mailing list