Skip to content

Commit

Permalink
Merge pull request #66 from cfpb/python39
Browse files Browse the repository at this point in the history
Update tests to Python 3.9
  • Loading branch information
willbarton committed Feb 14, 2022
2 parents 3ef8b51 + f71afcd commit f896ca7
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 21 deletions.
31 changes: 15 additions & 16 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: 3.8
python-version: 3.9

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox
- name: Run tox -e lint
run: tox
env:
env:
TOXENV: lint

test:
Expand All @@ -34,23 +34,22 @@ jobs:
toxenv:
- py36-dj22-wag211
- py36-dj22-waglatest
- py36-dj31-waglatest
- py38-dj22-wag211
- py38-dj22-waglatest
- py38-dj31-waglatest
- py39-dj22-wag211
- py39-dj22-waglatest
- py39-dj32-waglatest
include:
- toxenv: py36-dj22-wag211
python-version: 3.6
- toxenv: py36-dj22-waglatest
python-version: 3.6
- toxenv: py36-dj31-waglatest
python-version: 3.6
- toxenv: py38-dj22-wag211
python-version: 3.8
- toxenv: py38-dj22-waglatest
python-version: 3.8
- toxenv: py38-dj31-waglatest
python-version: 3.8
- toxenv: py39-dj22-waglatest
python-version: 3.9
- toxenv: py39-dj22-wag211
python-version: 3.9
- toxenv: py39-dj22-waglatest
python-version: 3.9
- toxenv: py39-dj32-waglatest
python-version: 3.9

steps:
- uses: actions/checkout@v1
Expand All @@ -69,6 +68,6 @@ jobs:
run: |
tox
coveralls
env:
env:
TOXENV: ${{ matrix.toxenv }}
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
10 changes: 6 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
skipsdist=True
envlist=
lint,
py{36,38}-dj{22,31}-wag{211,latest}
py{36}-dj{22}-wag{211,latest},
py{39}-dj{22}-wag{211},
py{39}-dj{22,32}-wag{latest}

[testenv]
install_command=pip install -e ".[testing]" -U {opts} {packages}
Expand All @@ -15,16 +17,16 @@ setenv=

basepython=
py36: python3.6
py38: python3.8
py39: python3.9

deps=
dj22: Django>=2.2,<2.3
dj31: Django>=3.1,<3.2
dj32: Django>=3.2,<3.3
wag211: wagtail>=2.11,<2.12
waglatest: wagtail<3

[testenv:lint]
basepython=python3.6
basepython=python3.9
deps=
black
flake8
Expand Down
2 changes: 1 addition & 1 deletion wagtailflags/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def create_flag(request):


def delete_flag(request, name):
""" Delete a database flag. """
"""Delete a database flag."""
flag = get_flags().get(name)

if not flag:
Expand Down

0 comments on commit f896ca7

Please sign in to comment.