fork/django-q2
1
0
Fork 0
mirror of https://github.com/django-q2/django-q2.git synced 2026-10-08 17:58:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'django_2_compat' into django_2_compat

Browse Source
This commit is contained in:
Ilan Steemers
2018-01-08 10:53:49 +01:00
committed by GitHub
parent 5eaa700866 72b52b026f
commit f353daca53
3 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -9,7 +9,7 @@ python:
env: env:
- DJANGO=2.0 - DJANGO=2.0
- DJANGO=1.11.8 - DJANGO=1.11.9
- DJANGO=1.8.18 - DJANGO=1.8.18
sudo: false sudo: false
django_q/tests/settings.py
+11 -18
View File
@@ -29,24 +29,17 @@ INSTALLED_APPS = (
'django_redis' 'django_redis'
) )
if django.VERSION[:2] < (1, 10):
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
) )
else:
MIDDLEWARE = ( MIDDLEWARE = MIDDLEWARE_CLASSES
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
ROOT_URLCONF = 'tests.urls' ROOT_URLCONF = 'tests.urls'
requirements.txt
+8 -8
View File
@@ -4,11 +4,11 @@
# #
# pip-compile --output-file requirements.txt requirements.in # pip-compile --output-file requirements.txt requirements.in
# #
arrow==0.10.0 arrow==0.12.0
blessed==1.14.2 blessed==1.14.2
boto3==1.4.7 boto3==1.5.9
botocore==1.7.28 # via boto3, s3transfer botocore==1.8.23 # via boto3, s3transfer
certifi==2017.7.27.1 # via requests certifi==2017.11.5 # via requests
chardet==3.0.4 # via requests chardet==3.0.4 # via requests
django-picklefield==1.0.0 django-picklefield==1.0.0
django-redis==4.8.0 django-redis==4.8.0
@@ -18,13 +18,13 @@ idna==2.6 # via requests
iron-core==1.2.0 # via iron-mq iron-core==1.2.0 # via iron-mq
iron-mq==0.9 iron-mq==0.9
jmespath==0.9.3 # via boto3, botocore jmespath==0.9.3 # via boto3, botocore
psutil==5.4.0 psutil==5.4.3
pymongo==3.5.1 pymongo==3.6.0
python-dateutil==2.6.1 # via arrow, botocore, iron-core python-dateutil==2.6.1 # via arrow, botocore, iron-core
redis==2.10.6 redis==2.10.6
requests==2.18.4 # via iron-core, rollbar requests==2.18.4 # via iron-core, rollbar
rollbar==0.13.13 rollbar==0.13.17
s3transfer==0.1.11 # via boto3 s3transfer==0.1.12 # via boto3
six==1.11.0 # via blessed, python-dateutil, rollbar six==1.11.0 # via blessed, python-dateutil, rollbar
urllib3==1.22 # via requests urllib3==1.22 # via requests
wcwidth==0.1.7 # via blessed wcwidth==0.1.7 # via blessed