Skip to content

Commit 8685d27

Browse files
authored
Update python versions (#509)
1 parent 360f120 commit 8685d27

File tree

4 files changed

+33
-30
lines changed

4 files changed

+33
-30
lines changed

.github/workflows/actions.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@master
2222
- name: Set up Python
23-
uses: actions/setup-python@v2
23+
uses: actions/setup-python@v3
2424
with:
25-
python-version: 3.6
25+
python-version: 3.9
2626
- name: Install tox
2727
run: python -m pip install --upgrade tox
2828
- name: Build docs with tox
2929
run: python -m tox -e docs
3030

3131
tests:
32-
uses: pytest-dev/pytest-html/.github/workflows/tests.yml@master
32+
uses: ./.github/workflows/tests.yml
3333

3434
publish:
3535
name: Publish to PyPI registry
@@ -41,14 +41,13 @@ jobs:
4141
TOXENV: packaging
4242

4343
steps:
44-
- name: Switch to using Python 3.6 by default
45-
uses: actions/setup-python@v2
44+
- uses: actions/setup-python@v3
4645
with:
47-
python-version: 3.6
46+
python-version: 3.9
4847
- name: Install tox
4948
run: python -m pip install --user tox
5049
- name: Check out src from Git
51-
uses: actions/checkout@v2
50+
uses: actions/checkout@v3
5251
with:
5352
# Get shallow Git history (default) for tag creation events
5453
# but have a complete clone for any other workflows.

.github/workflows/nightly.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ on:
66

77
jobs:
88
tests:
9-
uses: pytest-dev/pytest-html/.github/workflows/tests.yml@master
9+
if: github.repository_owner == 'pytest-dev'
10+
uses: ./.github/workflows/tests.yml

.github/workflows/tests.yml

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,9 @@ jobs:
88
name: ${{ matrix.name }}
99
runs-on: ${{ matrix.os }}
1010
strategy:
11+
fail-fast: false
1112
matrix:
1213
include:
13-
- os: ubuntu-latest
14-
name: py36-ubuntu
15-
python-version: 3.6
16-
17-
- os: windows-latest
18-
name: py36-windows
19-
python-version: 3.6
20-
21-
- os: macOS-latest
22-
name: py36-mac
23-
python-version: 3.6
24-
2514
- os: ubuntu-latest
2615
name: py37-ubuntu
2716
python-version: 3.7
@@ -58,18 +47,30 @@ jobs:
5847
name: py39-mac
5948
python-version: 3.9
6049

50+
- os: ubuntu-latest
51+
name: py310-ubuntu
52+
python-version: '3.10'
53+
54+
- os: windows-latest
55+
name: py310-windows
56+
python-version: '3.10'
57+
58+
- os: macOS-latest
59+
name: py310-mac
60+
python-version: '3.10'
61+
6162
- os: ubuntu-latest
6263
name: pypy3-ubuntu
63-
python-version: pypy3
64+
python-version: pypy-3.8
6465

6566
- os: windows-latest
6667
name: pypy3-windows
67-
python-version: pypy3
68+
python-version: pypy-3.8
6869

6970
# https://github.com/pytest-dev/pytest-html/issues/482
70-
# - os: macOS-latest
71-
# name: pypy3-mac
72-
# python-version: pypy3
71+
- os: macOS-latest
72+
name: pypy3-mac
73+
python-version: pypy-3.8
7374

7475
- os: ubuntu-latest
7576
name: devel-ubuntu
@@ -78,9 +79,11 @@ jobs:
7879
steps:
7980
- name: Set Newline Behavior
8081
run : git config --global core.autocrlf false
81-
- uses: actions/checkout@master
82+
- uses: actions/checkout@v3
83+
with:
84+
fetch-depth: 0
8285
- name: Set up Python
83-
uses: actions/setup-python@v2
86+
uses: actions/setup-python@v3
8487
with:
8588
python-version: ${{ matrix['python-version'] }}
8689
- name: Install tox
@@ -112,9 +115,9 @@ jobs:
112115
name: grunt
113116
runs-on: ubuntu-latest
114117
steps:
115-
- uses: actions/checkout@v2
118+
- uses: actions/checkout@v3
116119
- name: Use Node.js ${{ matrix.node-version }}
117-
uses: actions/setup-node@v1
120+
uses: actions/setup-node@v3
118121
with:
119122
node-version: '12.x'
120123
- name: Install Dependencies

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = py{36,37,38,39,py3}, docs, linting
7+
envlist = py{37,38,39,310,py3}, docs, linting
88
isolated_build = True
99

1010
[testenv]

0 commit comments

Comments
 (0)