Merge pull request #1106 from ostcar/requirements

Changed requirements to flexible versions in setup.py

requirements_production.txt

@@ -1,11 +1,11 @@
 # Requirements for OpenSlides in production in alphabetical order
-Django==1.6.0
-beautifulsoup4==4.3.2
-bleach==1.2.2
-django-haystack==2.1.0
-django-mptt==0.6.0
-pillow==2.2.1
-reportlab==2.7
-sockjs-tornado==1.0.0
-tornado==3.1.1
-whoosh==2.5.4
+Django>=1.5,<1.7
+beautifulsoup4>=4.3,<4.4
+bleach>=1.2,<1.3
+django-haystack>=2.1,<2.2
+django-mptt>=0.6,<0.7
+pillow>=2.2,<2.3
+reportlab>=2.7,<2.8
+sockjs-tornado>=1.0,<1.1
+tornado>=3.1,<3.2
+whoosh>=2.5,<2.6

setup.py

@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import sys
 from setuptools import setup, find_packages
+
 from openslides import get_version
 
 
@@ -14,7 +16,8 @@ with open('requirements_production.txt') as requirements_production:
 
 
 # For Python 2.6 support
-install_requires.append('argparse==1.2.1')
+if sys.version_info[1] == 6:
+    install_requires.append('argparse>=1.2,<1.3')
 
 
 setup(