Skip to content

Commit

Permalink
Merge branch 'main' into use-pipx
Browse files Browse the repository at this point in the history
  • Loading branch information
brettcannon committed Mar 16, 2022
2 parents 5c1ec60 + 35c50dc commit ea690a2
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/docs.yml
Expand Up @@ -4,11 +4,11 @@ on:
pull_request:
paths:
- ".github/workflows/docs.yml"
- 'docs/**'
- "docs/**"
push:
paths:
- ".github/workflows/docs.yml"
- 'docs/**'
- "docs/**"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
Expand All @@ -20,12 +20,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v1

- uses: actions/setup-python@v2
name: Install Python
with:
python-version: '3.9'
- uses: actions/setup-python@v3
name: Install Python
with:
python-version: "3.9"
cache: "pip"

- name: Build documentation
run: pipx run nox -s docs
- name: Build documentation
run: pipx run nox -s docs
3 changes: 2 additions & 1 deletion .github/workflows/lint.yml
Expand Up @@ -22,10 +22,11 @@ jobs:
steps:
- uses: actions/checkout@v1

- uses: actions/setup-python@v2
- uses: actions/setup-python@v3
name: Install Python
with:
python-version: "3.9"
cache: "pip"

- name: Run `nox -s lint`
run: pipx run nox -s lint
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Expand Up @@ -28,10 +28,11 @@ jobs:
steps:
- uses: actions/checkout@v1

- uses: actions/setup-python@v2
- uses: actions/setup-python@v3
name: Install Python ${{ matrix.python_version }}
with:
python-version: ${{ matrix.python_version }}
cache: "pip"

# PyPy 3.9 for Windows changed the binary name from pypy3 to pypy3.9
# PyPy 3.7 & 3.8 for Windows still only have pypy3
Expand Down

0 comments on commit ea690a2

Please sign in to comment.