Merge 0ff8a2c into be981f6

.github/workflows/test.yml

@@ -0,0 +1,71 @@
+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-wag23
+            - py36-dj22-wag210
+            - py36-dj31-wag210
+            - py38-dj22-wag210
+            - py38-dj31-wag210
+        include:
+          - toxenv: py36-dj22-wag23
+            python-version: 3.6
+          - toxenv: py36-dj22-wag210
+            python-version: 3.6
+          - toxenv: py36-dj31-wag210
+            python-version: 3.6
+          - toxenv: py38-dj22-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 }}

README.md

@@ -20,10 +20,10 @@ Wagtail-Flags adds a Wagtail admin UI and Wagtail Site-based condition on top of
 
 ## Dependencies
 
-- Python 3.6, 3.8
-- Wagtail 2.3, 2.9, 2.10
-- Django 1.11, 2.2
+- Python 3.6+
+- Django 2.2, 3.1
 - Django-Flags 4.2+ 
+- Wagtail 2.3, 2.9, 2.10
 
 It should be compatible at all intermediate versions, as well.
 If you find that it is not, please [file an issue](https://github.com/cfpb/wagtail-flags/issues/new).

setup.py

@@ -2,7 +2,7 @@
 
 install_requires = [
     "wagtail>=2.3,<2.11",
-    "django-flags>=4.2,<5.0",
+    "django-flags>=4.2,<5.1",
 ]
 
 testing_extras = ["coverage>=3.7.0"]
@@ -13,19 +13,19 @@
     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.1",
         "Framework :: Wagtail",
         "Framework :: Wagtail :: 2",
         "License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",

tox.ini

@@ -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,31}-wag{210}
 
 [testenv]
 install_command=pip install -e ".[testing]" -U {opts} {packages}
@@ -19,8 +19,8 @@ basepython=
     py38: python3.8
 
 deps=
-    dj111: Django>=1.11,<1.12
     dj22:  Django>=2.2,<2.3
+    dj31:  Django>=3.1,<3.2
     wag23: wagtail>=2.3,<2.4
     wag29: wagtail>=2.9,<2.10
     wag210: wagtail>=2.10,<2.11
@@ -33,7 +33,7 @@ deps=
     isort
 commands=
     black --check wagtailflags setup.py
-    flake8 .
+    flake8 wagtailflags setup.py
     isort --check-only --diff wagtailflags
 
 [flake8]
@@ -54,6 +54,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