Skip to content

Commit

Permalink
Revert django 1.11 support
Browse files Browse the repository at this point in the history
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
  • Loading branch information
kencochrane committed Apr 14, 2017
1 parent 340b1d6 commit d14920a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 21 deletions.
16 changes: 0 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@ python:
- "3.3"
- "3.4"
- "3.5"
- "3.6"

env:
- DJANGO=1.6
- DJANGO=1.7
- DJANGO=1.8
- DJANGO=1.9
- DJANGO=1.10
- DJANGO=1.11

services:
- redis-server
Expand All @@ -40,28 +38,14 @@ matrix:
env: DJANGO=1.9
- python: "2.6"
env: DJANGO=1.10
- python: "2.6"
env: DJANGO=1.11
- python: "3.3"
env: DJANGO=1.9
- python: "3.3"
env: DJANGO=1.10
- python: "3.3"
env: DJANGO=1.11
- python: "3.5"
env: DJANGO=1.6
- python: "3.5"
env: DJANGO=1.7
- python: "3.6"
env: DJANGO=1.6
- python: "3.6"
env: DJANGO=1.7
- python: "3.6"
env: DJANGO=1.8
- python: "3.6"
env: DJANGO=1.9
- python: "3.6"
env: DJANGO=1.10

after_success:
- coveralls --verbose
2 changes: 1 addition & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
0.4.3
=====
- Flex version requirements for dependencies
- Better support for Django 1.10 and 1.11
- Better support for Django 1.10

0.4.2
=====
Expand Down
12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Sites using Defender:

Versions
========
- 0.4.3 - Better Support for Django 1.10 and 1.11
- 0.4.3 - Better Support for Django 1.10
- 0.4.2 - Better support for Django 1.9
- 0.4.1 - minor refactor to make it easier to retrieve username.
- 0.4.0 - added ``DEFENDER_DISABLE_IP_LOCKOUT`` and added support for Python 3.5
Expand Down Expand Up @@ -147,10 +147,18 @@ This started out as a fork of django-axes, and is using as much of their code
as possible, and removing the parts not needed, and speeding up the lookups
to improve the login.

Django 1.11
============
Due to a change with Django 1.11 where they deprecated the `django.contrib.auth.views.login` in favor
of `django.contrib.auth.views.LoginView` https://docs.djangoproject.com/en/1.11/topics/auth/default/#django.contrib.auth.views.LoginView

This is currently breaking the defender middleware (FailedLoginMiddleware) we have setup, and needs to be changed to support
the LoginView Class Based View before it will work with Django 1.11. If you know up to fix it, please submit a PR.

requirements
============

- django: 1.6.x, 1.7.x, 1.8.x, 1.9.x, 1.10.x, 1.11.x
- django: 1.6.x, 1.7.x, 1.8.x, 1.9.x, 1.10.x
- redis
- python: 2.6.x, 2.7.x, 3.3.x, 3.4.x, 3.5.x, 3.6.x, PyPy

Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ def get_package_data(package):
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: Implementation :: PyPy',
'Programming Language :: Python :: Implementation :: CPython',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
Expand All @@ -70,7 +69,7 @@ def get_package_data(package):
include_package_data=True,
packages=get_packages('defender'),
package_data=get_package_data('defender'),
install_requires=['Django>=1.6,<=1.11', 'redis>=2.10.3,<3.0',
install_requires=['Django>=1.6,<=1.10', 'redis>=2.10.3,<3.0',
'hiredis>=0.2.0,<1.0', 'mockredispy>=2.9.0.11,<3.0'],
tests_require=['mock', 'mockredispy', 'coverage', 'celery'],
)

0 comments on commit d14920a

Please sign in to comment.