Skip to content

Commit

Permalink
Merge branch 'develop' into feature/cisco-apic
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Faircloth authored and GitHub committed Feb 10, 2020
2 parents b736512 + a7d9830 commit 901a47b
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 29 deletions.
25 changes: 0 additions & 25 deletions .vscode/launch.json

This file was deleted.

33 changes: 33 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "Setup step 1: python venv",
"type": "shell",
"command": "python3 -m venv ./venv",
"windows": {
"command": "python venv"
},
"group": "Setup",
"presentation": {
"reveal": "always",
"panel": "new"
}
},
{
"label": "Setup step 2: python requirements",
"type": "shell",
"command": "pip3 install -r requirements.txt",
"windows": {
"command": "python requirements"
},
"group": "Setup",
"presentation": {
"reveal": "always",
"panel": "new"
}
}
]
}
7 changes: 4 additions & 3 deletions docs/developing/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ The follow steps are only required on the first time run.
* Python
* Test Explorer
* "Python Test Explorer"
* Click the "Run/Debug" bug icon
* Select the "Setup Project" task and click the Green play icon
* Select the "Setup Requirements" task and click the Green play icon
* From the terminal menu select Run Task
* Select "Setup step 1: python venv" then "go without scanning output"
* From the terminal menu select Run Task
* Select "Setup step 2: python requirements" then "go without scanning output"

![VS Code setup](vsc_run.png)

Expand Down
2 changes: 1 addition & 1 deletion pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ addopts =
--splunk_type=docker
--keepalive
--splunk_hec_token=1ec3c8ac-74b3-46f2-ba44-a7c96b6ab236
-n=8
#-n=4
filterwarnings =
ignore::DeprecationWarning
junit_family=xunit1

0 comments on commit 901a47b

Please sign in to comment.