Skip to content

[DONE]合并分支 #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Jun 8, 2021
Merged

[DONE]合并分支 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2b377b7
修改 3.x 环境下，无法运行问题
DovSnier May 26, 2021
a6e1dac
the tox deps upgrade
DovSnier May 28, 2021
1833e9d
the tox upgrade
DovSnier May 28, 2021
d5bf933
the print format optimization
DovSnier May 28, 2021
a409826
修改默认规范 tests
DovSnier Jun 1, 2021
0f1692d
修改默认规范tests 与 discover 套件冲突问题
DovSnier Jun 1, 2021
546f007
修复 discover 无法自动运行 tests 用例包问题
DovSnier Jun 1, 2021
3ea874e
Merge pull request #19 from Alinvor/bugfixes
DovSnier Jun 1, 2021
505894a
the test template files upgrade
DovSnier Jun 1, 2021
aa68292
the reademe upgrade
DovSnier Jun 1, 2021
aaa0354
the README upgrade
DovSnier Jun 2, 2021
62d35a8
the tox command upgrade
DovSnier Jun 2, 2021
1f64968
the requirements upgrade
DovSnier Jun 2, 2021
087bc64
the settings upgrade
DovSnier Jun 3, 2021
8323b8c
切换到微软 Pylance 服务器
DovSnier Jun 3, 2021
6e6bd17
the ignore upgrade
DovSnier Jun 4, 2021
1d1969c
添加 pkgutil 命名空间模板
DovSnier Jun 5, 2021
a23130b
to add passenv property
DovSnier Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ venv.bak/


# vscode files
.vscode/
.vscode/settings.json

# IDEA files
Expand Down
10 changes: 6 additions & 4 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,21 @@
"python.autoComplete.extraPaths": [
"./src",
"./mock",
"./test",
"./tests",
"./venv2/bin",
"./venv2/Lib/python2.7/site-packages",
// "./venv/bin",
// "./venv/Lib/python3.7/site-packages",
],
"python.envFile": "${workspaceFolder}/.env",
"python.pythonPath": "venv2/bin/python",
"python.formatting.provider": "yapf",
"python.formatting.yapfArgs": [
"--style", "{based_on_style: pep8 ,indent_width: 4, column_limit: 130}",
],
"python.languageServer": "Jedi",
// "python.languageServer": "Jedi",
"python.languageServer": "Pylance",
// "python.languageServer": "Microsoft",
// "python.languageServer": "Pylance",
"python.linting.enabled": true,
"python.linting.flake8Enabled": true,
"python.linting.flake8Args": [
Expand All @@ -84,14 +85,15 @@
"python.testing.unittestArgs": [
"-v",
"-s",
"./test",
"./tests",
"-p",
"test_*.py"
],
"python.testing.autoTestDiscoverOnSaveEnabled": true,
"python.testing.cwd": "${workspaceFolder}",
"python.testing.nosetestsEnabled": false,
"python.testing.pytestEnabled": false,
"python.testing.promptToConfigure": true,
"python.testing.unittestEnabled": true,
"workbench.iconTheme": "vscode-icons",
"workbench.editor.enablePreview": true,
Expand Down
Loading