Skip to content

Commit fb1c71d

Browse files
committed
bump v1.1
1 parent 8c91045 commit fb1c71d

File tree

9 files changed

+16
-26
lines changed

9 files changed

+16
-26
lines changed

.travis.yml

+4-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
language: python
22
sudo: false
33
python:
4-
- "2.7"
5-
- "3.4"
6-
- "3.5"
74
- "3.6"
5+
- "3.7"
6+
- "3.8"
87
env:
9-
- DJANGO=1.11.20
10-
- DJANGO=2.0.12
11-
- DJANGO=2.1.7
8+
- DJANGO=2.2.8
9+
- DJANGO=3.0.3
1210
install:
1311
- pip install --upgrade pip
1412
- pip install -q Django==$DJANGO
@@ -17,14 +15,6 @@ script:
1715
- coverage run --source=. runtests.py
1816
after_success:
1917
- coveralls
20-
matrix:
21-
exclude:
22-
- python: "2.7"
23-
env: DJANGO=2.0.12
24-
- python: "2.7"
25-
env: DJANGO=2.1.7
26-
- python: "3.4"
27-
env: DJANGO=2.1.7
2818
notifications:
2919
email:
3020
on_failure: never

CHANGES.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
1.1.0
2+
==================
3+
4+
* Drop support for Django 1.11, 2.0 and 2.1
5+
* Adds support for Django 2.2 and 3.0
6+
17
1.0.0
28
==================
39

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ docs:
55
cd docs && make clean && make html
66

77
test:
8-
python runtests.py
8+
python -Wd runtests.py
99

1010
sdist: test clean
1111
python setup.py sdist

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ For a full explanation go to
3737

3838
infinite-scroll-pagination requires the following software to be installed:
3939

40-
* Python 2.7, 3.4, 3.5 or 3.6
41-
* Django 1.11 LTS, 2.0 or 2.1
40+
* Python 3.5, 3.6, 3.7, or 3.8
41+
* Django 2.2 LTS, or 3.0
4242

4343
## Install
4444

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.0.0'
1+
__version__ = '1.1.0'

infinite_scroll_pagination/paginator.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
#-*- coding: utf-8 -*-
22

3-
from __future__ import unicode_literals
43

54
try:
65
from collections.abc import Sequence
76
except ImportError:
87
from collections import Sequence
98

10-
import six
11-
129
from django.core.paginator import EmptyPage
1310
from django.db.models import QuerySet
1411

@@ -41,8 +38,8 @@ class SeekPaginator(object):
4138

4239
def __init__(self, query_set, per_page, lookup_field):
4340
assert isinstance(query_set, QuerySet), 'QuerySet expected'
44-
assert isinstance(per_page, six.integer_types), 'Int expected'
45-
assert isinstance(lookup_field, six.string_types), 'String expected'
41+
assert isinstance(per_page, int), 'Int expected'
42+
assert isinstance(lookup_field, str), 'String expected'
4643
self.query_set = query_set
4744
self.per_page = per_page
4845
self.is_desc = lookup_field.startswith('-')

infinite_scroll_pagination/serializers.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#-*- coding: utf-8 -*-
22

3-
from __future__ import unicode_literals
43
import re
54
import time
65
from datetime import datetime

requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Django
2-
six

setup.py

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
'License :: OSI Approved :: MIT License',
3838
'Operating System :: OS Independent',
3939
'Programming Language :: Python',
40-
'Programming Language :: Python :: 2',
4140
'Programming Language :: Python :: 3',
4241
'Topic :: Internet :: WWW/HTTP',
4342
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',

0 commit comments

Comments
 (0)