post-git cleanup

zopefoundation · Mar 2, 2013 · 710f22a · 710f22a
1 parent 487f927
commit 710f22a
Show file tree

Hide file tree

Showing 28 changed files with 56 additions and 36 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
@@ -0,0 +1,7 @@
+include *.rst
+include *.txt
+
+recursive-include src *
+
+global-exclude *.pyc
+global-exclude *.pyo
diff --git a/README.txt → README.rst b/README.txt → README.rst
diff --git a/setup.py b/setup.py
@@ -1,36 +1,39 @@
 from setuptools import setup, find_packages
 
-version = '0.7.1'
+__version__ = '0.7.1'
 
-setup(name='z3c.jbot',
-      version=version,
-      description="Drop-in template overrides.",
-      long_description="\n".join(
-          (open("README.txt").read(), open("CHANGES.txt").read())),
-      classifiers=[
+setup(
+    name='z3c.jbot',
+    version=__version__,
+    description="Drop-in template overrides.",
+    long_description=(open('README.rst').read() + "\n" +
+                      open('CHANGES.rst').read()),
+    classifiers=[
         "Framework :: Zope2",
         "Framework :: Zope3",
         "Programming Language :: Python",
-        ],
-      keywords='page template override',
-      author='Malthe Borch',
-      author_email='mborch@gmail.com',
-      url='',
-      license='ZPL',
-      packages=find_packages(exclude=['ez_setup']),
-      namespace_packages=['z3c'],
-      include_package_data=True,
-      zip_safe=False,
-      install_requires=[
-          'setuptools',
-          'zope.pagetemplate',
-          'zope.component',
-          'zope.configuration',
-          'zope.security',
-          'zope.publisher',
-      ],
-      entry_points="""
-      [z3c.autoinclude.plugin]
-      target = plone
-      """,
-      )
+    ],
+    keywords='page template override',
+
+    author='Zope Foundation and Contributors',
+    author_email='zope-dev@zope.org',
+    url='http://pypi.python.org/pypi/z3c.jbot',
+    license='ZPL 2.1',
+    packages=find_packages('src'),
+    package_dir={'': 'src'},
+    namespace_packages=['z3c'],
+    include_package_data=True,
+    zip_safe=False,
+    install_requires=[
+        'setuptools',
+        'zope.pagetemplate',
+        'zope.component',
+        'zope.configuration',
+        'zope.security',
+        'zope.publisher',
+    ],
+    entry_points="""
+    [z3c.autoinclude.plugin]
+    target = plone
+    """,
+)
diff --git a/src/z3c/__init__.py b/src/z3c/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/z3c/jbot/README.txt → src/z3c/jbot/README.txt b/z3c/jbot/README.txt → src/z3c/jbot/README.txt
diff --git a/z3c/jbot/__init__.py → src/z3c/jbot/__init__.py b/z3c/jbot/__init__.py → src/z3c/jbot/__init__.py
diff --git a/z3c/jbot/configure.zcml → src/z3c/jbot/configure.zcml b/z3c/jbot/configure.zcml → src/z3c/jbot/configure.zcml
diff --git a/z3c/jbot/interfaces.py → src/z3c/jbot/interfaces.py b/z3c/jbot/interfaces.py → src/z3c/jbot/interfaces.py
diff --git a/z3c/jbot/manager.py → src/z3c/jbot/manager.py b/z3c/jbot/manager.py → src/z3c/jbot/manager.py
diff --git a/z3c/jbot/meta.zcml → src/z3c/jbot/meta.zcml b/z3c/jbot/meta.zcml → src/z3c/jbot/meta.zcml
diff --git a/z3c/jbot/metaconfigure.py → src/z3c/jbot/metaconfigure.py b/z3c/jbot/metaconfigure.py → src/z3c/jbot/metaconfigure.py
diff --git a/z3c/jbot/metadirectives.py → src/z3c/jbot/metadirectives.py b/z3c/jbot/metadirectives.py → src/z3c/jbot/metadirectives.py
diff --git a/z3c/jbot/patches.py → src/z3c/jbot/patches.py b/z3c/jbot/patches.py → src/z3c/jbot/patches.py
diff --git a/z3c/jbot/tests/__init__.py → src/z3c/jbot/tests/__init__.py b/z3c/jbot/tests/__init__.py → src/z3c/jbot/tests/__init__.py
diff --git a/z3c/jbot/tests/common.py → src/z3c/jbot/tests/common.py b/z3c/jbot/tests/common.py → src/z3c/jbot/tests/common.py
diff --git a/.../http/z3c.jbot.tests.templates.example.pt → .../http/z3c.jbot.tests.templates.example.pt b/.../http/z3c.jbot.tests.templates.example.pt → .../http/z3c.jbot.tests.templates.example.pt
diff --git a/...https/z3c.jbot.tests.templates.example.pt → ...https/z3c.jbot.tests.templates.example.pt b/...https/z3c.jbot.tests.templates.example.pt → ...https/z3c.jbot.tests.templates.example.pt
diff --git a/...rface/z3c.jbot.tests.templates.example.pt → ...rface/z3c.jbot.tests.templates.example.pt b/...rface/z3c.jbot.tests.templates.example.pt → ...rface/z3c.jbot.tests.templates.example.pt
diff --git a/...quest/z3c.jbot.tests.templates.example.pt → ...quest/z3c.jbot.tests.templates.example.pt b/...quest/z3c.jbot.tests.templates.example.pt → ...quest/z3c.jbot.tests.templates.example.pt
diff --git a/z3c/jbot/tests/templates/example.pt → src/z3c/jbot/tests/templates/example.pt b/z3c/jbot/tests/templates/example.pt → src/z3c/jbot/tests/templates/example.pt
diff --git a/z3c/jbot/tests/test_doctests.py → src/z3c/jbot/tests/test_doctests.py b/z3c/jbot/tests/test_doctests.py → src/z3c/jbot/tests/test_doctests.py
diff --git a/z3c/jbot/tests/test_five.py → src/z3c/jbot/tests/test_five.py b/z3c/jbot/tests/test_five.py → src/z3c/jbot/tests/test_five.py
diff --git a/z3c/jbot/utility.py → src/z3c/jbot/utility.py b/z3c/jbot/utility.py → src/z3c/jbot/utility.py
diff --git a/z3c/__init__.py b/z3c/__init__.py