Skip to content

Commit e187c8c

Browse files
authored
Merge pull request #32 from Alinvor/kernel
[DONE]合并分支
2 parents 7bbaeea + a23130b commit e187c8c

33 files changed

Lines changed: 382 additions & 218 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ venv.bak/
107107

108108

109109
# vscode files
110+
.vscode/
110111
.vscode/settings.json
111112

112113
# IDEA files

.vscode/settings.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,21 @@
5757
"python.autoComplete.extraPaths": [
5858
"./src",
5959
"./mock",
60-
"./test",
60+
"./tests",
6161
"./venv2/bin",
6262
"./venv2/Lib/python2.7/site-packages",
6363
// "./venv/bin",
6464
// "./venv/Lib/python3.7/site-packages",
6565
],
66+
"python.envFile": "${workspaceFolder}/.env",
6667
"python.pythonPath": "venv2/bin/python",
6768
"python.formatting.provider": "yapf",
6869
"python.formatting.yapfArgs": [
6970
"--style", "{based_on_style: pep8 ,indent_width: 4, column_limit: 130}",
7071
],
71-
"python.languageServer": "Jedi",
72+
// "python.languageServer": "Jedi",
73+
"python.languageServer": "Pylance",
7274
// "python.languageServer": "Microsoft",
73-
// "python.languageServer": "Pylance",
7475
"python.linting.enabled": true,
7576
"python.linting.flake8Enabled": true,
7677
"python.linting.flake8Args": [
@@ -84,14 +85,15 @@
8485
"python.testing.unittestArgs": [
8586
"-v",
8687
"-s",
87-
"./test",
88+
"./tests",
8889
"-p",
8990
"test_*.py"
9091
],
9192
"python.testing.autoTestDiscoverOnSaveEnabled": true,
9293
"python.testing.cwd": "${workspaceFolder}",
9394
"python.testing.nosetestsEnabled": false,
9495
"python.testing.pytestEnabled": false,
96+
"python.testing.promptToConfigure": true,
9597
"python.testing.unittestEnabled": true,
9698
"workbench.iconTheme": "vscode-icons",
9799
"workbench.editor.enablePreview": true,

0 commit comments

Comments
 (0)