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.

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 #509

Merged
merged 1 commit into from Mar 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/actions.yml
Expand Up @@ -20,16 +20,16 @@ jobs:
steps:
- uses: actions/checkout@master
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: 3.6
python-version: 3.9
- name: Install tox
run: python -m pip install --upgrade tox
- name: Build docs with tox
run: python -m tox -e docs

tests:
uses: pytest-dev/pytest-html/.github/workflows/tests.yml@master
uses: ./.github/workflows/tests.yml

publish:
name: Publish to PyPI registry
Expand All @@ -41,14 +41,13 @@ jobs:
TOXENV: packaging

steps:
- name: Switch to using Python 3.6 by default
uses: actions/setup-python@v2
- uses: actions/setup-python@v3
with:
python-version: 3.6
python-version: 3.9
- name: Install tox
run: python -m pip install --user tox
- name: Check out src from Git
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
# Get shallow Git history (default) for tag creation events
# but have a complete clone for any other workflows.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/nightly.yml
Expand Up @@ -6,4 +6,5 @@ on:

jobs:
tests:
uses: pytest-dev/pytest-html/.github/workflows/tests.yml@master
if: github.repository_owner == 'pytest-dev'
uses: ./.github/workflows/tests.yml
45 changes: 24 additions & 21 deletions .github/workflows/tests.yml
Expand Up @@ -8,20 +8,9 @@ jobs:
name: ${{ matrix.name }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
name: py36-ubuntu
python-version: 3.6

- os: windows-latest
name: py36-windows
python-version: 3.6

- os: macOS-latest
name: py36-mac
python-version: 3.6

- os: ubuntu-latest
name: py37-ubuntu
python-version: 3.7
Expand Down Expand Up @@ -58,18 +47,30 @@ jobs:
name: py39-mac
python-version: 3.9

- os: ubuntu-latest
name: py310-ubuntu
python-version: '3.10'

- os: windows-latest
name: py310-windows
python-version: '3.10'

- os: macOS-latest
name: py310-mac
python-version: '3.10'

- os: ubuntu-latest
name: pypy3-ubuntu
python-version: pypy3
python-version: pypy-3.8

- os: windows-latest
name: pypy3-windows
python-version: pypy3
python-version: pypy-3.8

# https://github.com/pytest-dev/pytest-html/issues/482
# - os: macOS-latest
# name: pypy3-mac
# python-version: pypy3
- os: macOS-latest
name: pypy3-mac
python-version: pypy-3.8

- os: ubuntu-latest
name: devel-ubuntu
Expand All @@ -78,9 +79,11 @@ jobs:
steps:
- name: Set Newline Behavior
run : git config --global core.autocrlf false
- uses: actions/checkout@master
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix['python-version'] }}
- name: Install tox
Expand Down Expand Up @@ -112,9 +115,9 @@ jobs:
name: grunt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: '12.x'
- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Expand Up @@ -4,7 +4,7 @@
# and then run "tox" from this directory.

[tox]
envlist = py{36,37,38,39,py3}, docs, linting
envlist = py{37,38,39,310,py3}, docs, linting
isolated_build = True

[testenv]
Expand Down