Skip to content

Commit

Permalink
Unpin Py.test version; remove pytest-runner dependency
Browse files Browse the repository at this point in the history
Signed-off-by: Aarni Koskela <[email protected]>
  • Loading branch information
akx committed Dec 21, 2023
1 parent f3a998f commit d89f66e
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ clean-test: ## remove test and coverage artifacts
rm -fr htmlcov/

test :
$(PYTHON) setup.py test
pytest
$(MAKE) -C test test

upload : test
Expand Down
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
pylama==7.7.1
pytest==5.2.2; python_version >= '3.0'
pytest-runner==5.2
pytest
tox==3.14.0
2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
requirements = []
test_requirements = ['pytest', 'pylama']
needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
setup_requirements = ['pytest-runner'] if needs_pytest else []
extra_requirements = {'proxy': ['PySocks']}

setup(
Expand Down Expand Up @@ -52,6 +51,5 @@
],
test_suite='tests',
tests_require=test_requirements,
setup_requires=setup_requirements,
extras_require=extra_requirements
)
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ commands =
# $EXCLUDE is defined above in testenv:py27 as a workaround for Python 2
# which does not support asyncio and type hints
flake8 . --count --select=E9,F63,F7,F822,F823 --show-source --statistics {env:EXCLUDE:}
python setup.py test
pytest
make -C test test
# TODO (cclauss) Fix up all these undefined names
flake8 . --count --exit-zero --select=F821 --show-source --statistics
Expand Down

0 comments on commit d89f66e

Please sign in to comment.