diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d039d63f4c0..e25a469a385 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -129,14 +129,6 @@ repos: - --include=requirements/raet.txt - --include=requirements/pytest.txt - --remove-line=^pycryptodome==(.*)$ - - id: pip-tools-compile - alias: compile-lint-py3.4-requirements - name: Lint Py3.4 Requirements - files: ^requirements/static/lint\.in$ - args: - - -v - - --py-version=3.4 - - --platform=linux - id: pip-tools-compile alias: compile-linux-py3.5-zmq-requirements @@ -218,14 +210,6 @@ repos: - --include=requirements/raet.txt - --include=requirements/pytest.txt - --remove-line=^pycryptodome==(.*)$ - - id: pip-tools-compile - alias: compile-lint-py3.5-requirements - name: Lint Py3.5 Requirements - files: ^requirements/static/lint\.in$ - args: - - -v - - --py-version=3.5 - - --platform=linux - id: pip-tools-compile alias: compile-linux-py3.6-zmq-requirements @@ -307,11 +291,3 @@ repos: - --include=requirements/raet.txt - --include=requirements/pytest.txt - --remove-line=^pycryptodome==(.*)$ - - id: pip-tools-compile - alias: compile-lint-py3.6-requirements - name: Lint Py3.6 Requirements - files: ^requirements/static/lint\.in$ - args: - - -v - - --py-version=3.6 - - --platform=linux diff --git a/noxfile.py b/noxfile.py index df1faf60e02..838de3cb0c4 100644 --- a/noxfile.py +++ b/noxfile.py @@ -603,7 +603,7 @@ def _lint(session, rcfile, flags, paths): raise -@nox.session(python=_PYTHON_VERSIONS) +@nox.session(python='2.7') def lint(session): ''' Run PyLint against Salt and it's test suite. Set PYLINT_REPORT to a path to capture output. @@ -612,7 +612,7 @@ def lint(session): session.notify('lint-tests-{}'.format(session.python)) -@nox.session(python=_PYTHON_VERSIONS, name='lint-salt') +@nox.session(python='2.7', name='lint-salt') def lint_salt(session): ''' Run PyLint against Salt. Set PYLINT_REPORT to a path to capture output. @@ -627,7 +627,7 @@ def lint_salt(session): _lint(session, '.testing.pylintrc', flags, paths) -@nox.session(python=_PYTHON_VERSIONS, name='lint-tests') +@nox.session(python='2.7', name='lint-tests') def lint_tests(session): ''' Run PyLint against Salt and it's test suite. Set PYLINT_REPORT to a path to capture output. diff --git a/requirements/static/py3.4/lint.txt b/requirements/static/py3.4/lint.txt deleted file mode 100644 index 9e1b7bfbcd6..00000000000 --- a/requirements/static/py3.4/lint.txt +++ /dev/null @@ -1,16 +0,0 @@ -# -# This file is autogenerated by pip-compile -# To update, run: -# -# pip-compile -o requirements/static/py3.4/lint.txt -v requirements/static/lint.in -# -astroid==1.4.9 # via pylint -isort==4.3.16 # via pylint -lazy-object-proxy==1.3.1 # via astroid -mccabe==0.6.1 # via pylint -modernize==0.5 # via saltpylint -pycodestyle==2.5.0 # via saltpylint -pylint==1.6.5 -saltpylint==2019.1.11 -six==1.12.0 # via astroid, pylint -wrapt==1.11.1 # via astroid diff --git a/requirements/static/py3.5/lint.txt b/requirements/static/py3.5/lint.txt deleted file mode 100644 index 08a1ecc0961..00000000000 --- a/requirements/static/py3.5/lint.txt +++ /dev/null @@ -1,16 +0,0 @@ -# -# This file is autogenerated by pip-compile -# To update, run: -# -# pip-compile -o requirements/static/py3.5/lint.txt -v requirements/static/lint.in -# -astroid==1.4.9 # via pylint -isort==4.3.16 # via pylint -lazy-object-proxy==1.3.1 # via astroid -mccabe==0.6.1 # via pylint -modernize==0.5 # via saltpylint -pycodestyle==2.5.0 # via saltpylint -pylint==1.6.5 -saltpylint==2019.1.11 -six==1.12.0 # via astroid, pylint -wrapt==1.11.1 # via astroid diff --git a/requirements/static/py3.6/lint.txt b/requirements/static/py3.6/lint.txt deleted file mode 100644 index 780d3264499..00000000000 --- a/requirements/static/py3.6/lint.txt +++ /dev/null @@ -1,16 +0,0 @@ -# -# This file is autogenerated by pip-compile -# To update, run: -# -# pip-compile -o requirements/static/py3.6/lint.txt -v requirements/static/lint.in -# -astroid==1.4.9 # via pylint -isort==4.3.16 # via pylint -lazy-object-proxy==1.3.1 # via astroid -mccabe==0.6.1 # via pylint -modernize==0.5 # via saltpylint -pycodestyle==2.5.0 # via saltpylint -pylint==1.6.5 -saltpylint==2019.1.11 -six==1.12.0 # via astroid, pylint -wrapt==1.11.1 # via astroid