Skip to content

Commit ba430f3

Browse files
authored
test against Django 4.0, drop tests for django < 3.1, python 3.5 (#419)
* test against Django 4.0, drop tests for django < 3.1, python 3.5 * github actions * x * x * x * x * tox * x * x * x * coveralls * x * x * x * x * x * coverage
1 parent ac3d872 commit ba430f3

File tree

8 files changed

+39
-43
lines changed

8 files changed

+39
-43
lines changed

.coveragerc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ branch = True
33
omit =
44
*/migrations/*
55
*/south_migrations/*
6+
relative_files = True
67

78
source = registration
89

.github/workflows/ci.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: CI
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
test:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
max-parallel: 4
10+
matrix:
11+
python: ["3.6", "3.7", "3.8", "3.9", "3.10"]
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v2
15+
- name: Set up Python ${{ matrix.python }}
16+
uses: actions/setup-python@v2
17+
with:
18+
python-version: ${{ matrix.python }}
19+
- name: Install test dependencies
20+
run: |
21+
pip install -r test-requirements.txt
22+
- name: Test
23+
run: |
24+
make lint && tox
25+
- name: Coveralls GitHub Action
26+
uses: AndreMiras/coveralls-python-action@develop
27+
with:
28+
github-token: ${{ secrets.GITHUB_TOKEN }}

.travis.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

CHANGELOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Version 2.10, TBD
66
----------------
77
* Feature: Django 3.2 support.
88
`#412 <https://github.com/macropin/django-registration/pull/412>_`
9+
* Feature: Django 4.0 support.
10+
`#419 <https://github.com/macropin/django-registration/pull/419>_`
911

1012
Version 2.9, 1 January, 2021
1113
----------------

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
.. _DiCato: https://github.com/dicato
99
.. _joshblum: https://github.com/joshblum
1010

11-
.. image:: https://travis-ci.org/macropin/django-registration.svg?branch=master
12-
:target: https://travis-ci.org/macropin/django-registration
11+
.. image:: https://github.com/macropin/django-registration/actions/workflows/ci.yml/badge.svg
12+
:target: https://github.com/macropin/django-registration/actions
1313

1414
.. image:: https://coveralls.io/repos/macropin/django-registration/badge.svg?branch=master
1515
:target: https://coveralls.io/r/macropin/django-registration/

setup.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,19 @@ def run_tests(self):
3838
'Development Status :: 5 - Production/Stable',
3939
'Environment :: Web Environment',
4040
'Framework :: Django',
41-
'Framework :: Django :: 2.0',
42-
'Framework :: Django :: 2.1',
43-
'Framework :: Django :: 2.2',
44-
'Framework :: Django :: 3.0',
4541
'Framework :: Django :: 3.1',
4642
'Framework :: Django :: 3.2',
43+
'Framework :: Django :: 4.0',
4744
'Intended Audience :: Developers',
4845
'License :: OSI Approved :: BSD License',
4946
'Operating System :: OS Independent',
5047
'Programming Language :: Python',
5148
'Programming Language :: Python :: 3',
52-
'Programming Language :: Python :: 3.5',
5349
'Programming Language :: Python :: 3.6',
5450
'Programming Language :: Python :: 3.7',
5551
'Programming Language :: Python :: 3.8',
5652
'Programming Language :: Python :: 3.9',
53+
'Programming Language :: Python :: 3.10',
5754
'Topic :: Software Development :: Libraries :: Python Modules',
5855
'Topic :: Utilities'
5956
],

test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
flake8
22
coveralls
33
isort==4.3.21
4-
tox-travis
4+
tox
55
invoke==0.12.2
66
docutils==0.13.1
77
mock

tox.ini

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,16 @@
55

66
[tox]
77
envlist =
8-
py3{5,6,7}-django20,
9-
py3{5,6,7}-django21,
10-
py3{5,6,7,9}-django22,
11-
py3{6,7,8,9}-django30,
128
py3{6,7,8,9}-django31,
139
py3{6,7,8,9}-django32,
10+
py3{8,9,10}-django40,
11+
skip_missing_interpreters=True
1412

1513
[testenv]
1614
commands =
1715
coverage run --source=registration setup.py test
1816
deps =
1917
-rtest-requirements.txt
20-
django20: Django>=2.0,<2.1
21-
django21: Django>=2.1,<2.2
22-
django22: Django>=2.2a1,<3.0
23-
django30: Django>=3.0,<3.1
2418
django31: Django>=3.1,<3.2
2519
django32: Django>=3.2,<3.3
26-
27-
[travis]
28-
python =
29-
3.5: py35
30-
3.6: py36
31-
3.7: py37
32-
3.8: py38
33-
3.9: py39
20+
django40: Django>=3.2,<4.0

0 commit comments

Comments
 (0)