post-git cleanup

zopefoundation · Mar 2, 2013 · fa18acb · fa18acb
1 parent ce31bb6
commit fa18acb
Show file tree

Hide file tree

Showing 50 changed files with 46 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,15 @@
+bin
+build
+develop-eggs
+dist
+lib
+include
+man
+parts
+
+__pycache__
+.*
+*.dll
+*.pyc
+*.pyo
+*.so
diff --git a/CHANGES.txt → CHANGES.rst b/CHANGES.txt → CHANGES.rst
diff --git a/COPYRIGHT.txt → COPYRIGHT.rst b/COPYRIGHT.txt → COPYRIGHT.rst
diff --git a/LICENSE.txt → LICENSE.rst b/LICENSE.txt → LICENSE.rst
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,7 @@
-include *
+include *.rst
+include *.txt
 
-recursive-include Products *
+recursive-include src *
 
-global-exclude *pyc
+global-exclude *.pyc
+global-exclude *.pyo
diff --git a/Products/__init__.py b/Products/__init__.py
diff --git a/README.rst b/README.rst
@@ -0,0 +1,4 @@
+Overview
+========
+
+Zope Version Control for the Zope application server.
diff --git a/README.txt b/README.txt
diff --git a/setup.py b/setup.py
@@ -1,28 +1,32 @@
 from setuptools import setup, find_packages
 
+__version__ = '1.1.4dev'
 
