Skip to content

Commit 9f7ef41

Browse files
committed
upgrade pip first
1 parent 5978e2a commit 9f7ef41

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ jobs:
2626
- name: Run Tests
2727
env:
2828
HEADLESS: 1
29-
run: |
30-
pip install --upgrade pip
31-
nox
29+
run: nox
3230

3331
test-on-macos:
3432
runs-on: macos-latest
@@ -47,9 +45,7 @@ jobs:
4745
- name: Run Tests
4846
env:
4947
HEADLESS: 1
50-
run: |
51-
pip install --upgrade pip
52-
nox
48+
run: nox
5349

5450
test-on-windows:
5551
runs-on: windows-latest
@@ -67,9 +63,6 @@ jobs:
6763
- name: Install Python Dependencies
6864
run: pip install -r requirements/test-run.txt
6965
- name: Run Tests
70-
shell: bash
7166
env:
7267
HEADLESS: 1
73-
run: |
74-
pip install --upgrade pip wheel
75-
nox
68+
run: nox

noxfile.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import os
2+
from functools import wraps
3+
from typing import TypeVar
24

35
import nox
46
from nox.sessions import Session
@@ -8,7 +10,20 @@
810
BLACK_DEFAULT_EXCLUDE = r"\.eggs|\.git|\.hg|\.mypy_cache|\.nox|\.tox|\.venv|\.svn|_build|buck-out|build|dist"
911

1012

13+
_Func = TypeVar("_Func")
14+
15+
16+
def upgrade_pip(func: _Func) -> _Func:
17+
@wraps(func)
18+
def decorator(session: Session) -> None:
19+
session.install("--upgrade", "pip")
20+
func(session)
21+
22+
return decorator
23+
24+
1125
@nox.session
26+
@upgrade_pip
1227
def test_python(session: Session) -> None:
1328
session.env.update(os.environ)
1429
session.install("-r", "requirements/test-env.txt")
@@ -20,6 +35,7 @@ def test_python(session: Session) -> None:
2035

2136

2237
@nox.session
38+
@upgrade_pip
2339
def check_types(session: Session) -> None:
2440
session.install("-r", "requirements/check-types.txt")
2541
session.install("-r", "requirements/pkg-deps.txt")
@@ -28,6 +44,7 @@ def check_types(session: Session) -> None:
2844

2945

3046
@nox.session
47+
@upgrade_pip
3148
def check_style(session: Session) -> None:
3249
session.install("-r", "requirements/check-style.txt")
3350
session.run(
@@ -41,7 +58,9 @@ def check_style(session: Session) -> None:
4158

4259

4360
@nox.session
61+
@upgrade_pip
4462
def build_docs(session: Session) -> None:
63+
upgrade_pip(session)
4564
session.install("-r", "requirements/build-docs.txt")
4665
session.install("-e", ".[all]")
4766
session.run("sphinx-build", "-b", "html", "docs/source", "docs/build")

0 commit comments

Comments
 (0)