diff --git a/.travis.yml b/.travis.yml index 732a124..4e9e835 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,6 +48,12 @@ jobs: env: DJANGO=3.0 - python: '3.8' env: DJANGO=3.1 + - python: '3.9' + env: DJANGO=3.1 + - python: '3.9' + env: DJANGO=3.2 + - python: '3.10' + env: DJANGO=3.2 - python: '3.7' if: branch = master deploy: diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9360908..56e2a33 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,12 @@ `Release history`_ ################## +2.2.1 - Not Released +==================== + +* Test compatibility with django 3.2 +* Test compatibility with python 3.9 & 3.10 + 2.2.0 - 06-10-2020 ================== @@ -24,4 +30,4 @@ * Add Django 2.1 and 2.2 support * Switch to Travis CI -.. _Release history: https://pypi.org/project/django-admin-ip-restrictor/#history \ No newline at end of file +.. _Release history: https://pypi.org/project/django-admin-ip-restrictor/#history diff --git a/admin_ip_restrictor/__init__.py b/admin_ip_restrictor/__init__.py index 59aa83f..f2d8739 100644 --- a/admin_ip_restrictor/__init__.py +++ b/admin_ip_restrictor/__init__.py @@ -1,4 +1,4 @@ -VERSION = (2, 2, 0) +VERSION = (2, 2, 1) __version__ = '{major}.{minor}.{patch}'.format( diff --git a/setup.py b/setup.py index 139b515..78a5223 100644 --- a/setup.py +++ b/setup.py @@ -16,12 +16,12 @@ ] test_requires = [ - 'coverage==5.0.2', - 'pytest==5.3.2', - 'pytest-cov==2.8.1', - 'pytest-django==3.7.0', - 'pytest-sugar==0.9.2', - 'tox==3.14.3', + 'coverage==6.2', + 'pytest==6.2.5', + 'pytest-cov==3.0.0', + 'pytest-django==4.5.2', + 'pytest-sugar==0.9.4', + 'tox==3.24.4', ] setup( @@ -49,6 +49,7 @@ 'Framework :: Django :: 2.2', 'Framework :: Django :: 3.0', 'Framework :: Django :: 3.1', + 'Framework :: Django :: 3.2', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', @@ -58,6 +59,8 @@ 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3 :: Only', 'Topic :: Software Development :: Libraries :: Python Modules', ], diff --git a/tox.ini b/tox.ini index a124ce5..de52b85 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,8 @@ envlist = py{35,36,37}-django21 py{35,36,37,38}-django22 py{36,37,38}-django30 - py{36,37,38}-django31 + py{36,37,38,39}-django31 + py{36,37,38,39,310}-django32 [travis:env] DJANGO = @@ -15,6 +16,7 @@ DJANGO = 2.2: django22 3.0: django30 3.1: django31 + 3.2: django32 [testenv] commands = coverage run --parallel -m pytest {posargs} @@ -27,6 +29,7 @@ deps = django22: Django>=2.2,<3.0 django30: Django>=3.0,<3.1 django31: Django>=3.1,<3.2 + django32: Django>=3.2,<4.0 [testenv:coverage-report]