Skip to content

Commit 6b46d04

Browse files
author
Sylvain MARIE
committed
Fixed workflow and removed python 3.5 from CI as suggested by MatteoH2O1999/setup-python#44
1 parent f800786 commit 6b46d04

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

.github/workflows/base.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: List 'tests' nox sessions and required python versions
3838
id: set-matrix
39-
run: echo "::set-output name=matrix::$(nox --json -l -- -s tests -v)"
39+
run: echo "::set-output name=matrix::$(nox --json -l -s tests -v)"
4040

4141
outputs:
4242
matrix: ${{ steps.set-matrix.outputs.matrix }} # save nox sessions list to outputs

noxfile.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# add parent folder to python path so that we can import noxfile_utils.py
1010
# note that you need to "pip install -r noxfile-requiterements.txt" for this file to work.
1111
sys.path.append(str(Path(__file__).parent / "ci_tools"))
12-
from nox_utils import (PY27, PY37, PY36, PY35, PY38, PY39, PY310, PY311, PY312, install_reqs, rm_folder, rm_file,
12+
from nox_utils import (PY27, PY37, PY36, PY38, PY39, PY310, PY311, PY312, install_reqs, rm_folder, rm_file,
1313
DONT_INSTALL) # noqa
1414

1515

@@ -60,7 +60,6 @@ class Folders:
6060
PY39: {"coverage": False, "pkg_specs": {"pip": ">19"}},
6161
PY38: {"coverage": False, "pkg_specs": {"pip": ">19"}},
6262
PY27: {"coverage": False, "pkg_specs": {"pip": ">10"}},
63-
PY35: {"coverage": False, "pkg_specs": {"pip": ">10"}},
6463
PY36: {"coverage": False, "pkg_specs": {"pip": ">19"}},
6564
# IMPORTANT: this should be last so that the folder docs/reports is not deleted afterwards
6665
PY37: {"coverage": True, "pkg_specs": {"pip": ">19"}}, # , "pytest-html": "1.9.0"
@@ -285,6 +284,8 @@ def gha_list(session):
285284
out = session.run("nox", "-l", "--json", "-s", "tests", external=True, silent=True)
286285
sessions_list = [{"python": s["python"], "session": s["session"]} for s in json.loads(out)]
287286

287+
# TODO filter
288+
288289
# print the list so that it can be caught by GHA.
289290
# Note that json.dumps is optional since this is a list of string.
290291
# However it is to remind us that GHA expects a well-formatted json list of strings.

0 commit comments

Comments
 (0)