Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test the project with django3.2 and python 3.10 #29

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Test the project with django3.2 and python 3.10 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
==================

Expand All @@ -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
.. _Release history: https://pypi.org/project/django-admin-ip-restrictor/#history
2 changes: 1 addition & 1 deletion admin_ip_restrictor/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = (2, 2, 0)
VERSION = (2, 2, 1)


__version__ = '{major}.{minor}.{patch}'.format(
Expand Down
15 changes: 9 additions & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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',
Expand All @@ -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',
],
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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}
Expand All @@ -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]
Expand Down