Skip to content

Commit 10fed09

Browse files
committed
Make tox configuration less redundant
1 parent 35b15a2 commit 10fed09

File tree

3 files changed

+8
-16
lines changed

3 files changed

+8
-16
lines changed

docs/testing.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ To test only the example servlets in the default context::
3939

4040
python -m unittest discover -p TestExamples.py -vs Tests.TestEndToEnd
4141

42-
You can also use tox_ as a test runner. The Webware source package already contains a suitable tox.ini configuration file for running the unit tests with all supported Python versions, and also running a few additional code quality checks.
42+
You can also use tox_ as a test runner. The Webware source package already contains a suitable tox.ini configuration file for running the unit tests with all supported Python versions, and also running a few additional code quality checks. Make sure to use current versions of _tox and _virtualenv when running the tests.
4343

4444
.. _tox: https://tox.readthedocs.io/en/latest/
45+
.. _virtualenv: https://virtualenv.readthedocs.io/en/latest/
4546

4647
Testing Webware applications
4748
----------------------------

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
'Pygments>=2,<3', 'waitress>=1.4.2,<2', 'hupper>=1.9,<2', 'WebTest>=2,<3'
1515
]
1616
requireDocs = [
17-
'Sphinx>=2.2,<3', 'sphinx_rtd_theme>=0.4'
17+
'Sphinx>=2.3,<3', 'sphinx_rtd_theme>=0.4'
1818
]
1919
requireExamples = [
20-
'Pygments>=2,<3', 'Pillow>=6,<7', 'dominate>=2,<3', 'yattag>=1,<2'
20+
'Pygments>=2,<3', 'Pillow>=6,<8', 'dominate>=2,<3', 'yattag>=1,<2'
2121
]
2222
requireTest = [
2323
'psutil>=5,<6', 'flake8>=3.7,<4', 'pylint>=2.4,<3', 'tox>=3.14,<4',
24-
'pywin32>=227,<300;platform_system=="Windows"'
24+
'pywin32>=227,<300;sys_platform=="win32"'
2525
] + requireDev + requireDocs + requireExamples
2626

2727

tox.ini

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ commands =
1616
[testenv:docs]
1717
basepython = python3.8
1818
deps =
19-
sphinx>=2.2,<3
19+
sphinx>=2.3,<3
2020
sphinx_rtd_theme>=0.4
2121
commands =
2222
sphinx-build -b html -nEW docs docs/_build/html
@@ -28,18 +28,9 @@ commands =
2828
check-manifest -v
2929

3030
[testenv]
31-
platform =
32-
windows: win32
3331
setenv =
3432
PYTHONPATH = {toxinidir}/webware
35-
deps =
36-
waitress>=1.4.2,<2
37-
psutil>=5,<6
38-
WebTest>=2,<3
39-
Pygments>=2,<3
40-
Pillow>=6,<7
41-
dominate>=2,<3
42-
yattag>=1,<2
43-
pywin32>=227,<300;platform_system=="Windows"
33+
extras =
34+
test
4435
commands =
4536
python -m unittest discover -fv -p Test*.py

0 commit comments

Comments
 (0)