Skip to content

Commit

Permalink
Add support for Django 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
cwdavies committed Aug 13, 2020
1 parent be981f6 commit 17d2a07
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 39 deletions.
74 changes: 74 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: test

on: [pull_request, push]

jobs:

lint:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1

- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: 3.8

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

test:
name: unittests
runs-on: ubuntu-latest

strategy:
matrix:
toxenv:
- py36-dj22-wag210
- py36-dj30-wag210
- py36-dj31-wag210
- py38-dj22-wag210
- py38-dj30-wag210
- py38-dj31-wag210
include:
- toxenv: py36-dj22-wag210
python-version: 3.6
- toxenv: py36-dj30-wag210
python-version: 3.6
- toxenv: py36-dj31-wag210
python-version: 3.6
- toxenv: py38-dj22-wag210
python-version: 3.8
- toxenv: py38-dj30-wag210
python-version: 3.8
- toxenv: py38-dj31-wag210
python-version: 3.8

steps:
- uses: actions/checkout@v1

- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox coveralls
- name: Run tox
run: |
tox
coveralls
env:
TOXENV: ${{ matrix.toxenv }}
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
29 changes: 0 additions & 29 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Wagtail-Flags adds a Wagtail admin UI and Wagtail Site-based condition on top of

## Dependencies

- Python 3.6, 3.8
- Python 3.6+
- Wagtail 2.3, 2.9, 2.10
- Django 1.11, 2.2
- Django 2.2-3.1
- Django-Flags 4.2+

It should be compatible at all intermediate versions, as well.
Expand Down
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,20 @@
author="CFPB",
author_email="tech@cfpb.gov",
description="Feature flags for Wagtail sites",
long_description=open("README.md", "r").read(),
long_description=open("README.md", "r", encoding="utf-8").read(),
long_description_content_type="text/markdown",
license="CC0",
version="4.2.2",
version="4.2.3",
include_package_data=True,
packages=find_packages(),
python_requires=">=3.6",
install_requires=install_requires,
extras_require={"testing": testing_extras},
classifiers=[
"Framework :: Django",
"Framework :: Django :: 1.11",
"Framework :: Django :: 2.2",
"Framework :: Django :: 3.0",
"Framework :: Django :: 3.1",
"Framework :: Wagtail",
"Framework :: Wagtail :: 2",
"License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
Expand Down
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
skipsdist=True
envlist=
lint,
py{36}-dj{111,22}-wag{23},
py{36,38}-dj{22}-wag{29,210}
py{36}-dj{22}-wag{23,29},
py{36,38}-dj{22,30,31}-wag{210}

[testenv]
install_command=pip install -e ".[testing]" -U {opts} {packages}
Expand All @@ -19,8 +19,9 @@ basepython=
py38: python3.8

deps=
dj111: Django>=1.11,<1.12
dj22: Django>=2.2,<2.3
dj30: Django>=3.0,<3.1
dj31: Django>=3.1,<3.2
wag23: wagtail>=2.3,<2.4
wag29: wagtail>=2.9,<2.10
wag210: wagtail>=2.10,<2.11
Expand All @@ -33,7 +34,7 @@ deps=
isort
commands=
black --check wagtailflags setup.py
flake8 .
flake8 wagtailflags setup.py
isort --check-only --diff wagtailflags

[flake8]
Expand All @@ -54,6 +55,5 @@ skip=.tox,migrations
use_parentheses=1
known_django=django
known_wagtail=wagtail
known_future_library=future
default_section=THIRDPARTY
sections=FUTURE,STDLIB,DJANGO,WAGTAIL,THIRDPARTY,FIRSTPARTY,LOCALFOLDER

0 comments on commit 17d2a07

Please sign in to comment.