diff --git a/src/requirements.txt b/src/requirements.txt index a1e1c7bb2..ea77c2d83 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,4 +1 @@ -r requirements/production.txt --r requirements/paypal.txt --r requirements/stripe.txt --r requirements/banktransfer.txt diff --git a/src/requirements/banktransfer.txt b/src/requirements/banktransfer.txt deleted file mode 100644 index bb1275fd8..000000000 --- a/src/requirements/banktransfer.txt +++ /dev/null @@ -1,3 +0,0 @@ -chardet>=2.3,<3 -mt-940==3.2 - diff --git a/src/requirements/paypal.txt b/src/requirements/paypal.txt deleted file mode 100644 index 583b7ba1c..000000000 --- a/src/requirements/paypal.txt +++ /dev/null @@ -1,2 +0,0 @@ -paypalrestsdk==1.12.* -pycparser==2.13 # https://github.com/eliben/pycparser/issues/147 diff --git a/src/requirements/production.txt b/src/requirements/production.txt index bfac62162..df84f7cfc 100644 --- a/src/requirements/production.txt +++ b/src/requirements/production.txt @@ -1,13 +1,13 @@ # Functional requirements -Django>=1.10,<1.11 +Django==1.0.* python-dateutil pytz -django-bootstrap3>=7.1,<7.2 +django-bootstrap3==7.1.* django-formset-js-improved==0.5.0.1 django-compressor==2.1 -reportlab>=3.2,<3.3 +reportlab==3.2.* PyPDF2==1.26.* -easy-thumbnails>=2.2,<3 +easy-thumbnails==2.* django-libsass libsass django-otp==0.3.* @@ -17,8 +17,6 @@ celery==4.0.2 kombu==4.0.2 django-statici18n==1.2.* inlinestyler==0.2.* - -# Deployment / static file compilation requirements BeautifulSoup4 html5lib<0.99999999,>=0.999 # version requirement by bleach slimit @@ -30,3 +28,11 @@ django-markup markdown bleach raven +# Stripe +stripe==1.22.* +# PayPal +paypalrestsdk==1.12.* +pycparser==2.13 # https://github.com/eliben/pycparser/issues/147 +# Banktransfer +chardet>=2.3,<3 +mt-940==3.2 diff --git a/src/requirements/py34.txt b/src/requirements/py34.txt index 094af98f6..c997f364b 100644 --- a/src/requirements/py34.txt +++ b/src/requirements/py34.txt @@ -1,2 +1 @@ typing - diff --git a/src/requirements/redis.txt b/src/requirements/redis.txt index 7c41b8509..f992cbd9f 100644 --- a/src/requirements/redis.txt +++ b/src/requirements/redis.txt @@ -1,2 +1,2 @@ -django-redis>=4.1,<4.2 +django-redis==4.1.* redis==2.10.5 diff --git a/src/requirements/stripe.txt b/src/requirements/stripe.txt deleted file mode 100644 index 51f26a42a..000000000 --- a/src/requirements/stripe.txt +++ /dev/null @@ -1,2 +0,0 @@ -stripe>=1.22,<1.23 - diff --git a/src/setup.py b/src/setup.py index 4f15c835a..2c7d5742f 100644 --- a/src/setup.py +++ b/src/setup.py @@ -5,11 +5,16 @@ from os import path from setuptools import find_packages, setup +from pretix import __version__ + here = path.abspath(path.dirname(__file__)) # Get the long description from the relevant file -with open(path.join(here, '../README.md'), encoding='utf-8') as f: - long_description = f.read() +try: + with open(path.join(here, '../README.md'), encoding='utf-8') as f: + long_description = f.read() +except: + long_description = '' class CustomBuild(build): @@ -37,10 +42,10 @@ cmdclass = { setup( name='pretix', - version='0.0.0', + version=__version__, description='Reinventing ticket presales', long_description=long_description, - url='http://pretix.eu', + url='https://pretix.eu', author='Raphael Michel', author_email='mail@raphaelmichel.de', license='Apache License 2.0', @@ -56,24 +61,63 @@ setup( keywords='tickets web shop ecommerce', install_requires=[ - 'Django>=1.9,<1.10', 'python-dateutil>=2.4,<2.5', - 'pytz', 'django-bootstrap3>=6.2,<6.3', 'django-formset-js', - 'django-compressor==2.0', 'reportlab>=3.2,<3.3', - 'easy-thumbnails>=2.2,<3' - 'PyPDF2', 'BeautifulSoup4', 'html5lib', - 'slimit', 'lxml', 'static3==0.6.1', 'dj-static', 'chardet', - 'csscompressor', 'mt-940', 'django-markup', 'markdown' + 'Django==1.10.*', + 'python-dateutil==2.4.*', + 'pytz', + 'django-bootstrap3==7.1.*', + 'django-formset-js-improved==0.5.0.1', + 'django-compressor==2.1', + 'reportlab==3.2.*', + 'easy-thumbnails==2.*' + 'PyPDF2==1.26.*', + 'django-libsass', + 'libsass', + 'django-otp==0.3.*', + 'python-u2flib-server==4.*', + 'django-formtools==1.0', + 'celery==4.0.2', + 'kombu==4.0.2', + 'django-statici18n==1.2.*', + 'inlinestyler==0.2.*', + 'BeautifulSoup4', + 'html5lib<0.99999999,>=0.999', + 'slimit', + 'lxml', + 'static3==0.6.1', + 'dj-static', + 'csscompressor', + 'django-markup', + 'markdown', + 'bleach', + 'raven', + 'paypalrestsdk==1.12.*', + 'pycparser==2.13', + 'django-redis==4.1.*', + 'redis==2.10.5', + 'stripe==1.22.*', + 'chardet>=2.3,<3', + 'mt940==3.2' ], extras_require={ - 'dev': ['django-debug-toolbar>=1.3.0,<2.0'], - 'test': ['pep8==1.5.7', 'pyflakes', 'pep8-naming', 'flake8', 'coverage', - 'pytest', 'pytest-django'], + 'dev': [ + 'django-debug-toolbar==1.5', + 'sqlparse==0.2.1', + 'pep8==1.5.7', + 'pyflakes==1.1.0', + 'flake8', + 'pep8-naming', + 'coveralls', + 'coverage', + 'pytest==2.9.*', + 'pytest-django', + 'isort', + 'pytest-mock', + 'pytest-rerunfailures', + 'pytest-warnings' + ], 'memcached': ['pylibmc'], 'mysql': ['mysqlclient'], - 'paypal': ['paypalrestsdk>=1.9,<1.10,<2.0'], 'postgres': ['psycopg2'], - 'redis': ['django-redis>=4.1,<4.2', 'redis>=2.10,<2.11'], - 'stripe': ['stripe>=1.22,<1.23'] }, packages=find_packages(exclude=['tests', 'tests.*']),