Skip to content

Commit 6adf8ec

Browse files
authored
Merge pull request #15 from novafloss/15-drop-django16-django17-support
Drop Django 1.6 and 1.7 support
2 parents fd1c7f7 + 6b1a6e0 commit 6adf8ec

File tree

5 files changed

+4
-23
lines changed

5 files changed

+4
-23
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
language: python
22
python: 2.7
33
env:
4-
- TOX_ENV=py27-django16
5-
- TOX_ENV=py27-django17
64
- TOX_ENV=py27-django18
75
- TOX_ENV=py27-django19
8-
- TOX_ENV=py34-django16
9-
- TOX_ENV=py34-django17
106
- TOX_ENV=py34-django18
117
- TOX_ENV=py34-django19
128
- TOX_ENV=flake8

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## master (unreleased)
44

5-
- Nothing changed yet.
5+
- Drop Django 1.6 and 1.7 support (#15).
66

77
## 1.0.1 (2016-08-26)
88

chunkator/__init__.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
"""
22
Toolbox for chunking / slicing querysets
33
"""
4-
import warnings
5-
6-
from distutils.version import StrictVersion
7-
import django
8-
9-
if StrictVersion(django.get_version()) < StrictVersion('1.8.0'):
10-
with warnings.catch_warnings():
11-
# This will force the warning to be triggered.
12-
warnings.simplefilter("always")
13-
warnings.warn(
14-
"Django 1.7 and lower versions will soon be deprecated. Please upgrade.", # noqa
15-
PendingDeprecationWarning
16-
)
174

185

196
class MissingPkFieldException(Exception):

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def namespace_packages(project_name):
5858

5959
name = 'django-chunkator'
6060
readme = read_relative_file('README.rst')
61-
requirements = ['six']
61+
requirements = ['six', 'django>=1.8']
6262
entry_points = {}
6363

6464

@@ -95,4 +95,4 @@ def namespace_packages(project_name):
9595
zip_safe=False,
9696
install_requires=requirements,
9797
entry_points=entry_points,
98-
)
98+
)

tox.ini

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
[tox]
2-
envlist = {py27,py34}-django{16,17,18,19},flake8
2+
envlist = {py27,py34}-django{18,19},flake8
33

44
[testenv]
55
usedevelop = True
66
deps =
7-
django16: Django>=1.6,<1.7
8-
django17: Django>=1.7,<1.8
97
django18: Django>=1.8,<1.9
108
django19: Django>=1.9,<1.10
119
flake8: flake8

0 commit comments

Comments
 (0)