Skip to content

Commit a0a818e

Browse files
committed
Merge branch 'developer' into deploy
2 parents 2b62c4e + cf8ea87 commit a0a818e

File tree

8 files changed

+38
-117
lines changed

8 files changed

+38
-117
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ venv.bak/
107107

108108

109109
# vscode files
110-
.vscode/settings.json
110+
.vscode/
111+
# .vscode/settings.json
111112

112113
# IDEA files
113114
.idea/

.vscode/launch.json

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

.vscode/settings.json

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

MANIFEST.in

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# https://packaging.python.org/guides/using-manifest-in/
2+
3+
include pyproject.toml
4+
5+
# Include the README
6+
include *.md
7+
8+
# Include the license file
9+
include LICENSE.txt
10+
11+
# # Include the requirements file
12+
include requirements.txt

template/template_case.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,34 @@
55

66
class Test_Demo(unittest.TestCase):
77
''' the test demo '''
8+
89
@classmethod
910
def setUpClass(cls):
1011
print("...the set up...")
11-
print
12+
print('')
1213

1314
def setUp(self):
14-
return super(Test_Demo, self).setUp()
15+
super(Test_Demo, self).setUp()
1516

1617
def _xxx(self):
17-
print "the test xxx is succeed."
18+
print("the test xxx is succeed.")
1819
pass
1920

2021
def test_xxx(self):
21-
print "the test xxx is succeed."
22+
print("the test xxx is succeed.")
2223
pass
2324

2425
def tearDown(self):
25-
return super(Test_Demo, self).tearDown()
26+
super(Test_Demo, self).tearDown()
2627

2728
@classmethod
2829
def tearDownClass(cls):
29-
print
30+
print('')
3031
print("...the tear down...")
3132

3233

3334
if __name__ == '__main__':
35+
''' the unittest suite '''
36+
suite = unittest.TestLoader().loadTestsFromTestCase(Test_Demo)
37+
unittest.TextTestRunner(verbosity=2).run(suite)
3438
unittest.main()

template/template_class.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
class Template(object):
5-
'the Template class'
5+
'''the Template class'''
66

77
def __init__(self):
88
super(Template, self).__init__()

template/test_template.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,30 @@
55

66
class Test_XXX(unittest.TestCase):
77
''' the test xxx '''
8+
89
@classmethod
910
def setUpClass(cls):
1011
print("...the set up...")
11-
print
12+
print('')
1213

1314
def setUp(self):
14-
return super(Test_XXX, self).setUp()
15+
super(Test_XXX, self).setUp()
1516

1617
def test_xxx(self):
1718
print "the test xxx is succeed."
1819
pass
1920

2021
def tearDown(self):
21-
return super(Test_XXX, self).tearDown()
22+
super(Test_XXX, self).tearDown()
2223

2324
@classmethod
2425
def tearDownClass(cls):
25-
print
26+
print('')
2627
print("...the tear down...")
2728

2829

2930
if __name__ == '__main__':
30-
unittest.main()
31+
''' the unittest suite '''
32+
suite = unittest.TestLoader().loadTestsFromTestCase(Test_XXX)
33+
unittest.TextTestRunner(verbosity=2).run(suite)
34+
# unittest.main()

tox.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@ allowlist_externals =
2727
/bin/bash
2828
; changedir =
2929
; tests
30+
#
3031
# https://tox.readthedocs.io/en/latest/config.html#conf-deps
32+
# https://tox.readthedocs.io/en/latest/example/basic.html#a-simple-tox-ini-default-environments
33+
#
3134
deps =
35+
-rrequirements.txt
3236
unittest2
3337
flake8
3438
virtualenv

0 commit comments

Comments
 (0)