From: Radek Czajka Date: Fri, 6 Mar 2020 14:55:34 +0000 (+0100) Subject: Test up to Django 3.0. Drop Python 3-3.4. X-Git-Tag: 2.2.5~2 X-Git-Url: https://git.mdrn.pl/django-pagination.git/commitdiff_plain/0a28b77641bb5ad58bf832e55db65204e3f6e41d?ds=sidebyside Test up to Django 3.0. Drop Python 3-3.4. --- diff --git a/.gitignore b/.gitignore index c2803e4..006b196 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ dist .coverage .eggs .tox +/htmlcov diff --git a/fnp_django_pagination/middleware.py b/fnp_django_pagination/middleware.py index bb33c4a..4036511 100644 --- a/fnp_django_pagination/middleware.py +++ b/fnp_django_pagination/middleware.py @@ -35,7 +35,7 @@ except ImportError: MiddlewareMixin = object -def get_page(self, suffix): +def get_page(self, suffix=''): """ A function which will be monkeypatched onto the request to get the current integer representing the current page. diff --git a/tox.ini b/tox.ini index ff4bdfa..47d895d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,17 +1,11 @@ -# This file is part of django-ssify, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See README.md for more information. -# [tox] envlist=clear, - d{12,13,14}-py27, - d{15}-py{27,32}, - d16-py{27,32,33}, - d17-py{27,32,33,34}, - d18-py{27,32,33,34}, - d{19,110}-py{27,34,35}, - d111-py{27,34,35,36,37}, - d20-py{34,35,36,37}, - d{21,22}-py{35,36,37}, + d{12,13,14,15,16,17,18}-py27, + d{19,110}-py{27,35}, + d111-py{27,35,36,37}, + d{20,21}-py{35,36,37}, + d22-py{35,36,37,38}, + d30-py{36,37,38}, stats [testenv] @@ -30,13 +24,14 @@ deps= d111: Django>=1.11,<2.0 d20: Django>=2.0,<2.1 d21: Django>=2.1,<2.2 - d22: Django>=2.2,<2.3 + d22: Django>=2.2,<3.0 + d30: Django>=3.0,<3.1 coverage [testenv:clear] -basepython=python3.4 +basepython=python3 commands=coverage erase [testenv:stats] -basepython=python3.4 +basepython=python3 commands=coverage html