From 0c3a8ce1eeb72eb423f279f7ae97caf0b6a80c75 Mon Sep 17 00:00:00 2001
From: Peter Krenesky <pkrenesky@myriad.com>
Date: Thu, 17 Feb 2022 15:33:17 -0800
Subject: [PATCH 1/2] add supported versions of python and django

---
 .travis.yml | 3 ++-
 Makefile    | 2 +-
 tox.ini     | 8 ++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 73b7e8d..c1f8de8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 language: python
 python:
-  - "3.6"
   - "3.7"
+  - "3.8"
+  - "3.9"
 install:
   - pip install tox tox-travis
 script:
diff --git a/Makefile b/Makefile
index f79f15a..84f1ccf 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ WITH_VENV=. $(VENV_ACTIVATE);
 ifdef TRAVIS_PYTHON_VERSION
     PYTHON=python$(TRAVIS_PYTHON_VERSION)
 else
-    PYTHON=python3.6
+    PYTHON=python3.9
 endif
 
 ifdef TOX_ENV
diff --git a/tox.ini b/tox.ini
index 45b81d3..df317e3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 install_command = pip install {opts} {packages}
 downloadcache = {toxworkdir}/_download/
-envlist = {py36}-{1.11,2.0,2.1}
+envlist = {py37,py38,py39}-{2.2,3.0,3.1,3.2,4.0}
 indexserver =
     default = https://pypi.python.org/simple
 
@@ -12,9 +12,13 @@ commands =
     ./baya/tests/manage.py test {posargs:baya}
 deps =
   -r{toxinidir}/requirements-dev.txt
-  1.11: Django>=1.11,<2.0
   2.0: Django>=2.0,<2.1
   2.1: Django>=2.1,<2.2
+  2.2: Django>=2.2,<3.0
+  3.0: Django>=3.0,<3.1
+  3.1: Django>=3.1,<3.2
+  3.2: Django>=2.2,<4.0
+  4.0: Django>=4.0,<4.1
 
 [flake8]
 ignore = E731,E402

From 91a07f9ab94e3f33f68df394229dd84975ea00f7 Mon Sep 17 00:00:00 2001
From: Peter Krenesky <pkrenesky@myriad.com>
Date: Tue, 22 Feb 2022 15:48:58 -0800
Subject: [PATCH 2/2] add github ci

---
 .github/workflows/test_pull_request.yml | 28 +++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 .github/workflows/test_pull_request.yml

diff --git a/.github/workflows/test_pull_request.yml b/.github/workflows/test_pull_request.yml
new file mode 100644
index 0000000..96b7a9b
--- /dev/null
+++ b/.github/workflows/test_pull_request.yml
@@ -0,0 +1,28 @@
+name: Test pull request
+on: pull_request
+jobs:
+  tox:
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        python: ['3.6', '3.8', '3.9', '3.10']
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python }}
+      - run: pip install --upgrade pip
+      - run: pip install tox
+      - run: tox -e py
+  lint:
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.10'
+      - run: make lint
\ No newline at end of file