Split the bodhi package into multiple packages.

fixes fedora-infra#899
fixes fedora-infra#900

BODHI_MANIFEST.in

@@ -0,0 +1,3 @@
+include *.txt *.rst
+recursive-include docs *
+include COPYING

CLIENT_MANIFEST.in

@@ -0,0 +1 @@
+include COPYING *.txt

MANIFEST.in → SERVER_MANIFEST.in

@@ -1,9 +1,8 @@
-include *.txt *.ini *.cfg *.rst
+include *.txt *.ini *.cfg *.rst README.rst
 recursive-include bodhi *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.ttf *.woff *.woff2 *.eot *.otf *.svg
 recursive-include apache *
-recursive-include alembic *
+recursive-include alembic *.py *.mako *.rst
 recursive-include tools *
-recursive-include docs *
 recursive-include fedmsg.d *
 include bodhi/server/locale/.placeholder
 include COPYING

development.ini.example

@@ -1,5 +1,5 @@
 [app:main]
-use = egg:bodhi
+use = egg:bodhi-server
 
 ##
 ## Atomic OSTree support

production.ini

@@ -1,5 +1,5 @@
 [app:main]
-use = egg:bodhi
+use = egg:bodhi-server
 
 ##
 ## Messages

setup.py

@@ -11,12 +11,15 @@
 import sys
 
 from setuptools import setup, find_packages
+import setuptools.command.egg_info
+
 
 here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, 'README.rst')).read()
 CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
+VERSION = '2.1.9'
 
-requires = [
+server_requires = [
     'pyramid',
     'pyramid_mako',
     'pyramid_debugtoolbar',
@@ -63,43 +66,92 @@
 
     'Sphinx',
 
-    # For the bodhi-client
-    'click',
-
     'WebOb>=1.4.1',
     ]
 
 if sys.version_info[:3] < (2,7,0):
-    requires.append('importlib')
+    server_requires.append('importlib')
 
 if sys.version_info[:3] < (2,5,0):
-    requires.append('pysqlite')
+    server_requires.append('pysqlite')
+
+
+setuptools.command.egg_info.manifest_maker.template = 'BODHI_MANIFEST.in'
+
 
 setup(name='bodhi',
-      version='2.1.9',
-      description='bodhi',
+      version=VERSION,
+      description='bodhi common package',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
         "Programming Language :: Python",
-        "Framework :: Pyramid",
-        "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
       author='',
       author_email='',
       url='',
-      keywords='web fedora pyramid',
-      packages=find_packages(),
+      keywords='fedora',
+      packages=['bodhi'],
       include_package_data=True,
       zip_safe=False,
-      install_requires = requires,
+      install_requires = [],
       tests_require = [
           'nose',
           'nose-cov',
           'webtest',
           'mock'
       ],
       test_suite="nose.collector",
+      )
+
+
+setuptools.command.egg_info.manifest_maker.template = 'CLIENT_MANIFEST.in'
+
+
+setup(name='bodhi-client',
+      version=VERSION,
+      description='bodhi client',
+      long_description=README + '\n\n' +  CHANGES,
+      classifiers=[
+        "Programming Language :: Python",
+        ],
+      author='',
+      author_email='',
+      url='',
+      keywords='fedora',
+      packages=['bodhi.client'],
+      include_package_data=False,
+      zip_safe=False,
+      install_requires = ['click'],
+      entry_points = """\
+      [console_scripts]
+      bodhi = bodhi.client:cli
+      """,
+      )
+
+
+setuptools.command.egg_info.manifest_maker.template = 'SERVER_MANIFEST.in'
+
+
+setup(name='bodhi-server',
+      version=VERSION,
+      description='bodhi server',
+      long_description=README + '\n\n' +  CHANGES,
+      classifiers=[
+        "Programming Language :: Python",
+        "Framework :: Pyramid",
+        "Topic :: Internet :: WWW/HTTP",
+        "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
+        ],
+      author='',
+      author_email='',
+      url='',
+      keywords='web fedora pyramid',
+      packages=find_packages(
+          exclude=['bodhi', 'bodhi.client', 'bodhi.client.*', 'bodhi.tests', 'bodhi.tests.*']),
+      include_package_data=True,
+#      script_args=sys.argv.extend(['--template', 'TEST']),
+      zip_safe=False,
+      install_requires = server_requires,
       message_extractors = { '.': [
           #('**.py', 'lingua_python', None),
           #('**.mak', 'lingua_xml', None),
@@ -109,7 +161,6 @@
       main = bodhi.server:main
       [console_scripts]
       initialize_bodhi_db = bodhi.server.scripts.initializedb:main
-      bodhi = bodhi.client:cli
       bodhi-push = bodhi.server.push:push
       bodhi-expire-overrides = bodhi.server.scripts.expire_overrides:main
       bodhi-untag-branched = bodhi.server.scripts.untag_branched:main
@@ -121,4 +172,3 @@
       """,
       paster_plugins=['pyramid'],
       )
-

staging.ini

@@ -1,5 +1,5 @@
 [app:main]
-use = egg:bodhi
+use = egg:bodhi-server
 
 ##
 ## Messages