mirror of
https://github.com/jazzband/django-defender.git
synced 2026-03-16 22:10:32 +00:00
Feature update Python and Django versions (#126)
* remove Python 3.3 * remove Django 1.8-1.10 * add Celery v4 * update travis config * update admin URL * replace MIDDLEWARE_CLASSES with MIDDLEWARE
This commit is contained in:
parent
2251c298a9
commit
7400a4945f
6 changed files with 16 additions and 22 deletions
28
.travis.yml
28
.travis.yml
|
|
@ -2,16 +2,14 @@ language: python
|
|||
|
||||
python:
|
||||
- "2.7"
|
||||
- "3.3"
|
||||
- "3.4"
|
||||
- "3.5"
|
||||
- "3.6"
|
||||
|
||||
env:
|
||||
- DJANGO=1.8
|
||||
- DJANGO=1.9
|
||||
- DJANGO=1.10
|
||||
- DJANGO=1.11
|
||||
- DJANGO=2.0
|
||||
- DJANGO=2.1
|
||||
|
||||
services:
|
||||
- redis-server
|
||||
|
|
@ -21,7 +19,7 @@ install:
|
|||
- pip install coveralls
|
||||
- pip install mockredispy
|
||||
- pip install django-redis-cache
|
||||
- pip install 'celery<4'
|
||||
- pip install 'celery<5'
|
||||
- python setup.py develop
|
||||
|
||||
script:
|
||||
|
|
@ -30,18 +28,14 @@ script:
|
|||
|
||||
matrix:
|
||||
exclude:
|
||||
- python: "3.3"
|
||||
env: DJANGO=1.9
|
||||
- python: "3.3"
|
||||
env: DJANGO=1.10
|
||||
- python: "3.3"
|
||||
env: DJANGO=1.11
|
||||
- python: "3.6"
|
||||
env: DJANGO=1.8
|
||||
- python: "3.6"
|
||||
env: DJANGO=1.9
|
||||
- python: "3.6"
|
||||
env: DJANGO=1.10
|
||||
- python: "2.7"
|
||||
env: DJANGO=2.0
|
||||
- python: "2.7"
|
||||
env: DJANGO=2.1
|
||||
- python: "3.4"
|
||||
env: DJANGO=2.0
|
||||
- python: "3.4"
|
||||
env: DJANGO=2.1
|
||||
|
||||
after_success:
|
||||
- coveralls --verbose
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ DATABASES = {
|
|||
|
||||
SITE_ID = 1
|
||||
|
||||
MIDDLEWARE_CLASSES = (
|
||||
MIDDLEWARE = (
|
||||
'django.middleware.common.CommonMiddleware',
|
||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ DATABASES = {
|
|||
|
||||
SITE_ID = 1
|
||||
|
||||
MIDDLEWARE_CLASSES = (
|
||||
MIDDLEWARE = (
|
||||
'django.middleware.common.CommonMiddleware',
|
||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ from django.contrib import admin
|
|||
from .urls import urlpatterns as original_urlpatterns
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^admin/', include(admin.site.urls)),
|
||||
url(r'^admin/', admin.site.urls),
|
||||
] + original_urlpatterns
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ CACHES = {
|
|||
|
||||
SITE_ID = 1
|
||||
|
||||
MIDDLEWARE_CLASSES = (
|
||||
MIDDLEWARE = (
|
||||
'django.middleware.common.CommonMiddleware',
|
||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||
|
|
|
|||
2
setup.py
2
setup.py
|
|
@ -68,7 +68,7 @@ setup(name='django-defender',
|
|||
include_package_data=True,
|
||||
packages=get_packages('defender'),
|
||||
package_data=get_package_data('defender'),
|
||||
install_requires=['Django>=1.8,<2.1', 'redis>=2.10.3,<3.0'],
|
||||
install_requires=['Django>=1.8,<2.2', 'redis>=2.10.3,<3.0'],
|
||||
tests_require=['mock', 'mockredispy>=2.9.0.11,<3.0', 'coverage',
|
||||
'celery', 'django-redis-cache'],
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in a new issue