File tree Expand file tree Collapse file tree 1 file changed +15
-2
lines changed Expand file tree Collapse file tree 1 file changed +15
-2
lines changed Original file line number Diff line number Diff line change @@ -20,16 +20,22 @@ jobs:
2020 strategy :
2121 fail-fast : false
2222 matrix :
23+ <<<<<<< HEAD
2324 python-version :
2425 - " 3.11"
2526 - " 3.12"
27+ ||||||| parent of 9d52d28 (ci : set PYTHONPATH=src for pytest; keep Windows optional)
28+ python-version : ['3.11','3.12']
29+ name : linux (py=${{ matrix.python-version }})
30+ =======
31+ python-version : ["3.11","3.12"]
32+ >>>>>>> 9d52d28 (ci: set PYTHONPATH=src for pytest; keep Windows optional)
2633 env :
2734 PYTHONPATH : src
2835 steps :
2936 - uses : actions/checkout@v4
3037 - uses : actions/setup-python@v5
31- with :
32- python-version : ${{ matrix.python-version }}
38+ with : { python-version: ${{ matrix.python-version }} }
3339 - run : python -m pip install -U pip
3440 - run : pip install ruff black pytest mypy
3541 - run : ruff check .
4652 steps :
4753 - uses : actions/checkout@v4
4854 - uses : actions/setup-python@v5
55+ <<<<<<< HEAD
4956 with :
5057 python-version : " 3.12"
58+ ||||||| parent of 9d52d28 (ci : set PYTHONPATH=src for pytest; keep Windows optional)
59+ with :
60+ python-version : ${{ matrix.python-version }}
61+ =======
62+ with : { python-version: "3.12" }
63+ >>>>>>> 9d52d28 (ci: set PYTHONPATH=src for pytest; keep Windows optional)
5164 - run : python -m pip install -U pip
5265 - run : pip install ruff black pytest mypy
5366 - run : ruff check .
You can’t perform that action at this time.
0 commit comments