Skip to content

Commit 2e5359e

Browse files
committed
Also use pytest in github actions. Drop 3.7 from tests.
1 parent 1d46264 commit 2e5359e

File tree

3 files changed

+3
-93
lines changed

3 files changed

+3
-93
lines changed

.github/workflows/test.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ jobs:
1616
- macos-latest
1717

1818
python:
19-
- "3.7"
2019
- "3.8"
2120
- "3.9"
2221
- "3.10"
@@ -39,9 +38,9 @@ jobs:
3938
- name: Run tests
4039
run: |
4140
python --version
42-
python -m yafowil.tests.__init__
41+
python -m pytest yafowil/tests
4342
4443
- name: Run coverage
4544
run: |
46-
coverage run --source=src/yafowil -m yafowil.tests.__init__
45+
coverage run --source=src/yafowil -m pytest yafowil/tests
4746
coverage report -m --fail-under=99

setup.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from setuptools import find_packages
22
from setuptools import setup
3-
from setuptools.command.test import test
43
import os
54

65

@@ -18,13 +17,6 @@ def read_file(name):
1817
]])
1918

2019

21-
class Test(test):
22-
23-
def run_tests(self):
24-
from yafowil import tests
25-
tests.run_tests()
26-
27-
2820
setup(
2921
name='yafowil',
3022
version=version,
@@ -59,12 +51,6 @@ def run_tests(self):
5951
'setuptools',
6052
'webresource'
6153
],
62-
tests_require=[
63-
'coverage',
64-
'lxml',
65-
'zope.testrunner'
66-
],
67-
test_suite='yafowil.tests.test_suite',
6854
extras_require=dict(test=[
6955
'coverage',
7056
'lxml',

src/yafowil/tests/__init__.py

Lines changed: 1 addition & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__ import print_function
21
from importlib import reload
32
from node.tests import NodeTestCase
43
from yafowil import button
@@ -25,8 +24,6 @@
2524
from yafowil.base import factory
2625
from yafowil.utils import Tag
2726
import lxml.etree as etree
28-
import sys
29-
import unittest
3027

3128

3229
class YafowilTestCase(NodeTestCase):
@@ -71,76 +68,4 @@ def wrapped_fxml(value):
7168
return fxml(u'<div>' + value + u'</div>')
7269

7370

74-
tag = Tag(lambda msg: msg)
75-
76-
77-
def test_suite():
78-
from yafowil.tests import test_base
79-
from yafowil.tests import test_button
80-
from yafowil.tests import test_checkbox
81-
from yafowil.tests import test_common
82-
from yafowil.tests import test_compound
83-
from yafowil.tests import test_controller
84-
from yafowil.tests import test_datatypes
85-
from yafowil.tests import test_email
86-
from yafowil.tests import test_field
87-
from yafowil.tests import test_file
88-
from yafowil.tests import test_hidden
89-
from yafowil.tests import test_lines
90-
from yafowil.tests import test_number
91-
from yafowil.tests import test_password
92-
from yafowil.tests import test_persistence
93-
from yafowil.tests import test_proxy
94-
from yafowil.tests import test_resources
95-
from yafowil.tests import test_search
96-
from yafowil.tests import test_select
97-
from yafowil.tests import test_table
98-
from yafowil.tests import test_tag
99-
from yafowil.tests import test_text
100-
from yafowil.tests import test_textarea
101-
from yafowil.tests import test_tsf
102-
from yafowil.tests import test_url
103-
from yafowil.tests import test_utils
104-
105-
suite = unittest.TestSuite()
106-
107-
suite.addTest(unittest.findTestCases(test_base))
108-
suite.addTest(unittest.findTestCases(test_button))
109-
suite.addTest(unittest.findTestCases(test_checkbox))
110-
suite.addTest(unittest.findTestCases(test_common))
111-
suite.addTest(unittest.findTestCases(test_compound))
112-
suite.addTest(unittest.findTestCases(test_controller))
113-
suite.addTest(unittest.findTestCases(test_datatypes))
114-
suite.addTest(unittest.findTestCases(test_email))
115-
suite.addTest(unittest.findTestCases(test_field))
116-
suite.addTest(unittest.findTestCases(test_file))
117-
suite.addTest(unittest.findTestCases(test_hidden))
118-
suite.addTest(unittest.findTestCases(test_lines))
119-
suite.addTest(unittest.findTestCases(test_number))
120-
suite.addTest(unittest.findTestCases(test_password))
121-
suite.addTest(unittest.findTestCases(test_persistence))
122-
suite.addTest(unittest.findTestCases(test_proxy))
123-
suite.addTest(unittest.findTestCases(test_resources))
124-
suite.addTest(unittest.findTestCases(test_search))
125-
suite.addTest(unittest.findTestCases(test_select))
126-
suite.addTest(unittest.findTestCases(test_table))
127-
suite.addTest(unittest.findTestCases(test_tag))
128-
suite.addTest(unittest.findTestCases(test_text))
129-
suite.addTest(unittest.findTestCases(test_textarea))
130-
suite.addTest(unittest.findTestCases(test_tsf))
131-
suite.addTest(unittest.findTestCases(test_url))
132-
suite.addTest(unittest.findTestCases(test_utils))
133-
134-
return suite
135-
136-
137-
def run_tests():
138-
from zope.testrunner.runner import Runner
139-
140-
runner = Runner(found_suites=[test_suite()])
141-
runner.run()
142-
sys.exit(int(runner.failed))
143-
144-
145-
if __name__ == '__main__':
146-
run_tests()
71+
tag = Tag(lambda msg: msg)

0 commit comments

Comments
 (0)