From f57b89ada68fc0cc9710a947f30b08361bf084b1 Mon Sep 17 00:00:00 2001 From: nicholasmhughes Date: Fri, 3 Nov 2023 13:19:50 -0400 Subject: [PATCH 1/5] 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 e911b2906bc0947f9ab9b006b7b79a5de97bf8e5 Mon Sep 17 00:00:00 2001 From: nicholasmhughes Date: Fri, 3 Nov 2023 13:24:43 -0400 Subject: [PATCH 2/5] 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 d4db75173f7ae9020cb3e7470b3313b474a23b8a Mon Sep 17 00:00:00 2001 From: KYTG Date: Wed, 29 Nov 2023 12:48:16 -0500 Subject: [PATCH 3/5] 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 17454851cfbc8c9342ab2dd12cff45731adda44b Mon Sep 17 00:00:00 2001 From: Barney Sowood Date: Wed, 24 Jan 2024 12:39:08 +0000 Subject: [PATCH 4/5] Update to use 3006.5 --- .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..3b4a7ca 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -22,7 +22,7 @@ jobs: - "tornado" salt: - "v3005.4" - - "v3006.4" + - "v3006.5" - "master" exclude: - py: "3.10" diff --git a/tox.ini b/tox.ini index 21a02c7..d4ae8d2 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,v3006.5,master},py{3.10,3.11}-{cherrypy,tornado}-{v3006.5,master},coverage,flake8 skip_missing_interpreters = true skipsdist = false @@ -7,7 +7,7 @@ skipsdist = false passenv = TOXENV, CI, TRAVIS, TRAVIS_*, CODECOV_* deps = -r{toxinidir}/tests/requirements.txt v3005.4: salt==3005.4 - v3006.4: salt==3006.4 + v3006.5: salt==3006.5 master: git+https://github.com/saltstack/salt.git@master#egg=salt changedir = {toxinidir} From e695eb10bb4bec78b419796a5486c5acc3f9d939 Mon Sep 17 00:00:00 2001 From: Barney Sowood Date: Wed, 24 Jan 2024 17:21:53 +0000 Subject: [PATCH 5/5] Test excluding master from py3.8 and py3.9 Testing with salt from master against py3.8 and py3.9 is failing, but it looks like some error with how exceptions are being raised. Just trying without that to consider if it's worth dropping that set of testing to at least get tests working again. --- .github/workflows/test.yaml | 4 ++++ tox.ini | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3b4a7ca..aa43496 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -25,6 +25,10 @@ jobs: - "v3006.5" - "master" exclude: + - py: "3.8" + salt: "master" + - py: "3.9" + salt: "master" - py: "3.10" salt: "v3005.4" - py: "3.11" diff --git a/tox.ini b/tox.ini index d4ae8d2..c4f7bec 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{3.8,3.9}-{cherrypy,tornado}-{v3005.4,v3006.5,master},py{3.10,3.11}-{cherrypy,tornado}-{v3006.5,master},coverage,flake8 +envlist = py{3.8,3.9}-{cherrypy,tornado}-{v3005.4,v3006.5},py{3.10,3.11}-{cherrypy,tornado}-{v3006.5,master},coverage,flake8 skip_missing_interpreters = true skipsdist = false