Update folder structure of egg

Remove zope.interface dependency
Use regular unittest

No change in API, no bug fix

erp5diff

-#! /usr/bin/python
-
-##############################################################################
-#
-# Yoshinori OKUJI <yo@nexedi.com>
-#
-# Copyright (C) 2003 Nexedi SARL
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ?See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ?02111-1307, USA.
-#
-##############################################################################
-
-from ERP5Diff import main
-
-main()
\ No newline at end of file

setup.py

@@ -5,27 +5,28 @@ from setuptools import setup, find_packages
 import re
 
 api_version = re.search(r'\s*__version__\s*=\s*(\S+)',
-                        open('ERP5Diff.py').read()).group(1).strip()
+                        open('src/ERP5Diff.py').read()).group(1).strip()
 revision = 0
 version = '%s.%s' % (api_version.replace("'", ''), revision)
 
+
 setup(name="erp5diff",
       version=version,
       description="XUpdate Generator for ERP5",
       author="Yoshinori OKUJI",
       author_email="yo@nexedi.com",
       url="http://www.erp5.org/",
-      download_url="http://www.nexedi.org/static/packages/source/erp5diff-%s.tar.gz" % version,
       license="GPL",
-      packages=find_packages(),
-      py_modules=["ERP5Diff"],
-      scripts=["erp5diff"],
-      data_files=[('share/man/man1', ['erp5diff.1'])],
-      install_requires=['zope.interface', 'lxml'],
+      packages=find_packages('src'),
+      package_dir={'': 'src'},
+      entry_points={'console_scripts': ["erp5diff = ERP5Diff:main"]},
+      data_files=[('share/man/man1', ['src/erp5diff.1'])],
+      install_requires=['lxml'],
       classifiers=['License :: OSI Approved :: GNU General Public License (GPL)',
                   'Operating System :: OS Independent',
                   'Topic :: Text Processing :: Markup :: XML',
                   'Topic :: Utilities'],
       include_package_data=True,
       zip_safe=False,
+      test_suite='tests',
      )

tests.py

-from zope import interface
-
-import zope.testing
-import unittest
-
-OPTIONFLAGS = (zope.testing.doctest.ELLIPSIS |
-               zope.testing.doctest.NORMALIZE_WHITESPACE)
-
-
-def test_suite():
-    doctests = ('README',)
-
-    globs = dict(interface=interface)
-  
-    return unittest.TestSuite((
-        zope.testing.doctest.DocFileSuite(doctest,
-                                          optionflags=OPTIONFLAGS,
-                                          globs=globs,
-                                          ) for doctest in doctests
-        ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')