Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .pre-commit-config-slow.yaml

This file was deleted.

16 changes: 11 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ exclude: 'src/pip/_vendor/'

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
rev: v3.4.0
hooks:
- id: check-builtin-literals
- id: check-added-large-files
Expand Down Expand Up @@ -53,7 +53,7 @@ repos:


- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.3
rev: 3.8.4
hooks:
- id: flake8
additional_dependencies: [
Expand All @@ -63,20 +63,20 @@ repos:
exclude: tests/data

- repo: https://github.com/PyCQA/isort
rev: 5.5.3
rev: 5.7.0
hooks:
- id: isort
files: \.py$

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.790
rev: v0.800
hooks:
- id: mypy
exclude: docs|tests
args: ["--pretty"]

- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.6.0
rev: v1.7.0
hooks:
- id: python-no-log-warn
- id: python-no-eval
Expand All @@ -93,3 +93,9 @@ repos:
entry: NEWS fragment files must be named *.(process|removal|feature|bugfix|vendor|doc|trivial).rst
exclude: ^news/(.gitignore|.*\.(process|removal|feature|bugfix|vendor|doc|trivial).rst)
files: ^news/

- repo: https://github.com/mgedmin/check-manifest
rev: '0.46'
hooks:
- id: check-manifest
stages: [manual]
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ exclude .appveyor.yml
exclude .travis.yml
exclude .readthedocs.yml
exclude .pre-commit-config.yaml
exclude .pre-commit-config-slow.yaml
exclude tox.ini
exclude noxfile.py

Expand Down
4 changes: 1 addition & 3 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,9 @@ def lint(session):
args = session.posargs + ["--all-files"]
else:
args = ["--all-files", "--show-diff-on-failure"]
args.append("--hook-stage=manual")

session.run("pre-commit", "run", *args)
session.run(
"pre-commit", "run", "-c", ".pre-commit-config-slow.yaml", *args
)


@nox.session
Expand Down
2 changes: 1 addition & 1 deletion src/pip/_internal/locations.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import site
import sys
import sysconfig
from distutils.command.install import SCHEME_KEYS # type: ignore
from distutils.command.install import SCHEME_KEYS
from distutils.command.install import install as distutils_install_command

from pip._internal.models.scheme import Scheme
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ skip_install = True
commands_pre =
deps = pre-commit
commands =
pre-commit run [] --all-files --show-diff-on-failure
pre-commit run [] -c .pre-commit-config-slow.yaml --all-files --show-diff-on-failure
pre-commit run [] --all-files --show-diff-on-failure --hook-stage=manual

[testenv:vendoring]
basepython = python3
Expand Down