mirror of https://github.com/pypa/pip
Rename `tox lint-py3` to `tox lint`
Also update references to it, in Travis CI config and in documentation.
This commit is contained in:
parent
5e97de4773
commit
506a08bc38
|
@ -16,9 +16,9 @@ jobs:
|
|||
# Basic Checks
|
||||
- stage: primary
|
||||
env: TOXENV=docs
|
||||
- env: TOXENV=lint
|
||||
- env: TOXENV=lint-py2
|
||||
python: 2.7
|
||||
- env: TOXENV=lint-py3
|
||||
- env: TOXENV=mypy
|
||||
- env: TOXENV=packaging
|
||||
# Latest CPython
|
||||
|
|
|
@ -75,10 +75,10 @@ To use linters locally, run:
|
|||
|
||||
.. code-block:: console
|
||||
|
||||
$ tox -e lint
|
||||
$ tox -e lint-py2
|
||||
$ tox -e lint-py3
|
||||
|
||||
The above commands run the linters on Python 2 followed by Python 3.
|
||||
The above commands run the linters on Python 3 followed by Python 2.
|
||||
|
||||
.. note::
|
||||
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
set -e
|
||||
|
||||
# Short circuit tests and linting jobs if there are no code changes involved.
|
||||
if [[ $TOXENV != docs ]] && [[ $TOXENV != lint-py2 ]] && [[ $TOXENV != lint-py3 ]]; then
|
||||
# Keep lint-py2 & lint-py3 for docs/conf.py
|
||||
if [[ $TOXENV != docs ]] && [[ $TOXENV != lint-py2 ]] && [[ $TOXENV != lint ]]; then
|
||||
# Keep lint and lint-py2, for docs/conf.py
|
||||
if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]
|
||||
then
|
||||
echo "This is not a PR -- will do a complete build."
|
||||
|
|
4
tox.ini
4
tox.ini
|
@ -1,7 +1,7 @@
|
|||
[tox]
|
||||
minversion = 3.4.0
|
||||
envlist =
|
||||
docs, packaging, lint-py2, lint-py3, mypy,
|
||||
docs, packaging, mypy, lint, lint-py2,
|
||||
py27, py35, py36, py37, py38, pypy, pypy3
|
||||
|
||||
[helpers]
|
||||
|
@ -63,7 +63,7 @@ commands =
|
|||
flake8 src tests
|
||||
isort --check-only --diff
|
||||
|
||||
[testenv:lint-py3]
|
||||
[testenv:lint]
|
||||
skip_install = True
|
||||
basepython = python3
|
||||
deps = {[lint]deps}
|
||||
|
|
Loading…
Reference in New Issue