6 Jun
2018
6 Jun
'18
8:50 a.m.
Module: check_mk
Branch: master
Commit: e40c8462cfa8cf758b0c8c30ba4606f60e4f2093
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e40c8462cfa8cf…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Wed Jun 6 15:46:32 2018 +0200
Removed autopep8 and pylint from the static testing virtualenv.
autopep8 breaks the code far too much, and pylint really neeeds to run in
the very same virtualenv where the rest of the code lives.
Change-Id: Ife6264a81106e4d285a942e49b2b2cfb2066f67d
---
tests/static/Makefile | 11 +-----
tests/static/Pipfile | 2 -
tests/static/Pipfile.lock | 94 +----------------------------------------------
3 files changed, 3 insertions(+), 104 deletions(-)
diff --git a/tests/static/Makefile b/tests/static/Makefile
index 479ee2a..f8c6b28 100644
--- a/tests/static/Makefile
+++ b/tests/static/Makefile
@@ -2,25 +2,18 @@ FILES_TO_CHECK := $(realpath $(addprefix ../../cmk/ec/,defaults.py
export.py set
MYPYPATH := $(realpath typeshed)
PIPENV := PIPENV_NO_INHERIT=true PIPENV_VENV_IN_PROJECT=true pipenv
-.PHONY: sanitize format format-autopep8 format-yapf test-mypy test-pylint
+.PHONY: sanitize format format-yapf test-mypy
-sanitize: format test-mypy test-pylint
+sanitize: format test-mypy
format: format-yapf
-# A bit ugly and sometimes breaks things, but let's keep it for comparison.
-format-autopep8: .venv
- $(PIPENV) run autopep8 -i $(FILES_TO_CHECK)
-
format-yapf: .venv
$(PIPENV) run yapf -i $(FILES_TO_CHECK)
test-mypy: .venv
MYPYPATH="$(MYPYPATH)" $(PIPENV) run mypy --py2 --follow-imports=silent
--strict-optional $(FILES_TO_CHECK)
-test-pylint: .venv
- $(PIPENV) run pylint $(FILES_TO_CHECK)
-
Pipfile.lock: Pipfile
$(PIPENV) lock
# TODO: pipenv and make don't really cooperate nicely: Locking alone already
diff --git a/tests/static/Pipfile b/tests/static/Pipfile
index 8e519da..b0aadf3 100644
--- a/tests/static/Pipfile
+++ b/tests/static/Pipfile
@@ -7,9 +7,7 @@ name = "pypi"
[packages]
mypy = "*"
-pylint = "*"
yapf = "*"
-"autopep8" = "*"
[requires]
python_version = "3.6"
diff --git a/tests/static/Pipfile.lock b/tests/static/Pipfile.lock
index 7eb9448..991941e 100644
--- a/tests/static/Pipfile.lock
+++ b/tests/static/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256":
"38d8fe740f4cb1f24abe194da0a896bbac01ca18c71a7f4f623a1f79bd349848"
+ "sha256":
"06196ca6a65c5b0e6c328ac0c3fb166dfcb1c4d0f6ce292f2384ddecf87aa796"
},
"pipfile-spec": 6,
"requires": {
@@ -16,69 +16,6 @@
]
},
"default": {
- "astroid": {
- "hashes": [
-
"sha256:032f6e09161e96f417ea7fad46d3fac7a9019c775f202182c22df0e4f714cb1c",
-
"sha256:dea42ae6e0b789b543f728ddae7ddb6740ba33a49fb52c4a4d9cb7bb4aa6ec09"
- ],
- "version": "==1.6.4"
- },
- "autopep8": {
- "hashes": [
-
"sha256:2284d4ae2052fedb9f466c09728e30d2e231cfded5ffd7b1a20c34123fdc4ba4"
- ],
- "index": "pypi",
- "version": "==1.3.5"
- },
- "isort": {
- "hashes": [
-
"sha256:1153601da39a25b14ddc54955dbbacbb6b2d19135386699e2ad58517953b34af",
-
"sha256:b9c40e9750f3d77e6e4d441d8b0266cf555e7cdabdcff33c4fd06366ca761ef8",
-
"sha256:ec9ef8f4a9bc6f71eec99e1806bfa2de401650d996c59330782b89a5555c1497"
- ],
- "version": "==4.3.4"
- },
- "lazy-object-proxy": {
- "hashes": [
-
"sha256:0ce34342b419bd8f018e6666bfef729aec3edf62345a53b537a4dcc115746a33",
-
"sha256:1b668120716eb7ee21d8a38815e5eb3bb8211117d9a90b0f8e21722c0758cc39",
-
"sha256:209615b0fe4624d79e50220ce3310ca1a9445fd8e6d3572a896e7f9146bbf019",
-
"sha256:27bf62cb2b1a2068d443ff7097ee33393f8483b570b475db8ebf7e1cba64f088",
-
"sha256:27ea6fd1c02dcc78172a82fc37fcc0992a94e4cecf53cb6d73f11749825bd98b",
-
"sha256:2c1b21b44ac9beb0fc848d3993924147ba45c4ebc24be19825e57aabbe74a99e",
-
"sha256:2df72ab12046a3496a92476020a1a0abf78b2a7db9ff4dc2036b8dd980203ae6",
-
"sha256:320ffd3de9699d3892048baee45ebfbbf9388a7d65d832d7e580243ade426d2b",
-
"sha256:50e3b9a464d5d08cc5227413db0d1c4707b6172e4d4d915c1c70e4de0bbff1f5",
-
"sha256:5276db7ff62bb7b52f77f1f51ed58850e315154249aceb42e7f4c611f0f847ff",
-
"sha256:61a6cf00dcb1a7f0c773ed4acc509cb636af2d6337a08f362413c76b2b47a8dd",
-
"sha256:6ae6c4cb59f199d8827c5a07546b2ab7e85d262acaccaacd49b62f53f7c456f7",
-
"sha256:7661d401d60d8bf15bb5da39e4dd72f5d764c5aff5a86ef52a042506e3e970ff",
-
"sha256:7bd527f36a605c914efca5d3d014170b2cb184723e423d26b1fb2fd9108e264d",
-
"sha256:7cb54db3535c8686ea12e9535eb087d32421184eacc6939ef15ef50f83a5e7e2",
-
"sha256:7f3a2d740291f7f2c111d86a1c4851b70fb000a6c8883a59660d95ad57b9df35",
-
"sha256:81304b7d8e9c824d058087dcb89144842c8e0dea6d281c031f59f0acf66963d4",
-
"sha256:933947e8b4fbe617a51528b09851685138b49d511af0b6c0da2539115d6d4514",
-
"sha256:94223d7f060301b3a8c09c9b3bc3294b56b2188e7d8179c762a1cda72c979252",
-
"sha256:ab3ca49afcb47058393b0122428358d2fbe0408cf99f1b58b295cfeb4ed39109",
-
"sha256:bd6292f565ca46dee4e737ebcc20742e3b5be2b01556dafe169f6c65d088875f",
-
"sha256:cb924aa3e4a3fb644d0c463cad5bc2572649a6a3f68a7f8e4fbe44aaa6d77e4c",
-
"sha256:d0fc7a286feac9077ec52a927fc9fe8fe2fabab95426722be4c953c9a8bede92",
-
"sha256:ddc34786490a6e4ec0a855d401034cbd1242ef186c20d79d2166d6a4bd449577",
-
"sha256:e34b155e36fa9da7e1b7c738ed7767fc9491a62ec6af70fe9da4a057759edc2d",
-
"sha256:e5b9e8f6bda48460b7b143c3821b21b452cb3a835e6bbd5dd33aa0c8d3f5137d",
-
"sha256:e81ebf6c5ee9684be8f2c87563880f93eedd56dd2b6146d8a725b50b7e5adb0f",
-
"sha256:eb91be369f945f10d3a49f5f9be8b3d0b93a4c2be8f8a5b83b0571b8123e0a7a",
-
"sha256:f460d1ceb0e4a5dcb2a652db0904224f367c9b3c1470d5a7683c0480e582468b"
- ],
- "version": "==1.3.1"
- },
- "mccabe": {
- "hashes": [
-
"sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42",
-
"sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"
- ],
- "version": "==0.6.1"
- },
"mypy": {
"hashes": [
"sha256:01cf289838f266ae7c6550c813181ee77d21eac9459dbf067e7a95a0a2db9721",
@@ -87,29 +24,6 @@
"index": "pypi",
"version": "==0.600"
},
- "pycodestyle": {
- "hashes": [
-
"sha256:74abc4e221d393ea5ce1f129ea6903209940c1ecd29e002e8c6933c2b21026e0",
-
"sha256:cbc619d09254895b0d12c2c691e237b2e91e9b2ecf5e84c26b35400f93dcfb83",
-
"sha256:cbfca99bd594a10f674d0cd97a3d802a1fdef635d4361e1a2658de47ed261e3a"
- ],
- "version": "==2.4.0"
- },
- "pylint": {
- "hashes": [
-
"sha256:aa519865f8890a5905fa34924fed0f3bfc7d84fc9f9142c16dac52ffecd25a39",
-
"sha256:c353d8225195b37cc3aef18248b8f3fe94c5a6a95affaf885ae21a24ca31d8eb"
- ],
- "index": "pypi",
- "version": "==1.9.1"
- },
- "six": {
- "hashes": [
-
"sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9",
-
"sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb"
- ],
- "version": "==1.11.0"
- },
"typed-ast": {
"hashes": [
"sha256:0948004fa228ae071054f5208840a1e88747a357ec1101c17217bfe99b299d58",
@@ -133,12 +47,6 @@
],
"version": "==1.1.0"
},
- "wrapt": {
- "hashes": [
-
"sha256:d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6"
- ],
- "version": "==1.10.11"
- },
"yapf": {
"hashes": [
"sha256:6567745f0b6656f9c33a73c56a393071c699e6284a70d793798ab6e3769d25ec",