-setup(name='Products.ZopeVersionControl',
-      version='1.1.4dev',
-      description="Zope Version Control",
-      long_description=open("CHANGES.txt").read(),
-      classifiers=[
+setup(
+    name='Products.ZopeVersionControl',
+    version=__version__,
+    description="Zope Version Control",
+    long_description=(open('README.rst').read() + "\n" +
+                      open('CHANGES.rst').read()),
+    classifiers=[
         'Framework :: Zope2',
-      ],
-      license='ZPL',
-      author='Zope Corporation and Contributors',
-      author_email='zope-dev@zope.org',
-      url='http://pypi.python.org/pypi/Products.ZopeVersionControl',
-      packages=find_packages(),
-      namespace_packages=['Products'],
-      include_package_data=True,
-      zip_safe=False,
-      install_requires=[
+    ],
+    license='ZPL',
+    author='Zope Foundation and Contributors',
+    author_email='zope-dev@zope.org',
+    url='http://pypi.python.org/pypi/Products.ZopeVersionControl',
+    packages=find_packages('src'),
+    package_dir={'': 'src'},
+    namespace_packages=['Products'],
+    include_package_data=True,
+    zip_safe=False,
+    install_requires=[
         'setuptools',
         'zope.interface',
         'Acquisition',
         'DateTime',
         'transaction',
         'ZODB3',
         'Zope2',
-      ],
-      )
+    ],
+)
diff --git a/Products/ZopeVersionControl/EventLog.py → src/Products/ZopeVersionControl/EventLog.py b/Products/ZopeVersionControl/EventLog.py → src/Products/ZopeVersionControl/EventLog.py
diff --git a/Products/ZopeVersionControl/Repository.py → ...Products/ZopeVersionControl/Repository.py b/Products/ZopeVersionControl/Repository.py → ...Products/ZopeVersionControl/Repository.py
diff --git a/...cts/ZopeVersionControl/SequenceWrapper.py → ...cts/ZopeVersionControl/SequenceWrapper.py b/...cts/ZopeVersionControl/SequenceWrapper.py → ...cts/ZopeVersionControl/SequenceWrapper.py
diff --git a/Products/ZopeVersionControl/Utility.py → src/Products/ZopeVersionControl/Utility.py b/Products/ZopeVersionControl/Utility.py → src/Products/ZopeVersionControl/Utility.py
diff --git a/Products/ZopeVersionControl/Version.py → src/Products/ZopeVersionControl/Version.py b/Products/ZopeVersionControl/Version.py → src/Products/ZopeVersionControl/Version.py
diff --git a/...ucts/ZopeVersionControl/VersionHistory.py → ...ucts/ZopeVersionControl/VersionHistory.py b/...ucts/ZopeVersionControl/VersionHistory.py → ...ucts/ZopeVersionControl/VersionHistory.py
diff --git a/...ucts/ZopeVersionControl/VersionSupport.py → ...ucts/ZopeVersionControl/VersionSupport.py b/...ucts/ZopeVersionControl/VersionSupport.py → ...ucts/ZopeVersionControl/VersionSupport.py
diff --git a/...ucts/ZopeVersionControl/ZopeRepository.py → ...ucts/ZopeVersionControl/ZopeRepository.py b/...ucts/ZopeVersionControl/ZopeRepository.py → ...ucts/ZopeVersionControl/ZopeRepository.py
diff --git a/Products/ZopeVersionControl/ZopeVersion.py → ...roducts/ZopeVersionControl/ZopeVersion.py b/Products/ZopeVersionControl/ZopeVersion.py → ...roducts/ZopeVersionControl/ZopeVersion.py
diff --git a/.../ZopeVersionControl/ZopeVersionHistory.py → .../ZopeVersionControl/ZopeVersionHistory.py b/.../ZopeVersionControl/ZopeVersionHistory.py → .../ZopeVersionControl/ZopeVersionHistory.py
diff --git a/Products/ZopeVersionControl/__init__.py → src/Products/ZopeVersionControl/__init__.py b/Products/ZopeVersionControl/__init__.py → src/Products/ZopeVersionControl/__init__.py
diff --git a/...ersionControl/dtml/RepositoryAddForm.dtml → ...ersionControl/dtml/RepositoryAddForm.dtml b/...ersionControl/dtml/RepositoryAddForm.dtml → ...ersionControl/dtml/RepositoryAddForm.dtml
diff --git a/...ionControl/dtml/RepositoryManageMain.dtml → ...ionControl/dtml/RepositoryManageMain.dtml b/...ionControl/dtml/RepositoryManageMain.dtml → ...ionControl/dtml/RepositoryManageMain.dtml
diff --git a/...ionControl/dtml/RepositoryProperties.dtml → ...ionControl/dtml/RepositoryProperties.dtml b/...ionControl/dtml/RepositoryProperties.dtml → ...ionControl/dtml/RepositoryProperties.dtml
diff --git a/...ersionControl/dtml/VersionControlLog.dtml → ...ersionControl/dtml/VersionControlLog.dtml b/...ersionControl/dtml/VersionControlLog.dtml → ...ersionControl/dtml/VersionControlLog.dtml
diff --git a/...rsionControl/dtml/VersionControlMain.dtml → ...rsionControl/dtml/VersionControlMain.dtml b/...rsionControl/dtml/VersionControlMain.dtml → ...rsionControl/dtml/VersionControlMain.dtml
diff --git a/...ontrol/dtml/VersionHistoryManageMain.dtml → ...ontrol/dtml/VersionHistoryManageMain.dtml b/...ontrol/dtml/VersionHistoryManageMain.dtml → ...ontrol/dtml/VersionHistoryManageMain.dtml
diff --git a/...ontrol/dtml/VersionHistoryProperties.dtml → ...ontrol/dtml/VersionHistoryProperties.dtml b/...ontrol/dtml/VersionHistoryProperties.dtml → ...ontrol/dtml/VersionHistoryProperties.dtml
diff --git a/...ersionControl/dtml/VersionManageMain.dtml → ...ersionControl/dtml/VersionManageMain.dtml b/...ersionControl/dtml/VersionManageMain.dtml → ...ersionControl/dtml/VersionManageMain.dtml
diff --git a/...ersionControl/dtml/VersionProperties.dtml → ...ersionControl/dtml/VersionProperties.dtml b/...ersionControl/dtml/VersionProperties.dtml → ...ersionControl/dtml/VersionProperties.dtml
diff --git a/...opeVersionControl/help/Repository-Add.stx → ...opeVersionControl/help/Repository-Add.stx b/...opeVersionControl/help/Repository-Add.stx → ...opeVersionControl/help/Repository-Add.stx
diff --git a/...VersionControl/help/Repository-Manage.stx → ...VersionControl/help/Repository-Manage.stx b/...VersionControl/help/Repository-Manage.stx → ...VersionControl/help/Repository-Manage.stx
diff --git a/...ionControl/help/Repository-Properties.stx → ...ionControl/help/Repository-Properties.stx b/...ionControl/help/Repository-Properties.stx → ...ionControl/help/Repository-Properties.stx
diff --git a/...opeVersionControl/help/Version-Manage.stx → ...opeVersionControl/help/Version-Manage.stx b/...opeVersionControl/help/Version-Manage.stx → ...opeVersionControl/help/Version-Manage.stx
diff --git a/...ersionControl/help/Version-Properties.stx → ...ersionControl/help/Version-Properties.stx b/...ersionControl/help/Version-Properties.stx → ...ersionControl/help/Version-Properties.stx
diff --git a/...opeVersionControl/help/VersionControl.stx → ...opeVersionControl/help/VersionControl.stx b/...opeVersionControl/help/VersionControl.stx → ...opeVersionControl/help/VersionControl.stx
diff --git a/...ionControl/help/VersionHistory-Manage.stx → ...ionControl/help/VersionHistory-Manage.stx b/...ionControl/help/VersionHistory-Manage.stx → ...ionControl/help/VersionHistory-Manage.stx
diff --git a/...ontrol/help/VersionHistory-Properties.stx → ...ontrol/help/VersionHistory-Properties.stx b/...ontrol/help/VersionHistory-Properties.stx → ...ontrol/help/VersionHistory-Properties.stx
diff --git a/Products/ZopeVersionControl/interfaces.py → ...Products/ZopeVersionControl/interfaces.py b/Products/ZopeVersionControl/interfaces.py → ...Products/ZopeVersionControl/interfaces.py
diff --git a/Products/ZopeVersionControl/issues.txt → src/Products/ZopeVersionControl/issues.txt b/Products/ZopeVersionControl/issues.txt → src/Products/ZopeVersionControl/issues.txt
diff --git a/Products/ZopeVersionControl/nonversioned.py → ...oducts/ZopeVersionControl/nonversioned.py b/Products/ZopeVersionControl/nonversioned.py → ...oducts/ZopeVersionControl/nonversioned.py
diff --git a/...ucts/ZopeVersionControl/tests/__init__.py → ...ucts/ZopeVersionControl/tests/__init__.py b/...ucts/ZopeVersionControl/tests/__init__.py → ...ucts/ZopeVersionControl/tests/__init__.py
diff --git a/Products/ZopeVersionControl/tests/common.py → ...oducts/ZopeVersionControl/tests/common.py b/Products/ZopeVersionControl/tests/common.py → ...oducts/ZopeVersionControl/tests/common.py
diff --git a/...nControl/tests/testReferenceVersioning.py → ...nControl/tests/testReferenceVersioning.py b/...nControl/tests/testReferenceVersioning.py → ...nControl/tests/testReferenceVersioning.py
diff --git a/...ersionControl/tests/testVersionControl.py → ...ersionControl/tests/testVersionControl.py b/...ersionControl/tests/testVersionControl.py → ...ersionControl/tests/testVersionControl.py
diff --git a/...ersionControl/tests/testVersionHistory.py → ...ersionControl/tests/testVersionHistory.py b/...ersionControl/tests/testVersionHistory.py → ...ersionControl/tests/testVersionHistory.py
diff --git a/...ucts/ZopeVersionControl/tests/test_all.py → ...ucts/ZopeVersionControl/tests/test_all.py b/...ucts/ZopeVersionControl/tests/test_all.py → ...ucts/ZopeVersionControl/tests/test_all.py
diff --git a/...cts/ZopeVersionControl/www/Repository.gif → ...cts/ZopeVersionControl/www/Repository.gif b/...cts/ZopeVersionControl/www/Repository.gif → ...cts/ZopeVersionControl/www/Repository.gif
diff --git a/Products/ZopeVersionControl/www/Version.gif → ...oducts/ZopeVersionControl/www/Version.gif b/Products/ZopeVersionControl/www/Version.gif → ...oducts/ZopeVersionControl/www/Version.gif
diff --git a/...ZopeVersionControl/www/VersionHistory.gif → ...ZopeVersionControl/www/VersionHistory.gif b/...ZopeVersionControl/www/VersionHistory.gif → ...ZopeVersionControl/www/VersionHistory.gif
diff --git a/src/Products/__init__.py b/src/Products/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)