From 16eaf320b06b3d40fb99ba540516f06294c80ebb Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Mon, 1 May 2023 19:02:41 +0100
Subject: [PATCH 1/4] Add Salt 3006.0 and py3.9/py3.10

Adds 3006.0 to versions of Salt tested against and also python 3.9 and
3.10
---
 .github/workflows/test.yaml | 3 +++
 tox.ini                     | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 2da9d9e..2cc1b82 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -15,12 +15,15 @@ jobs:
         py:
           - "3.7"
           - "3.8"
+          - "3.9"
+          - "3.10"
         netapi:
           - "cherrypy"
           - "tornado"
         salt:
           - "v3004.2"
           - "v3005.1"
+          - "v3006.0"
           - "master"
     steps:
       - name: Setup python for test ${{ matrix.py }}
diff --git a/tox.ini b/tox.ini
index 4415136..d6baa9b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{3.7,3.8}-{cherrypy,tornado}-{v3004.2,v3005.1,master},coverage,flake8
+envlist = py{3.7,3.8,3.9,3.10}-{cherrypy,tornado}-{v3004.2,v3005.1,v3006.0,master},coverage,flake8
 skip_missing_interpreters = true
 skipsdist = false
 
@@ -9,7 +9,8 @@ deps = -r{toxinidir}/tests/requirements.txt
     v3004.2: salt<3004.2
     v3004.2: jinja2<3.1
     v3005.1: salt<3005.1
-    py3.7-{cherrypy,tornado}-{v3004.2,v3005.1}: importlib-metadata<5.0.0
+    v3006.0: salt<3006.0
+    py3.7-{cherrypy,tornado}-{v3004.2,v3005.1,v3006.0}: importlib-metadata<5.0.0
     master: git+https://github.com/saltstack/salt.git@master#egg=salt
 
 changedir = {toxinidir}

From 912b898e702bd126976cdcbe6e410fd472091456 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Mon, 1 May 2023 20:39:21 +0100
Subject: [PATCH 2/4] Exclude py3.10 for 3004.2 and 3005.1

---
 .github/workflows/test.yaml | 5 +++++
 tox.ini                     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 2cc1b82..5a801e0 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -25,6 +25,11 @@ jobs:
           - "v3005.1"
           - "v3006.0"
           - "master"
+        exclude:
+          - py: "3.10"
+            salt: "v3004.2"
+          - py: "3.10"
+            salt: "v3005.1"
     steps:
       - name: Setup python for test ${{ matrix.py }}
         uses: actions/setup-python@v4
diff --git a/tox.ini b/tox.ini
index d6baa9b..5bb1be9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{3.7,3.8,3.9,3.10}-{cherrypy,tornado}-{v3004.2,v3005.1,v3006.0,master},coverage,flake8
+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
 skip_missing_interpreters = true
 skipsdist = false
 

From cd9caba5740cf49b85ee04be586abe6b5e23099b Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Mon, 1 May 2023 20:59:54 +0100
Subject: [PATCH 3/4] Pin salt versions correctly

Pins salt versions correctly - were using < which meant we got 3004.1
and 3005 instead of expected versions.
---
 tox.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tox.ini b/tox.ini
index 5bb1be9..2129171 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,10 +6,10 @@ skipsdist = false
 [testenv]
 passenv = TOXENV, CI, TRAVIS, TRAVIS_*, CODECOV_*
 deps = -r{toxinidir}/tests/requirements.txt
-    v3004.2: salt<3004.2
+    v3004.2: salt==3004.2
     v3004.2: jinja2<3.1
-    v3005.1: salt<3005.1
-    v3006.0: salt<3006.0
+    v3005.1: salt==3005.1
+    v3006.0: salt==3006.0
     py3.7-{cherrypy,tornado}-{v3004.2,v3005.1,v3006.0}: importlib-metadata<5.0.0
     master: git+https://github.com/saltstack/salt.git@master#egg=salt
 

From 2421a43ae918e745e47413de7354fd6e43f5c416 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Mon, 1 May 2023 21:53:29 +0100
Subject: [PATCH 4/4] Use importlib-meatdata<5.0.0 for all versions

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

diff --git a/tests/requirements.txt b/tests/requirements.txt
index c3b1d7d..b6a15e2 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -5,6 +5,7 @@ pytest-cov
 pytest-salt-factories==0.912.2
 CherryPy
 setuptools_scm
+importlib-metadata<5.0.0
 pyzmq<=20.0.0 ; python_version < "3.6"
 pyzmq>=17.0.0 ; python_version < "3.9"
 pyzmq>19.0.2 ; python_version >= "3.9"
diff --git a/tox.ini b/tox.ini
index 2129171..35df1fa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,6 @@ deps = -r{toxinidir}/tests/requirements.txt
     v3004.2: jinja2<3.1
     v3005.1: salt==3005.1
     v3006.0: salt==3006.0
-    py3.7-{cherrypy,tornado}-{v3004.2,v3005.1,v3006.0}: importlib-metadata<5.0.0
     master: git+https://github.com/saltstack/salt.git@master#egg=salt
 
 changedir = {toxinidir}