Skip to content

Commit df64f67

Browse files
authored
Merge pull request #57 from Alinvor/kernel
[DONE]合并分支
2 parents 2b759dd + 9de4bff commit df64f67

File tree

5 files changed

+7
-46
lines changed

5 files changed

+7
-46
lines changed

.vscode/settings.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,14 @@
4242
// "python.pythonPath": "venv2/bin/python",
4343
// "python.pythonPath": "venv2\\Scripts\\python.exe",
4444
"python.formatting.provider": "yapf",
45+
// "python.formatting.yapfArgs": [
46+
// "--style",
47+
// "{based_on_style: pep8, indent_width: 4}"
48+
// ],
4549
"python.formatting.yapfArgs": [
4650
"--style",
47-
"{based_on_style: pep8, indent_width: 4}"
51+
"{based_on_style: pep8 ,indent_width: 4, column_limit: 120}",
4852
],
49-
// "python.formatting.yapfArgs": [
50-
// "--style", "{based_on_style: pep8 ,indent_width: 4, column_limit: 140}",
51-
// ],
5253
// "python.languageServer": "Jedi",
5354
"python.languageServer": "Pylance",
5455
// "python.languageServer": "Microsoft",

template/template_case.py

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

template/template_class.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
class Template(object):
55
'''the Template class'''
6-
76
def __init__(self):
87
super(Template, self).__init__()
98

template/test_template.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
class Test_XXX(unittest.TestCase):
77
''' the test xxx '''
8-
98
@classmethod
109
def setUpClass(cls):
1110
print("...the set up...")
@@ -15,7 +14,7 @@ def setUp(self):
1514
super(Test_XXX, self).setUp()
1615

1716
def test_xxx(self):
18-
print ("the test xxx(test_template.py) is succeed.")
17+
print("the test xxx(test_template.py) is succeed.")
1918
pass
2019

2120
def tearDown(self):

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# For information see https://tox.readthedocs.io/en/latest/examples.html
66

77
[tox]
8-
envlist = py27, py39
8+
envlist = py27, py38
99

1010
minversion = 3.23.1
1111

0 commit comments

Comments
 (0)