From a5624af5c9fda6b90fd1422054a8935a3fbc499e Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Mon, 23 Apr 2018 17:06:17 -0400 Subject: [PATCH 1/5] update vscode syntax in readme --- README.md | 84 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index ae9f845..d88ce94 100644 --- a/README.md +++ b/README.md @@ -13,47 +13,51 @@ of the assert in the file. We also need to use `pytest` option `--tb=native` to get the default traceback. You can of course add extra options by other means, e.g. `pytest.ini` file. See [pytest customization options](https://docs.pytest.org/en/latest/customize.html) -```json +```json5 { - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "0.1.0", - "command": "python", - "echoCommand": true, - "suppressTaskName": true, - "isShellCommand": true, - "options": { - "env": { - "PYTEST_ADDOPTS" : "-vv --tb=native" - } - }, - "tasks": [ - { - "taskName": "tests", - "isTestCommand": true, - "args": [ - "-m", - "pytest", - "${workspaceRoot}" - ], - "problemMatcher": [ - { - "fileLocation": "absolute", - "pattern": [ - { - "regexp": "^\\s+File \"(.*)\", line (\\d+), in (.*)$", - "file": 1, - "line": 2 - }, - { - "regexp": "^\\s+(.*)$", - "message": 1 - } - ] - } - ] - } - ] + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "command": "${config:python.pythonPath}", + "label": "tests", + "group": "test", + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared" + }, + "type": "shell", + "options": { + "env": { + "PYTEST_ADDOPTS" : "-vv --tb=native" + } + }, + "args": [ + "-m", + "pytest", + "${workspaceRoot}" + ], + "problemMatcher": [ + { + "fileLocation": "absolute", + "pattern": [ + { + "regexp": "^\\s+File \"(.*)\", line (\\d+), in (.*)$", + "file": 1, + "line": 2 + }, + { + "regexp": "^\\s+(.*)$", + "message": 1 + } + ] + } + ] + } + ] } ``` From bedc58ae4efae5a22a8618d04f6ee7ef19543c7b Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Mon, 23 Apr 2018 17:07:42 -0400 Subject: [PATCH 2/5] update vscode syntax --- .vscode/tasks.json | 183 +++++++++++---------------------------------- 1 file changed, 44 insertions(+), 139 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 7e43332..007cbc5 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,140 +1,45 @@ { - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "0.1.0", - "command": "python", - "echoCommand": true, - "suppressTaskName": true, - "isShellCommand": true, - "options": { - "env": { - "PYTEST_ADDOPTS" : "-vv --tb=native" - } - }, - "tasks": [ - { - "taskName": "tests", - "isTestCommand": true, - "args": [ - "-m", - "pytest", - "${workspaceRoot}" - ], - "problemMatcher": [ - { - "fileLocation": "absolute", - "pattern": [ - { - "regexp": "^\\s+File \"(.*)\", line (\\d+), in (.*)$", - "file": 1, - "line": 2 - }, - { - "regexp": "^\\s+(.*)$", - "message": 1 - } - ] - } - ] - }, - { - "taskName": "unit_tests", - "isTestCommand": true, - "command": "python", - "echoCommand": true, - "isShellCommand": true, - "args": [ - "-m", - "pytest", - "${workspaceRoot}" - ], - "options": { - "env": { - "PYTEST_ADDOPTS" : "-vv --tb=native -k unit_tests" - } - }, - "problemMatcher": [ - { - "fileLocation": "absolute", - "pattern": [ - { - "regexp": "^\\s+File \"(.*)\", line (\\d+), in (.*)$", - "file": 1, - "line": 2 - }, - { - "regexp": "^\\s+(.*)$", - "message": 1 - } - ] - } - ] - }, - { - "taskName": "integration_tests", - "isTestCommand": true, - "command": "python", - "echoCommand": true, - "isShellCommand": true, - "args": [ - "-m", - "pytest", - "${workspaceRoot}" - ], - "options": { - "env": { - "PYTEST_ADDOPTS" : "-vv --tb=native -k integration_tests" - } - }, - "problemMatcher": [ - { - "fileLocation": "absolute", - "pattern": [ - { - "regexp": "^\\s+File \"(.*)\", line (\\d+), in (.*)$", - "file": 1, - "line": 2 - }, - { - "regexp": "^\\s+(.*)$", - "message": 1 - } - ] - } - ] - }, - { - "taskName": "system_tests", - "isTestCommand": true, - "command": "python", - "echoCommand": true, - "isShellCommand": true, - "args": [ - "-m", - "pytest", - "${workspaceRoot}" - ], - "options": { - "env": { - "PYTEST_ADDOPTS" : "-vv --tb=native -k system_tests" - } - }, - "problemMatcher": [ - { - "fileLocation": "absolute", - "pattern": [ - { - "regexp": "^\\s+File \"(.*)\", line (\\d+), in (.*)$", - "file": 1, - "line": 2 - }, - { - "regexp": "^\\s+(.*)$", - "message": 1 - } - ] - } - ] - } - ] -} \ No newline at end of file + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "command": "${config:python.pythonPath}", + "label": "tests", + "group": "test", + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared" + }, + "type": "shell", + "options": { + "env": { + "PYTEST_ADDOPTS" : "-vv --tb=native" + } + }, + "args": [ + "-m", + "pytest", + "${workspaceRoot}" + ], + "problemMatcher": [ + { + "fileLocation": "absolute", + "pattern": [ + { + "regexp": "^\\s+File \"(.*)\", line (\\d+), in (.*)$", + "file": 1, + "line": 2 + }, + { + "regexp": "^\\s+(.*)$", + "message": 1 + } + ] + } + ] + } + ] +} From 07230409cfeb53e7ae22c72af48a84b12d027960 Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Mon, 23 Apr 2018 17:08:07 -0400 Subject: [PATCH 3/5] fix whitespace --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d88ce94..81a1081 100644 --- a/README.md +++ b/README.md @@ -31,9 +31,9 @@ by other means, e.g. `pytest.ini` file. See [pytest customization options](https }, "type": "shell", "options": { - "env": { - "PYTEST_ADDOPTS" : "-vv --tb=native" - } + "env": { + "PYTEST_ADDOPTS" : "-vv --tb=native" + } }, "args": [ "-m", From dd5783303bfeb7cc10c563e181b0323e73a9ada4 Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Mon, 23 Apr 2018 17:14:20 -0400 Subject: [PATCH 4/5] fix spacing --- README.md | 86 +++++++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index 81a1081..6a88ca9 100644 --- a/README.md +++ b/README.md @@ -15,49 +15,49 @@ by other means, e.g. `pytest.ini` file. See [pytest customization options](https ```json5 { - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "command": "${config:python.pythonPath}", - "label": "tests", - "group": "test", - "presentation": { - "echo": true, - "reveal": "always", - "focus": false, - "panel": "shared" - }, - "type": "shell", - "options": { - "env": { - "PYTEST_ADDOPTS" : "-vv --tb=native" - } - }, - "args": [ - "-m", - "pytest", - "${workspaceRoot}" - ], - "problemMatcher": [ - { - "fileLocation": "absolute", - "pattern": [ - { - "regexp": "^\\s+File \"(.*)\", line (\\d+), in (.*)$", - "file": 1, - "line": 2 - }, - { - "regexp": "^\\s+(.*)$", - "message": 1 - } - ] - } - ] - } - ] + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "command": "${config:python.pythonPath}", + "label": "tests", + "group": "test", + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared" + }, + "type": "shell", + "options": { + "env": { + "PYTEST_ADDOPTS": "-vv --tb=native" + } + }, + "args": [ + "-m", + "pytest", + "${workspaceRoot}" + ], + "problemMatcher": [ + { + "fileLocation": "absolute", + "pattern": [ + { + "regexp": "^\\s+File \"(.*)\", line (\\d+), in (.*)$", + "file": 1, + "line": 2 + }, + { + "regexp": "^\\s+(.*)$", + "message": 1 + } + ] + } + ] + } + ] } ``` From 99a194588ed3d99b8b69ac660462fa2eb36ca0c5 Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Mon, 23 Apr 2018 17:14:43 -0400 Subject: [PATCH 5/5] fix spacing --- .vscode/tasks.json | 86 +++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 007cbc5..f06b797 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,45 +1,45 @@ { - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "command": "${config:python.pythonPath}", - "label": "tests", - "group": "test", - "presentation": { - "echo": true, - "reveal": "always", - "focus": false, - "panel": "shared" - }, - "type": "shell", - "options": { - "env": { - "PYTEST_ADDOPTS" : "-vv --tb=native" - } - }, - "args": [ - "-m", - "pytest", - "${workspaceRoot}" - ], - "problemMatcher": [ - { - "fileLocation": "absolute", - "pattern": [ - { - "regexp": "^\\s+File \"(.*)\", line (\\d+), in (.*)$", - "file": 1, - "line": 2 - }, - { - "regexp": "^\\s+(.*)$", - "message": 1 - } - ] - } - ] - } - ] + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "command": "${config:python.pythonPath}", + "label": "tests", + "group": "test", + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared" + }, + "type": "shell", + "options": { + "env": { + "PYTEST_ADDOPTS": "-vv --tb=native" + } + }, + "args": [ + "-m", + "pytest", + "${workspaceRoot}" + ], + "problemMatcher": [ + { + "fileLocation": "absolute", + "pattern": [ + { + "regexp": "^\\s+File \"(.*)\", line (\\d+), in (.*)$", + "file": 1, + "line": 2 + }, + { + "regexp": "^\\s+(.*)$", + "message": 1 + } + ] + } + ] + } + ] }