Skip to content

Commit 7c31acd

Browse files
authored
Merge pull request #26 from Alinvor/revert-25-kernel
[DONE]Revert合并分支
2 parents 76f5272 + b85ca87 commit 7c31acd

36 files changed

Lines changed: 210 additions & 1004 deletions

.gitignore

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

108108

109109
# vscode files
110-
.vscode/
111110
.vscode/settings.json
112111

113112
# IDEA files
@@ -129,5 +128,3 @@ local.properties
129128
# Log Files
130129
*.log
131130

132-
# Temp Files
133-
Temp/

.vscode/settings.json

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -57,43 +57,30 @@
5757
"python.autoComplete.extraPaths": [
5858
"./src",
5959
"./mock",
60-
"./tests",
60+
"./test",
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",
6766
"python.pythonPath": "venv2/bin/python",
6867
"python.formatting.provider": "yapf",
69-
"python.formatting.yapfArgs": [
70-
"--style", "{based_on_style: pep8 ,indent_width: 4, column_limit: 130}",
71-
],
72-
// "python.languageServer": "Jedi",
73-
"python.languageServer": "Pylance",
74-
// "python.languageServer": "Microsoft",
75-
"python.linting.enabled": true,
76-
"python.linting.flake8Enabled": true,
77-
"python.linting.flake8Args": [
78-
"--max-line-length=250",
79-
"--ignore=E251",
80-
"--verbose",
81-
],
82-
"python.linting.ignorePatterns": [".vscode/*.py", "**/site-packages/**/*.py"],
83-
"python.linting.lintOnSave": true,
68+
"python.languageServer": "Microsoft",
69+
// "python.languageServer": "Pylance",
8470
"python.linting.pylintEnabled": false,
71+
"python.linting.flake8Enabled": true,
72+
"python.linting.flake8Args": ["--max-line-length=250"],
8573
"python.testing.unittestArgs": [
8674
"-v",
8775
"-s",
88-
"./tests",
76+
"./test",
8977
"-p",
9078
"test_*.py"
9179
],
9280
"python.testing.autoTestDiscoverOnSaveEnabled": true,
9381
"python.testing.cwd": "${workspaceFolder}",
9482
"python.testing.nosetestsEnabled": false,
9583
"python.testing.pytestEnabled": false,
96-
"python.testing.promptToConfigure": true,
9784
"python.testing.unittestEnabled": true,
9885
"workbench.iconTheme": "vscode-icons",
9986
"workbench.editor.enablePreview": true,

LICENSE.txt

Lines changed: 0 additions & 19 deletions
This file was deleted.

MANIFEST.in

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)