Merge pull request #664 from normanjaeckel/Packaging

Update metafiles for new packaging style

.travis.yml

@@ -2,5 +2,5 @@ language: python
 python:
   - "2.6"
   - "2.7"
-install: "pip install -r requirements.txt --use-mirrors"
+install: "pip install -r requirements_development.txt --use-mirrors"
 script: "fab travis_ci"

INSTALL.txt

@@ -6,8 +6,9 @@ Content
 =======
 
 I.   Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI)
-II.  Installation on GNU/Linux and MacOSX using the sources
-III. Installation on Windows (32bit) using the Python Package Index (PyPI)
+II.  Installation on GNU/Linux and MacOSX using the package from openslides.org
+III. Installation on GNU/Linux and MacOSX using the sources (for development)
+IV.  Installation on Windows (32bit) using the Python Package Index (PyPI)
 
 If you need help ask on OpenSlides users mailing list.
 See http://openslides.org for more information.
@@ -49,9 +50,9 @@ I. Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI)
         OpenSlides will install the following required python packages:
           + Django
           + django-mptt
+          + reportlab
           + pillow
           + qrcode
-          + reportlab
           + tornado
           + bleach
           + beautifulsoup4
@@ -79,8 +80,23 @@ I. Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI)
         $ openslides
 
 
-II. Installation on GNU/Linux and MacOSX using the sources
-==========================================================
+II.   Installation on GNU/Linux and MacOSX using the package from openslides.org
+================================================================================
+
+  1. Get OpenSlides:
+  
+        Download latest OpenSlides release from http://openslides.org as
+        compressed tar archive.
+
+  2. Follow the same steps as in I. but use in step 3.
+
+        $ pip install openslides-XXX.tar.gz
+
+     instead of $ pip install openslides.
+
+
+III. Installation on GNU/Linux and MacOSX using the sources (for development)
+=============================================================================
 
   1. Check requirements:
 
@@ -93,11 +109,7 @@ II. Installation on GNU/Linux and MacOSX using the sources
 
   2. Get OpenSlides:
 
-     a) Download latest OpenSlides release from http://openslides.org.
-
-     OR
-
-     b) Clone current master version from OpenSlides' GitHub repository
+        Clone current master version from OpenSlides' GitHub repository
         https://github.com/OpenSlides/OpenSlides. This requires Git
         (see http://git-scm.com/).
 
@@ -124,7 +136,7 @@ II. Installation on GNU/Linux and MacOSX using the sources
 
   4. Install all required python packages:
 
-        $ pip install -r requirements.txt
+        $ pip install -r requirements_development.txt
 
   5. Start OpenSlides server and open URL in your default browser:
 
@@ -148,8 +160,8 @@ II. Installation on GNU/Linux and MacOSX using the sources
         $ python start.py
 
 
-III. Installation on Windows (32bit) using the Python Package Index (PyPI)
-==========================================================================
+IV. Installation on Windows (32bit) using the Python Package Index (PyPI)
+=========================================================================
 
 NOTE: There is a portable version of OpenSlides for Windows which does not
 required any install steps! If there is a reason that you can not use the

MANIFEST.in

@@ -2,29 +2,9 @@ include AUTHORS
 include CHANGELOG
 include INSTALL.txt
 include LICENSE
-include manage.py
 include README.txt
-include requirements.txt
 include THANKS
-
-recursive-include openslides/account/templates *
-recursive-include openslides/agenda/static *
-recursive-include openslides/agenda/templates *
-recursive-include openslides/assignment/static *
-recursive-include openslides/assignment/templates *
-recursive-include openslides/config/templates *
-recursive-include openslides/core/templates *
-recursive-include openslides/locale *.mo *.po
-recursive-include openslides/mediafile/static *
-recursive-include openslides/mediafile/templates *
-recursive-include openslides/motion/static *
-recursive-include openslides/motion/templates *
-recursive-include openslides/participant/static *
-recursive-include openslides/participant/templates *
-recursive-include openslides/poll/templates *
-recursive-include openslides/projector/static *
-recursive-include openslides/projector/templates *
-recursive-include openslides/static *
-recursive-include openslides/templates *
-
-recursive-include openslides *.html
+recursive-include openslides *.*
+recursive-exclude openslides *.pyc
+recursive-exclude openslides *.swp
+recursive-exclude openslides *~

requirements.txt

@@ -1,18 +0,0 @@
-# Requirements for OpenSlides
-Django==1.5.1
-django-mptt==0.5.5
-pillow==2.0.0
-qrcode==2.7
-reportlab==2.7
-tornado==3.0.1
-bleach==1.2.1
-beautifulsoup4==4.1.3
-
-# Requirements for development and tests
-Fabric==1.6.0
-coverage==3.6
-django-discover-runner==0.3
-pep8==1.4.5
-
-# For Python 2.6 support
-argparse==1.2.1

requirements_development.txt

@@ -0,0 +1,11 @@
+# Requirements for OpenSlides in production
+-r requirements_production.txt
+
+# Requirements for development and tests
+Fabric==1.6.0
+coverage==3.6
+django-discover-runner==0.3
+pep8==1.4.5
+
+# For Python 2.6 support
+argparse==1.2.1

requirements_production.txt

@@ -0,0 +1,8 @@
+Django==1.5.1
+django-mptt==0.5.5
+reportlab==2.7
+pillow==2.0.0
+qrcode==2.7
+tornado==3.0.1
+bleach==1.2.1
+beautifulsoup4==4.1.3

setup.py

@@ -7,8 +7,7 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-from setuptools import setup
-from setuptools import find_packages
+from setuptools import setup, find_packages
 from openslides import get_version
 
 
@@ -16,17 +15,22 @@ with open('README.txt') as readme:
     long_description = readme.read()
 
 
+with open('requirements_production.txt') as requirements_production:
+    install_requires = requirements_production.readlines()
+
+
+# For Python 2.6 support
+install_requires.append('argparse==1.2.1')
+
+
 setup(
     name='openslides',
-    description='Presentation and assembly system',
-    long_description=long_description,
     version=get_version(),
-    url='http://openslides.org',
     author='OpenSlides-Team',
     author_email='support@openslides.org',
-    license='GPL2+',
-    packages=find_packages(exclude=['tests']),
-    include_package_data = True,
+    url='http://openslides.org',
+    description='Presentation and assembly system',
+    long_description=long_description,
     classifiers=[
         # http://pypi.python.org/pypi?%3Aaction=list_classifiers
         'Development Status :: 5 - Production/Stable',
@@ -37,18 +41,7 @@ setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python',
     ],
-    install_requires=[
-        'django == 1.5.1',
-        'django-mptt',
-        'reportlab',
-        'pillow',
-        'tornado',
-        'bleach',
-        'beautifulsoup4',
-    ],
-    entry_points={
-        'console_scripts': [
-            'openslides = openslides.main:main',
-        ],
-    },
-)
+    license='GPL2+',
+    packages=find_packages(exclude=['tests', 'tests.*']),
+    install_requires=install_requires,
+    entry_points={'console_scripts': ['openslides = openslides.main:main']})