Skip to content

Commit

Permalink
Merge pull request #1625 from ulgens/python_39
Browse files Browse the repository at this point in the history
Add Python 3.9 to tests
  • Loading branch information
trbs committed Feb 6, 2021
2 parents 85d4c99 + c6d8179 commit d2dd7a9
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 19 deletions.
52 changes: 41 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ jobs:
fast_finish: true
include:
# Misc
- python: 3.8
env: TOXENV=py38-flake8
- python: 3.8
- python: 3.9
env: TOXENV=py39-flake8
- python: 3.9
env: TOXENV=precommit
- python: 3.8
- python: 3.9
env: TOXENV=safety
- python: 3.8
- python: 3.9
env: TOXENV=mypy
- python: 3.8
- python: 3.9
env: TOXENV=compile-catalog
# Django 2.2: 3.6, 3.7 or 3.8 / PyPy 3.x
# Django 2.2: 3.6, 3.7, 3.8 or 3.9 / PyPy 3.x
- python: 3.6
env: TOXENV=py36-dj22
- python: 3.7
Expand All @@ -38,6 +38,16 @@ jobs:
env: TOXENV=py38-dj22-mysql
services:
- mysql
- python: 3.9
env: TOXENV=py38-dj22
- python: 3.9
env: TOXENV=py38-dj22-postgres
services:
- postgresql
- python: 3.9
env: TOXENV=py38-dj22-mysql
services:
- mysql
- python: pypy3
env: TOXENV=pypy3-dj22
# Django 3.0: Python 3.6, 3.7 or 3.8 / PyPy 3.x
Expand Down Expand Up @@ -65,7 +75,7 @@ jobs:
- mysql
- python: pypy3
env: TOXENV=pypy3-dj30
# Django 3.1: Python 3.6, 3.7 or 3.8 / PyPy 3.x
# Django 3.1: Python 3.6, 3.7, 3.8 or 3.9 / PyPy 3.x
- python: 3.6
env: TOXENV=py36-dj31
- python: 3.7
Expand All @@ -88,9 +98,19 @@ jobs:
env: TOXENV=py38-dj31-mysql
services:
- mysql
- python: 3.9
env: TOXENV=py38-dj31
- python: 3.9
env: TOXENV=py38-dj31-postgres
services:
- postgresql
- python: 3.9
env: TOXENV=py38-dj31-mysql
services:
- mysql
- python: pypy3
env: TOXENV=pypy3-dj31
# Django master: Python 3.6, 3.7 or 3.8 / PyPy 3.x
# Django master: Python 3.6, 3.7, 3.8 or 3.9 / PyPy 3.x
- python: 3.6
env: TOXENV=py36-djmaster
- python: 3.7
Expand All @@ -105,6 +125,12 @@ jobs:
env: TOXENV=py38-djmaster-postgres
services:
- postgresql
- python: 3.9
env: TOXENV=py38-djmaster
- python: 3.9
env: TOXENV=py38-djmaster-postgres
services:
- postgresql
- python: pypy3
env: TOXENV=pypy3-djmaster

Expand All @@ -113,12 +139,16 @@ jobs:
env: TOXENV=py36-djmaster
- python: 3.7
env: TOXENV=py37-djmaster
- python: 3.8
env: TOXENV=py38-djmaster
- python: 3.7
env: TOXENV=py37-djmaster-postgres
- python: 3.8
env: TOXENV=py38-djmaster
- python: 3.8
env: TOXENV=py38-djmaster-postgres
- python: 3.9
env: TOXENV=py39-djmaster
- python: 3.9
env: TOXENV=py39-djmaster-postgres
- python: pypy3
env: TOXENV=pypy3-djmaster

Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ def fullsplit(path, result=None):
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Utilities',
Expand Down
21 changes: 13 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ envlist =
precommit
safety
mypy
{py37,py38}-flake8
{py36,py37,pypy}-dj22
{py36,py37,py38}-dj30
{py36,py37,py38}-dj31
{py36,py37,pypy}-djmaster
py38-dj31-postgres
py38-dj31-mysql
py38-djmaster-postgres
{py37,py38,py39}-flake8
{py36,py37,py38,py39,pypy}-dj22
{py36,py37,py38,py39,pypy}-dj30
{py36,py37,py38,py39,pypy}-dj31
{py36,py37,py38,py39,pypy}-djmaster
py39-dj31-postgres
py39-dj31-mysql
py39-djmaster-postgres

[testenv]
commands = make test
Expand Down Expand Up @@ -72,3 +72,8 @@ commands = flake8 django_extensions tests
deps =
flake8
commands = flake8 django_extensions tests

[testenv:py39-flake8]
deps =
flake8
commands = flake8 django_extensions tests

0 comments on commit d2dd7a9

Please sign in to comment.