From a83fc07432dd476fd89e60125ec92c5bcbfbd060 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 11:57:20 +0000
Subject: [PATCH 1/9] Update python and salt versions in tox.ini

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

diff --git a/tox.ini b/tox.ini
index ece2b3c..67c74f6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,14 +1,14 @@
 [tox]
-envlist = py{27,34,35,36,37,38}-{cherrypy,tornado}-{v2018.3,v2019.2,develop},coverage,flake8
+envlist = py{35,36,37,38}-{cherrypy,tornado}-{v3004.2,v3005.1,master},coverage,flake8
 skip_missing_interpreters = true
 skipsdist = false
 
 [testenv]
-passenv = TOXENV CI TRAVIS TRAVIS_* CODECOV_*
+passenv = TOXENV, CI, TRAVIS, TRAVIS_*, CODECOV_*
 deps = -r{toxinidir}/tests/requirements.txt
-    v2018.3: salt<2018.4
-    v2019.2: salt<2019.3
-    develop: git+https://github.com/saltstack/salt.git@develop#egg=salt
+    v3004.2: salt<3004.2
+    v3005.1: salt<3005.1
+    master: git+https://github.com/saltstack/salt.git@master#egg=salt
 
 changedir = {toxinidir}
 setenv = COVERAGE_FILE = {toxworkdir}/.coverage.{envname}

From e7d7bd9b51209b7d4f4c02798f04ed5733b117fc Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 12:05:00 +0000
Subject: [PATCH 2/9] Update coverage version to current

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 67c74f6..ad0d040 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,7 @@ commands = flake8 tests/ pepper/ scripts/pepper setup.py
 [testenv:coverage]
 skip_install = True
 deps =
-    coverage >= 4.4.1, < 5
+    coverage >= 7.0.5, < 8
 setenv = COVERAGE_FILE={toxworkdir}/.coverage
 changedir = {toxinidir}
 commands =

From 29b0313df05b9d18f79826c1189d4261df8a419e Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 13:12:01 +0000
Subject: [PATCH 3/9] Add GH Actions workflow

Adds Github Actions workflow to call tox and run tests.
Doesn't currently implement coverage functionality - will add that
later.
---
 .github/workflows/test.yaml | 44 +++++++++++++++++++++++++++++++++++++
 tox.ini                     |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/test.yaml

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
new file mode 100644
index 0000000..24de2d6
--- /dev/null
+++ b/.github/workflows/test.yaml
@@ -0,0 +1,44 @@
+name: test
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 8 * * *"
+
+jobs:
+  test:
+    name: test ${{ matrix.py }} - ${{ matrix.netapi }} - ${{ matrix.salt }}
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        py:
+          - "3.5"
+          - "3.6"
+          - "3.7"
+          - "3.8"
+        netapi:
+          - "cherrypy"
+          - "tornado"
+        salt:
+          - "v3004.2"
+          - "v3005.1"
+          - "master"
+    steps:
+      - name: Setup python for test ${{ matrix.py }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.py }}
+      - uses: actions/checkout@v3
+      - name: Install setuptools_scm
+        run: python -m pip install setuptools_scm
+      - name: Install tox
+        run: python -m pip install tox
+      - name: Install dependencies
+        run: sudo apt update && sudo apt install -y libc6-dev libffi-dev gcc git openssh-server libzmq3-dev
+        env:
+          DEBIAN_FRONTEND: noninteractive
+      - name: Setup tests
+        run: tox -vv --notest -e py${{ matrix.py }}-${{ matrix.netapi }}-${{ matrix.salt }}
+      - name: Run tests
+        run: tox -vv -e py${{ matrix.py }}-${{ matrix.netapi }}-${{ matrix.salt }}
diff --git a/tox.ini b/tox.ini
index ad0d040..d43f942 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{35,36,37,38}-{cherrypy,tornado}-{v3004.2,v3005.1,master},coverage,flake8
+envlist = py{3.5,3.6,3.7,3.8}-{cherrypy,tornado}-{v3004.2,v3005.1,master},coverage,flake8
 skip_missing_interpreters = true
 skipsdist = false
 

From b28888cc7a21c69c306bceee7e51cb58d019924a Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 15:13:58 +0000
Subject: [PATCH 4/9] Add GH Actions workflow for flake8

---
 .github/workflows/flake8.yaml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .github/workflows/flake8.yaml

diff --git a/.github/workflows/flake8.yaml b/.github/workflows/flake8.yaml
new file mode 100644
index 0000000..f7ce5f5
--- /dev/null
+++ b/.github/workflows/flake8.yaml
@@ -0,0 +1,23 @@
+name: flake8 lint
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 8 * * *"
+
+jobs:
+  flake8-lint:
+    runs-on: ubuntu-20.04
+    name: flake8 lint
+    steps:
+      - name: Setup python for flake8
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.8"
+      - uses: actions/checkout@v3
+      - name: Install tox
+        run: python -m pip install tox
+      - name: Setup flake8
+        run: tox -vv --notest -e flake8
+      - name: Run flake8
+        run: tox -vv -e flake8

