diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c25eac366a4..8e83016008e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ repos: alias: compile-linux-py2.7-zmq-requirements name: Linux Py2.7 ZeroMQ Requirements files: ^requirements/((base|zeromq|pytest)\.txt|static/(.*)\.in)$ - exclude: ^requirements/static/(osx|windows)\.in$ + exclude: ^requirements/static/(lint|osx|windows)\.in$ args: - -v - --py-version=2.7 @@ -47,7 +47,7 @@ repos: alias: compile-linux-py2.7-raet-requirements name: Linux Py2.7 RAET Requirements files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$ - exclude: ^requirements/static/(osx|windows)\.in$ + exclude: ^requirements/static/(lint|osx|windows)\.in$ args: - -v - --py-version=2.7 @@ -83,12 +83,20 @@ repos: - --include=requirements/raet.txt - --include=requirements/pytest.txt - --remove-line=^pycryptodome==(.*)$ + - id: pip-tools-compile + alias: compile-lint-py2.7-requirements + name: Lint Py2.7 Requirements + files: ^requirements/static/lint\.in$ + args: + - -v + - --py-version=2.7 + - --platform=linux - id: pip-tools-compile alias: compile-linux-py3.4-zmq-requirements name: Linux Py3.4 ZeroMQ Requirements files: ^requirements/((base|zeromq|pytest)\.txt|static/(.*)\.in)$ - exclude: ^requirements/static/(centos-6|ubuntu-14.04|osx|windows)\.in$ + exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|osx|windows)\.in$ args: - -v - --py-version=3.4 @@ -102,7 +110,7 @@ repos: alias: compile-linux-py3.4-raet-requirements name: Linux Py3.4 RAET Requirements files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$ - exclude: ^requirements/static/(centos-6|ubuntu-14.04|osx|windows)\.in$ + exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|osx|windows)\.in$ args: - -v - --py-version=3.4 @@ -112,12 +120,20 @@ 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 name: Linux Py3.5 ZeroMQ Requirements files: ^requirements/((base|zeromq|pytest)\.txt|static/(.*)\.in)$ - exclude: ^requirements/static/(centos-6|ubuntu-14.04|osx|windows)\.in$ + exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|osx|windows)\.in$ args: - -v - --py-version=3.5 @@ -157,7 +173,7 @@ repos: alias: compile-linux-py3.5-raet-requirements name: Linux Py3.5 RAET Requirements files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$ - exclude: ^requirements/static/(centos-6|ubuntu-14.04|osx|windows)\.in$ + exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|osx|windows)\.in$ args: - -v - --py-version=3.5 @@ -193,12 +209,20 @@ 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 name: Linux Py3.6 ZeroMQ Requirements files: ^requirements/((base|zeromq|pytest)\.txt|static/(.*)\.in)$ - exclude: ^requirements/static/(centos-6|ubuntu-14.04|osx|windows)\.in$ + exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|osx|windows)\.in$ args: - -v - --py-version=3.6 @@ -238,7 +262,7 @@ repos: alias: compile-linux-py3.6-raet-requirements name: Linux Py3.6 RAET Requirements files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$ - exclude: ^requirements/static/(centos-6|ubuntu-14.04|osx|windows)\.in$ + exclude: ^requirements/static/(centos-6|ubuntu-14.04|lint|osx|windows)\.in$ args: - -v - --py-version=3.6 @@ -274,3 +298,11 @@ 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/requirements/static/lint.in b/requirements/static/lint.in new file mode 100644 index 00000000000..31fdab37384 --- /dev/null +++ b/requirements/static/lint.in @@ -0,0 +1,4 @@ +# Lint requirements + +pylint==1.6.5 +SaltPyLint>=v2017.3.6 diff --git a/requirements/static/py2.7/lint.txt b/requirements/static/py2.7/lint.txt new file mode 100644 index 00000000000..d54e117cd72 --- /dev/null +++ b/requirements/static/py2.7/lint.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile +# To update, run: +# +# pip-compile -o requirements/static/py2.7/lint.txt -v requirements/static/lint.in +# +astroid==1.4.9 # via pylint +backports.functools-lru-cache==1.5 # via isort, pylint +configparser==3.7.4 # via pylint +futures==3.2.0 # via isort +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.4/lint.txt b/requirements/static/py3.4/lint.txt new file mode 100644 index 00000000000..9e1b7bfbcd6 --- /dev/null +++ b/requirements/static/py3.4/lint.txt @@ -0,0 +1,16 @@ +# +# 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 new file mode 100644 index 00000000000..08a1ecc0961 --- /dev/null +++ b/requirements/static/py3.5/lint.txt @@ -0,0 +1,16 @@ +# +# 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 new file mode 100644 index 00000000000..780d3264499 --- /dev/null +++ b/requirements/static/py3.6/lint.txt @@ -0,0 +1,16 @@ +# +# 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