Skip to content

Commit 1332935

Browse files
authored
Merge pull request #44 from peopledoc/40-drop-django1.11-support
Drop Django 1.11 support
2 parents a67ab79 + d14a7db commit 1332935

File tree

6 files changed

+4
-7
lines changed

6 files changed

+4
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## master (unreleased)
44

55
- Drop Python 2 Support (#37).
6+
- Drop Django 1.11 support (#40).
67

78
## 1.5.0 (2020-02-05)
89

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ your RAM.
1111
Tested with all the combinations of:
1212

1313
* Python: 3.5, 3.6, 3.7, 3.8
14-
* Django: 1.11, 2, 2.1, 2.2, master
14+
* Django: 2, 2.1, 2.2, master
1515

1616

1717
Usage

chunkator/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ def chunkator_page(source_qs, chunk_size, query_log=None):
1717
Yield pages of a queryset.
1818
"""
1919
pk = None
20-
# In django 1.9, _fields is always present and `None` if 'values()' is used
21-
# In Django 1.8 and below, _fields will only be present if using `values()`
2220
has_fields = hasattr(source_qs, '_fields') and source_qs._fields
2321
if has_fields:
2422
if "pk" not in source_qs._fields:

demo/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ this demo app is mainly used for running tests, but you may want to install it f
55
## Install
66

77
* (create and) activate a virtualenv (using your favorite Python version)
8-
* from this virtualenv, install your required Django version. e.g.: ``pip install Django==1.11``
8+
* from this virtualenv, install your required Django version. e.g.: ``pip install Django==2.2``
99
* from this directory, install the demo app: ``pip install -e ./``
1010

1111

setup.py

Lines changed: 1 addition & 1 deletion
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', 'django>=1.11']
61+
requirements = ['six', 'django']
6262
entry_points = {}
6363

6464

tox.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[tox]
22
envlist =
33
flake8
4-
py{35,36}-django111
54
py{35,36,37,38}-django{20,21,22}
65
py{36,37,38}-djangomaster
76

@@ -14,7 +13,6 @@ basepython =
1413
py38: python3.8
1514
usedevelop = True
1615
deps =
17-
django111: Django>=1.11,<2.0
1816
django20: Django>=2.0,<2.1
1917
django21: Django>=2.1,<2.2
2018
django22: Django>=2.2,<3.0

0 commit comments

Comments
 (0)