[Checkins] SVN: zope.mkzeoinstance/trunk/ update some metadata, get rid of test_suite declaration

Hano Schlichting cvs-admin at zope.org
Fri Mar 1 23:25:16 UTC 2013


Log message for revision 129976:
  update some metadata, get rid of test_suite declaration
  

Changed:
  A   zope.mkzeoinstance/trunk/CHANGES.rst
  D   zope.mkzeoinstance/trunk/CHANGES.txt
  A   zope.mkzeoinstance/trunk/README.rst
  D   zope.mkzeoinstance/trunk/README.txt
  U   zope.mkzeoinstance/trunk/setup.py
  U   zope.mkzeoinstance/trunk/src/zope/mkzeoinstance/tests/test_unix.py

-=-
Copied: zope.mkzeoinstance/trunk/CHANGES.rst (from rev 129975, zope.mkzeoinstance/trunk/CHANGES.txt)
===================================================================
--- zope.mkzeoinstance/trunk/CHANGES.rst	                        (rev 0)
+++ zope.mkzeoinstance/trunk/CHANGES.rst	2013-03-01 23:25:15 UTC (rev 129976)
@@ -0,0 +1,33 @@
+``zope.mkzeoinstance`` Changelog
+================================
+
+3.9.6 (unreleased)
+------------------
+
+- TBD
+
+
+3.9.5 (2011-10-31)
+------------------
+
+- Place the socket used by the ``zeoctl`` control process to conmmunicate
+  with its ``runzeo`` daemaon in ``$INSTANCE_HOME/var``, instead of
+  ``$INSTANCE_HOME/etc`` (which would idealy not be writable by the process).
+  See: https://bugs.launchpad.net/zope.mkzeoinstance/+bug/175981
+
+
+3.9.4 (2010-04-22)
+------------------
+
+- Renamed the script / package ``mkzeoinstance`` to avoid clashing with the
+  script bundled with ZODB.
+
+- Added an option to spell the host interface to be listened on, as well as
+  the port the generated ZEO server configuration.  Thanks to Igor Stroh
+  for the patch.  See: https://bugs.launchpad.net/zodb/+bug/143361
+
+- Fixed generated templates to cope with the move of ``zdaemon`` code into
+  its own project.
+
+- Forked from the version of the ``mkzeoinst`` script contained in
+  ZODB 3.9.4.

Deleted: zope.mkzeoinstance/trunk/CHANGES.txt
===================================================================
--- zope.mkzeoinstance/trunk/CHANGES.txt	2013-03-01 16:49:20 UTC (rev 129975)
+++ zope.mkzeoinstance/trunk/CHANGES.txt	2013-03-01 23:25:15 UTC (rev 129976)
@@ -1,33 +0,0 @@
-``zope.mkzeoinstance`` Changelog
-================================
-
-3.9.6 (unreleased)
-------------------
-
-- TBD
-
-
-3.9.5 (2011-10-31)
-------------------
-
-- Place the socket used by the ``zeoctl`` control process to conmmunicate
-  with its ``runzeo`` daemaon in ``$INSTANCE_HOME/var``, instead of
-  ``$INSTANCE_HOME/etc`` (which would idealy not be writable by the process).
-  See: https://bugs.launchpad.net/zope.mkzeoinstance/+bug/175981
-
-
-3.9.4 (2010-04-22)
-------------------
-
-- Renamed the script / package ``mkzeoinstance`` to avoid clashing with the
-  script bundled with ZODB.
-
-- Added an option to spell the host interface to be listened on, as well as
-  the port the generated ZEO server configuration.  Thanks to Igor Stroh
-  for the patch.  See: https://bugs.launchpad.net/zodb/+bug/143361
-
-- Fixed generated templates to cope with the move of ``zdaemon`` code into
-  its own project.
-
-- Forked from the version of the ``mkzeoinst`` script contained in
-  ZODB 3.9.4.

