Skip to content

Commit bbd975d

Browse files
committed
Dropped Django 1.10 support.
1 parent a231801 commit bbd975d

File tree

6 files changed

+11
-17
lines changed

6 files changed

+11
-17
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@ sudo: false
22
language: python
33
matrix:
44
include:
5-
- python: '2.7'
6-
env: TOXENV=py27-django110-test
75
- python: '2.7'
86
env: TOXENV=py27-django111-test
9-
- python: '3.4'
10-
env: TOXENV=py34-django110-test
117
- python: '3.4'
128
env: TOXENV=py34-django111-test
139
- python: '3.4'

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## 1.5.6.
44

5+
### Breaking
6+
7+
* Support for Django 1.10 has been dropped.
8+
59
### Enhancements
610

711
* Confirms support for Python 3.7.

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ Requirements
1919
------------
2020

2121
* **Python**: 2.7, 3.4, 3.6, 3.7
22-
* **Django**: 1.10, 1.11, 2.0, 2.1, 2.2, 3.0
22+
* **Django**: 1.11, 2.0, 2.1, 2.2, 3.0
2323
* **python-dateutil**
2424
* **six**
2525

2626
django-request [1.5.1](https://pypi.org/project/django-request/1.5.1/) is the last version that supports Django 1.4, 1.5, 1.6.
2727
django-request [1.5.4](https://pypi.org/project/django-request/1.5.4/) is the
2828
last version that supports Django 1.7, 1.8, 1.9.
29+
django-request [1.5.5](https://pypi.org/project/django-request/1.5.5/) is the
30+
last version that supports Django 1.10.
2931

3032
Installation
3133
------------

request/traffic.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# -*- coding: utf-8 -*-
22
from time import mktime
33

4-
import django
54
from django.core.exceptions import ImproperlyConfigured
65
from django.db.models import Count
6+
from django.utils.text import format_lazy
77
from django.utils.translation import gettext
88
from django.utils.translation import gettext_lazy as _
99

@@ -86,12 +86,7 @@ def __init__(self):
8686
if not hasattr(self, 'verbose_name'):
8787
self.verbose_name = get_verbose_name(self.module_name)
8888
if not hasattr(self, 'verbose_name_plural'):
89-
if django.VERSION < (1, 11):
90-
from django.utils.translation import string_concat
91-
self.verbose_name_plural = string_concat(self.verbose_name, 's')
92-
else:
93-
from django.utils.text import format_lazy
94-
self.verbose_name_plural = format_lazy('{}{}', self.verbose_name, 's')
89+
self.verbose_name_plural = format_lazy('{}{}', self.verbose_name, 's')
9590

9691
def count(self, qs):
9792
raise NotImplementedError('"count" isn\'t defined.')

setup.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ classifiers =
1414
Development Status :: 5 - Production/Stable
1515
Environment :: Web Environment
1616
Framework :: Django
17-
Framework :: Django :: 1.10
1817
Framework :: Django :: 1.11
1918
Framework :: Django :: 2.0
2019
Framework :: Django :: 2.1
@@ -33,7 +32,7 @@ classifiers =
3332

3433
[options]
3534
install_requires =
36-
Django>=1.10
35+
Django>=1.11
3736
python-dateutil
3837
six
3938
packages =

tox.ini

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[tox]
22
envlist =
3-
{py27,py34}-django110-test,
43
{py27,py34,py36,py37}-django111-test,
54
{py34,py36,py37}-django20-test,
65
{py36,py37}-django{21,22,30,master}-test,
@@ -19,12 +18,11 @@ commands =
1918
deps =
2019
coverage
2120
mock==2.0.0
22-
django110: Django>=1.10,<1.11
2321
django111: Django>=1.11,<2.0
2422
django20: Django>=2.0,<2.1
2523
django21: Django>=2.1,<2.2
2624
django22: Django>=2.2,<3.0
27-
django30: Django>=3.0b1,<3.1
25+
django30: Django>=3.0,<3.1
2826
djangomaster: https://github.com/django/django/archive/master.tar.gz
2927
isort
3028
flake: flake8

0 commit comments

Comments
 (0)