From 0a5f6658ddac4f97ce15ada741ef797e8f7153d6 Mon Sep 17 00:00:00 2001 From: Will Barton Date: Mon, 10 Jan 2022 11:58:59 -0500 Subject: [PATCH] Update tests to Python 3.9 This change updates our tests to run against Python 3.9. --- .github/workflows/test.yml | 28 +++++++++++----------------- tox.ini | 9 +++++---- wagtailflags/views.py | 2 +- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 02ea720..c9c0c66 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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: @@ -33,24 +33,18 @@ jobs: matrix: toxenv: - py36-dj22-wag27 - - py36-dj22-waglatest - - py36-dj31-waglatest - - py38-dj22-wag27 - - py38-dj22-waglatest - - py38-dj31-waglatest + - py36-dj32-waglatest + - py39-dj22-waglatest + - py39-dj32-waglatest include: - toxenv: py36-dj22-wag27 python-version: 3.6 - toxenv: py36-dj22-waglatest python-version: 3.6 - - toxenv: py36-dj31-waglatest - python-version: 3.6 - - toxenv: py38-dj22-wag27 - 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-dj32-waglatest + python-version: 3.9 steps: - uses: actions/checkout@v1 @@ -69,6 +63,6 @@ jobs: run: | tox coveralls - env: + env: TOXENV: ${{ matrix.toxenv }} COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} diff --git a/tox.ini b/tox.ini index 271101b..f3f6929 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,8 @@ skipsdist=True envlist= lint, - py{36,38}-dj{22,31}-wag{27,latest} + py{36}-dj{22,32}-wag{27,latest} + py{39}-dj{22,32}-wag{latest} [testenv] install_command=pip install -e ".[testing]" -U {opts} {packages} @@ -15,16 +16,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 + dj31: Django>=3.2,<4.0 wag27: wagtail>=2.7,<2.8 waglatest: wagtail<3 [testenv:lint] -basepython=python3.6 +basepython=python3.9 deps= black flake8 diff --git a/wagtailflags/views.py b/wagtailflags/views.py index f3635f0..29f018c 100644 --- a/wagtailflags/views.py +++ b/wagtailflags/views.py @@ -45,7 +45,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: