diff --git a/src/pretix/helpers/debug.py b/src/pretix/helpers/debug.py deleted file mode 100644 index cf2dc22cc..000000000 --- a/src/pretix/helpers/debug.py +++ /dev/null @@ -1,6 +0,0 @@ -from debug_toolbar.middleware import DebugToolbarMiddleware -from django.utils.deprecation import MiddlewareMixin - - -class DebugMiddlewareCompatibilityShim(MiddlewareMixin, DebugToolbarMiddleware): - pass diff --git a/src/pretix/settings.py b/src/pretix/settings.py index b85426bda..8b3959746 100644 --- a/src/pretix/settings.py +++ b/src/pretix/settings.py @@ -258,7 +258,7 @@ try: import debug_toolbar # noqa if DEBUG: INSTALLED_APPS.append('debug_toolbar.apps.DebugToolbarConfig') - MIDDLEWARE.insert(0, 'pretix.helpers.debug.DebugMiddlewareCompatibilityShim') + MIDDLEWARE.insert(0, 'debug_toolbar.middleware.DebugToolbarMiddleware') except ImportError: pass diff --git a/src/requirements/dev.txt b/src/requirements/dev.txt index cedbc5622..4e13a2094 100644 --- a/src/requirements/dev.txt +++ b/src/requirements/dev.txt @@ -1,4 +1,4 @@ -django-debug-toolbar==1.5 +django-debug-toolbar==1.8 sqlparse==0.2.1 # pinned due to difficulties with django-debug-toolbar # Testing requirements pep8==1.5.7 # exact requirement by flake8 2.4.0 diff --git a/src/requirements/production.txt b/src/requirements/production.txt index be616b16a..4ac3e2fa0 100644 --- a/src/requirements/production.txt +++ b/src/requirements/production.txt @@ -1,19 +1,19 @@ # Functional requirements -Django>=1.10.7,<1.11 +Django>=1.11.* python-dateutil pytz -django-bootstrap3==8.0.* +django-bootstrap3==8.2.* django-formset-js-improved==0.5.0.1 -django-compressor==2.1 +django-compressor==2.1.1 django-hierarkey==1.0.* reportlab==3.2.* PyPDF2==1.26.* -easy-thumbnails==2.* +easy-thumbnails==2.4.* django-libsass libsass django-otp==0.3.* python-u2flib-server==4.* -django-formtools==1.0 +django-formtools==2.0 celery==4.0.2 kombu==4.0.2 django-statici18n==1.3.* @@ -28,7 +28,7 @@ django-markup markdown bleach==2.* raven -django-i18nfield +django-i18nfield>=1.0.1 # Stripe stripe==1.22.* # PayPal diff --git a/src/requirements/redis.txt b/src/requirements/redis.txt index f992cbd9f..143249c80 100644 --- a/src/requirements/redis.txt +++ b/src/requirements/redis.txt @@ -1,2 +1,2 @@ -django-redis==4.1.* +django-redis==4.7.* redis==2.10.5 diff --git a/src/setup.py b/src/setup.py index 63af8e9f2..9125e20e8 100644 --- a/src/setup.py +++ b/src/setup.py @@ -62,21 +62,21 @@ setup( keywords='tickets web shop ecommerce', install_requires=[ - 'Django==1.10.*', + 'Django==1.11.*', 'python-dateutil==2.4.*', 'pytz', - 'django-bootstrap3==7.1.*', + 'django-bootstrap3==8.2.*', 'django-formset-js-improved==0.5.0.1', 'django-compressor==2.1', 'django-hierarkey==1.0.*', 'reportlab==3.2.*', - 'easy-thumbnails==2.*', + 'easy-thumbnails==2.4.*', 'PyPDF2==1.26.*', 'django-libsass', 'libsass', 'django-otp==0.3.*', 'python-u2flib-server==4.*', - 'django-formtools==1.0', + 'django-formtools==2.0', 'celery==4.0.2', 'kombu==4.0.2', 'django-statici18n==1.3.*', @@ -93,18 +93,18 @@ setup( 'raven', 'paypalrestsdk==1.12.*', 'pycparser==2.13', - 'django-redis==4.1.*', + 'django-redis==4.7.*', 'redis==2.10.5', 'stripe==1.22.*', 'chardet>=2.3,<3', 'mt-940==3.2', - 'django-i18nfield', + 'django-i18nfield>=1.0.1', 'vobject==0.9.*', 'pycountry' ], extras_require={ 'dev': [ - 'django-debug-toolbar==1.5', + 'django-debug-toolbar==1.7', 'sqlparse==0.2.1', 'pep8==1.5.7', 'pyflakes==1.1.0', diff --git a/src/tests/control/test_events.py b/src/tests/control/test_events.py index 028a1ea47..455ef8d52 100644 --- a/src/tests/control/test_events.py +++ b/src/tests/control/test_events.py @@ -68,7 +68,7 @@ class EventsTest(SoupTest): assert len(doc.select(".alert-success")) > 0 # date_to should not be changed even though the timezone is changed assert doc.select("[name=date_to]")[0]['value'] == "2013-12-30 17:00:00" - assert doc.find('option', {"value": "Asia/Tokyo"})['selected'] == "selected" + assert 'selected' in doc.find('option', {"value": "Asia/Tokyo"}).attrs assert doc.select("[name=settings-max_items_per_order]")[0]['value'] == "12" self.event1.refresh_from_db()