Merge b1e3815 into 9ff6506

cfpb · Jan 10, 2022 · 9de8819 · 9de8819
2 parents 9ff6506 + b1e3815
commit 9de8819
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git 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.6
+          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:
@@ -34,23 +34,17 @@ jobs:
         toxenv:
             - py36-dj22-wag27
             - py36-dj22-waglatest
-            - py36-dj31-waglatest
-            - py38-dj22-wag27
-            - py38-dj22-waglatest
-            - py38-dj31-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,7 +63,7 @@ jobs:
         run: |
             tox
             coveralls
-        env: 
+        env:
           TOXENV: ${{ matrix.toxenv }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_SERVICE_NAME: github
diff --git a/tox.ini b/tox.ini
@@ -2,8 +2,8 @@
 skipsdist=True
 envlist=
     lint,
-    py{36,38}-dj22-wag27,
-    py{36,38}-dj{22,31}-waglatest
+    py{36}-dj22-wag{27,latest}
+    py{39}-dj{22,32}-wag{latest}
 
 [testenv]
 install_command=pip install -e ".[testing]" -U {opts} {packages}
@@ -16,17 +16,17 @@ setenv=
 
 basepython=
     py36: python3.6
-    py38: python3.8
+    py39: python3.9
 
 deps=
     mock>=1.0.0
     dj22:  Django>=2.2,<2.3
-    dj31:  Django>=3.1,<3.2
+    dj32:  Django>=3.2,<3.3
     wag27: wagtail>=2.7,<2.8
     waglatest: wagtail>=2.10,<3
 
 [testenv:lint]
-basepython=python3.6
+basepython=python3.9
 deps=
     black
     flake8