From d3c6c18df9cdd56445036fe0aa6eea9b7494ec2e Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 15:27:47 +0000
Subject: [PATCH 5/9] Add exclusion for master and py3.5/3.6

Adds an exclusion for master and python 3.5/3.6 as 3006 onwards requires
py 3.7.
---
 .github/workflows/test.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 24de2d6..d33a0d9 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -24,6 +24,11 @@ jobs:
           - "v3004.2"
           - "v3005.1"
           - "master"
+        exclude:
+          - salt: master
+            py: "3.5"
+          - salt: master
+            py: "3.6"
     steps:
       - name: Setup python for test ${{ matrix.py }}
         uses: actions/setup-python@v4

From 6f897d95e944f5bba9a47b98cd2c52aacc9d3d00 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 15:43:45 +0000
Subject: [PATCH 6/9] Run tox without -vv

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

diff --git a/.github/workflows/flake8.yaml b/.github/workflows/flake8.yaml
index f7ce5f5..461a414 100644
--- a/.github/workflows/flake8.yaml
+++ b/.github/workflows/flake8.yaml
@@ -18,6 +18,6 @@ jobs:
       - name: Install tox
         run: python -m pip install tox
       - name: Setup flake8
-        run: tox -vv --notest -e flake8
+        run: tox --notest -e flake8
       - name: Run flake8
-        run: tox -vv -e flake8
+        run: tox -e flake8
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index d33a0d9..eea4aea 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -44,6 +44,6 @@ jobs:
         env:
           DEBIAN_FRONTEND: noninteractive
       - name: Setup tests
-        run: tox -vv --notest -e py${{ matrix.py }}-${{ matrix.netapi }}-${{ matrix.salt }}
+        run: tox --notest -e py${{ matrix.py }}-${{ matrix.netapi }}-${{ matrix.salt }}
       - name: Run tests
-        run: tox -vv -e py${{ matrix.py }}-${{ matrix.netapi }}-${{ matrix.salt }}
+        run: tox -e py${{ matrix.py }}-${{ matrix.netapi }}-${{ matrix.salt }}

From acce4f6c5bbf302f700d45a63c67bd4eb28b771e Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 15:49:12 +0000
Subject: [PATCH 7/9] Update pytest-salt url

Updates pytest-salt url to point to
https://github.com/vmware-archive/pytest-salt. Should re-work tests
to use pytest-salt-factories.
---
 tests/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index b0be5ff..65fa14d 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -2,7 +2,7 @@ mock
 pytest>=3.5.0,<4.0.0
 pytest-rerunfailures
 pytest-cov
-git+https://github.com/saltstack/pytest-salt@master#egg=pytest-salt
+git+https://github.com/vmware-archive/pytest-salt@master#egg=pytest-salt
 tornado<5.0.0
 CherryPy
 setuptools_scm

From 1c1aca7ef60cfdcfcac806ddf4a5ecfca28d6381 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 15:53:23 +0000
Subject: [PATCH 8/9] Update requirements to match current salt

Updates requirements to match current salt requirements for zeromq
and tornado.
---
 tests/requirements.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 65fa14d..f0f770d 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -3,8 +3,9 @@ pytest>=3.5.0,<4.0.0
 pytest-rerunfailures
 pytest-cov
 git+https://github.com/vmware-archive/pytest-salt@master#egg=pytest-salt
-tornado<5.0.0
+tornado==6.1
 CherryPy
 setuptools_scm
-pyzmq>=2.2.0,<17.1.0; python_version == '3.4'  # pyzmq 17.1.0 stopped building wheels for python3.4
-pyzmq>=2.2.0; python_version != '3.4'
+pyzmq<=20.0.0 ; python_version < "3.6"
+pyzmq>=17.0.0 ; python_version < "3.9"
+pyzmq>19.0.2 ; python_version >= "3.9"
\ No newline at end of file

From e4afa37895c7fcd7fb852c7c0b34a45cc428ad89 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Fri, 20 Jan 2023 10:02:37 +0000
Subject: [PATCH 9/9] Removed scheduled run of flake8

---
 .github/workflows/flake8.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/flake8.yaml b/.github/workflows/flake8.yaml
index 461a414..b7b33ad 100644
--- a/.github/workflows/flake8.yaml
+++ b/.github/workflows/flake8.yaml
@@ -2,8 +2,6 @@ name: flake8 lint
 on:
   push:
   pull_request:
-  schedule:
-    - cron: "0 8 * * *"
 
 jobs:
   flake8-lint: