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.

Sign up for GitHub

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

Jump to bottom

Fix virtualenv setuptools #549

Merged
merged 5 commits into from Dec 28, 2021
Merged

Fix virtualenv setuptools #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
12eaa7a
Use SETUPTOOLS_USE_DISTUTILS env var rather than pinning virtualenv
FollowTheProcess Dec 28, 2021
7b17acb
Add explanatory comment and fix typo
FollowTheProcess Dec 28, 2021
4886687
Add a further explanatory comment for traceability
FollowTheProcess Dec 28, 2021
0224be8
Add the SETUPTOOLS_USE_DISTUTILS env var to the nox lint session
FollowTheProcess Dec 28, 2021
d0986ae
Add session.posargs back to the lint session
FollowTheProcess Dec 28, 2021
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Expand Up @@ -3,6 +3,9 @@ on: [push, pull_request]
env:
FORCE_COLOR: "1"
PRE_COMMIT_COLOR: "always"
# See https://github.com/theacodes/nox/issues/545
# and https://github.com/pre-commit/pre-commit/issues/2178#issuecomment-1002163763
SETUPTOOLS_USE_DISTUTILS: "stdlib"
FollowTheProcess marked this conversation as resolved.
Show resolved Hide resolved
jobs:
build:
runs-on: ${{ matrix.os }}
Expand Down
11 changes: 8 additions & 3 deletions noxfile.py
View file
Open in desktop
Expand Up @@ -93,11 +93,16 @@ def cover(session):
@nox.session(python="3.9")
def lint(session):
"""Run pre-commit linting."""
# Pin virtualenv for pre-commit run
session.install("pre-commit")
# See https://github.com/theacodes/nox/issues/545
session.install("virtualenv==20.10.0", "pre-commit")
# and https://github.com/pre-commit/pre-commit/issues/2178#issuecomment-1002163763
session.run(
"pre-commit", "run", "--all-files", "--show-diff-on-failure", *session.posargs
"pre-commit",
"run",
"--all-files",
"--show-diff-on-failure",
env={"SETUPTOOLS_USE_DISTUTILS": "stdlib"},
*session.posargs,
)


Expand Down