From 6a4489c3dd57d7bfc7029e91f96fd3ffff2eec1c Mon Sep 17 00:00:00 2001
From: nicholasmhughes <nicholasmhughes@gmail.com>
Date: Fri, 3 Nov 2023 13:19:50 -0400
Subject: [PATCH 1/4] update actions version matrix

---
 .github/workflows/test.yaml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 5a801e0..b424152 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -13,23 +13,22 @@ jobs:
       fail-fast: false
       matrix:
         py:
-          - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
         netapi:
           - "cherrypy"
           - "tornado"
         salt:
-          - "v3004.2"
-          - "v3005.1"
-          - "v3006.0"
+          - "v3005.4"
+          - "v3006.4"
           - "master"
         exclude:
           - py: "3.10"
-            salt: "v3004.2"
-          - py: "3.10"
-            salt: "v3005.1"
+            salt: "v3005.4"
+          - py: "3.11"
+            salt: "v3005.4"
     steps:
       - name: Setup python for test ${{ matrix.py }}
         uses: actions/setup-python@v4

From e730d234d57c687d0e29201b0ae9aac29f8ea4c1 Mon Sep 17 00:00:00 2001
From: nicholasmhughes <nicholasmhughes@gmail.com>
Date: Fri, 3 Nov 2023 13:24:43 -0400
Subject: [PATCH 2/4] update tox version matrix

---
 tox.ini | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tox.ini b/tox.ini
index 35df1fa..21a02c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,13 @@
 [tox]
-envlist = py{3.7,3.8,3.9}-{cherrypy,tornado}-{v3004.2,v3005.1,v3006.0,master},py{3.10}-{cherrypy,tornado}-{v3006.0,master},coverage,flake8
+envlist = py{3.8,3.9}-{cherrypy,tornado}-{v3005.4,master},py{3.10,3.11}-{cherrypy,tornado}-{v3006.4,master},coverage,flake8
 skip_missing_interpreters = true
 skipsdist = false
 
 [testenv]
 passenv = TOXENV, CI, TRAVIS, TRAVIS_*, CODECOV_*
 deps = -r{toxinidir}/tests/requirements.txt
-    v3004.2: salt==3004.2
-    v3004.2: jinja2<3.1
-    v3005.1: salt==3005.1
-    v3006.0: salt==3006.0
+    v3005.4: salt==3005.4
+    v3006.4: salt==3006.4
     master: git+https://github.com/saltstack/salt.git@master#egg=salt
 
 changedir = {toxinidir}
@@ -45,7 +43,7 @@ commands = codecov --file "{toxworkdir}/coverage.xml"
 
 [testenv:http]
 skip_install = True
-basepython = python36
+basepython = python39
 deps =
 changedir = {toxinidir}/htmlcov
 commands = python -m http.server

From 186424196159018401d5cb0bcefa81acb236afe5 Mon Sep 17 00:00:00 2001
From: KYTG <keisha.gamble@eitr.cloud>
Date: Wed, 29 Nov 2023 12:48:16 -0500
Subject: [PATCH 3/4] set requirements to ensure compatibility

---
 tests/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index b6a15e2..ded9362 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -4,7 +4,7 @@ pytest-rerunfailures
 pytest-cov
 pytest-salt-factories==0.912.2
 CherryPy
-setuptools_scm
+setuptools_scm==7.1.0
 importlib-metadata<5.0.0
 pyzmq<=20.0.0 ; python_version < "3.6"
 pyzmq>=17.0.0 ; python_version < "3.9"

From d95c4d149ea201d00db300932d2a48181d5c167a Mon Sep 17 00:00:00 2001
From: KYTG <keisha.gamble@eitr.cloud>
Date: Tue, 30 Jan 2024 12:58:05 -0500
Subject: [PATCH 4/4] Only test with stable releases

---
 .github/workflows/test.yaml | 2 +-
 tox.ini                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index b424152..05e4213 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -23,7 +23,7 @@ jobs:
         salt:
           - "v3005.4"
           - "v3006.4"
-          - "master"
+          - "v3006.5"
         exclude:
           - py: "3.10"
             salt: "v3005.4"
diff --git a/tox.ini b/tox.ini
index 21a02c7..4c6d5d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{3.8,3.9}-{cherrypy,tornado}-{v3005.4,master},py{3.10,3.11}-{cherrypy,tornado}-{v3006.4,master},coverage,flake8
+envlist = py{3.8,3.9}-{cherrypy,tornado}-{v3005.4},py{3.10,3.11}-{cherrypy,tornado}-{v3006.4, v3006.5},coverage,flake8
 skip_missing_interpreters = true
 skipsdist = false
 
@@ -8,7 +8,7 @@ passenv = TOXENV, CI, TRAVIS, TRAVIS_*, CODECOV_*
 deps = -r{toxinidir}/tests/requirements.txt
     v3005.4: salt==3005.4
     v3006.4: salt==3006.4
-    master: git+https://github.com/saltstack/salt.git@master#egg=salt
+    v3006.5: salt==3006.5
 
 changedir = {toxinidir}
 setenv = COVERAGE_FILE = {toxworkdir}/.coverage.{envname}