Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update python versions and try to fix actions #234

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft

Update python versions and try to fix actions #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f57b89a
update actions version matrix
nicholasmhughes Nov 3, 2023
e911b29
update tox version matrix
nicholasmhughes Nov 3, 2023
d4db751
set requirements to ensure compatibility
Nov 29, 2023
1745485
Update to use 3006.5
barneysowood Jan 24, 2024
e695eb1
Test excluding master from py3.8 and py3.9
barneysowood Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,26 @@ 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.5"
- "master"
exclude:
- py: "3.8"
salt: "master"
- py: "3.9"
salt: "master"
- 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
Expand Down
2 changes: 1 addition & 1 deletion tests/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 4 additions & 6 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,v3006.5},py{3.10,3.11}-{cherrypy,tornado}-{v3006.5,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.5: salt==3006.5
master: git+https://github.com/saltstack/salt.git@master#egg=salt

changedir = {toxinidir}
Expand Down Expand Up @@ -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
Expand Down