Copied: zope.mkzeoinstance/trunk/README.rst (from rev 129975, zope.mkzeoinstance/trunk/README.txt)
===================================================================
--- zope.mkzeoinstance/trunk/README.rst	                        (rev 0)
+++ zope.mkzeoinstance/trunk/README.rst	2013-03-01 23:25:15 UTC (rev 129976)
@@ -0,0 +1,5 @@
+``zope.mkzeoinstance`` README
+=============================
+
+This package provides a single script, ``mkzeoinstance``, which creates
+a standalone ZEO server instance.

Deleted: zope.mkzeoinstance/trunk/README.txt
===================================================================
--- zope.mkzeoinstance/trunk/README.txt	2013-03-01 16:49:20 UTC (rev 129975)
+++ zope.mkzeoinstance/trunk/README.txt	2013-03-01 23:25:15 UTC (rev 129976)
@@ -1,5 +0,0 @@
-``zope.mkzeoinstance`` README
-=============================
-
-This package provides a single script, ``mkzeoinstance``, which creates
-a standalone ZEO server instance.

Modified: zope.mkzeoinstance/trunk/setup.py
===================================================================
--- zope.mkzeoinstance/trunk/setup.py	2013-03-01 16:49:20 UTC (rev 129975)
+++ zope.mkzeoinstance/trunk/setup.py	2013-03-01 23:25:15 UTC (rev 129976)
@@ -11,28 +11,26 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-""" Setup for zope.mkzeoinstance package
-"""
 
 import os
 from setuptools import setup, find_packages
 
+__version__ = '3.9.6dev'
+
+
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
+
 setup(
     name='zope.mkzeoinstance',
-    version='3.9.6dev',
+    version=__version__,
     url='http://pypi.python.org/pypi/zope.mkzeoinstance',
     license='ZPL 2.1',
     description='Make standalone ZEO database server instances',
     author='Zope Foundation and Contributors',
     author_email='zope-dev at zope.org',
-    long_description=(
-        read('README.txt')
-        + '\n' +
-        read('CHANGES.txt')
-        ),
+    long_description=read('README.rst') + '\n' + read('CHANGES.rst'),
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
@@ -41,22 +39,20 @@
         "Programming Language :: Python :: 2.4",
         "Programming Language :: Python :: 2.5",
         "Programming Language :: Python :: 2.6",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        ],
-
+    ],
     packages=find_packages('src'),
     package_dir={'': 'src'},
-    namespace_packages=['zope',],
+    namespace_packages=['zope'],
     include_package_data=True,
     install_requires=[
         'setuptools',
         'ZODB3 >= 3.9.4',
     ],
     zip_safe=False,
-    test_suite='zope.mkzeoinstance.tests.test_suite',
-    entry_points = {
+    test_suite='zope.mkzeoinstance.tests',
+    entry_points={
         'console_scripts': [
-         'mkzeoinstance = zope.mkzeoinstance:main',
-         ],
+            'mkzeoinstance = zope.mkzeoinstance:main',
+        ],
     },
 )

Modified: zope.mkzeoinstance/trunk/src/zope/mkzeoinstance/tests/test_unix.py
===================================================================
--- zope.mkzeoinstance/trunk/src/zope/mkzeoinstance/tests/test_unix.py	2013-03-01 16:49:20 UTC (rev 129975)
+++ zope.mkzeoinstance/trunk/src/zope/mkzeoinstance/tests/test_unix.py	2013-03-01 23:25:15 UTC (rev 129976)
@@ -261,10 +261,3 @@
 Changed mode for %(path)s to 755\n"""
         self.assertEqual(expected_out%{'path':path},
                          temp_out_file.getvalue())
-
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(ZeoInstanceParamsTest))
-    suite.addTest(unittest.makeSuite(ZeoInstanceCreateTest))
-    suite.addTest(unittest.makeSuite(UtilityFunctionsTest))
-    return suite



More information about the checkins mailing list