Skip to content

Commit

Permalink
Merge pull request #71 from cfpb/django31
Browse files Browse the repository at this point in the history
Add support for Django 3.1
  • Loading branch information
willbarton authored Aug 13, 2020
2 parents d220d83 + 7692942 commit c66d5d7
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,23 @@ jobs:
toxenv:
- py36-dj22
- py36-dj30
- py36-dj31
- py38-dj22
- py38-dj30
- py38-dj31
include:
- toxenv: py36-dj22
python-version: 3.6
- toxenv: py36-dj30
python-version: 3.6
- toxenv: py36-dj31
python-version: 3.6
- toxenv: py38-dj22
python-version: 3.8
- toxenv: py38-dj30
python-version: 3.8
- toxenv: py38-dj31
python-version: 3.8

steps:
- uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Feature flags allow you to toggle functionality in both Django code and the Djan
## Dependencies

- Python 3.6+
- Django 2.2, 3.0
- Django 2.2-3.1

## Installation

Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from setuptools import find_packages, setup


install_requires = ["Django>=1.11,<3.1"]
install_requires = ["Django>=1.11,<3.2"]

testing_extras = [
"coverage>=3.7.0",
Expand All @@ -24,7 +24,7 @@
long_description=open("README.md", "r", encoding="utf-8").read(),
long_description_content_type="text/markdown",
license="CC0",
version="5.0.0",
version="5.0.1",
include_package_data=True,
packages=find_packages(),
python_requires=">=3.6",
Expand All @@ -34,6 +34,7 @@
"Framework :: Django",
"Framework :: Django :: 2.2",
"Framework :: Django :: 3.0",
"Framework :: Django :: 3.1",
"License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
"License :: Public Domain",
"Programming Language :: Python",
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
skipsdist=True
envlist=lint,py{36,38}-dj{22,30}
envlist=lint,py{36,38}-dj{22,30,31}

[testenv]
install_command=pip install -e ".[testing]" -U {opts} {packages}
Expand All @@ -18,6 +18,7 @@ basepython=
deps=
dj22: Django>=2.2,<2.3
dj30: Django>=3.0,<3.1
dj31: Django>=3.1,<3.2

[testenv:lint]
basepython=python3.6
Expand Down

0 comments on commit c66d5d7

Please sign in to comment.