setup.py: remove pytest-runner; require pytest to run tests
python setup.py test no longer works. The 'tests_require' keyword in setup() is no longer supported by setuptools. We use tox to bootstrap the test environment, so we don't need that
This commit is contained in:
parent
06f199f8f3
commit
eb08cc0fbe
10
README.rst
10
README.rst
@ -255,14 +255,8 @@ are needed to unlock optional features.
|
|||||||
Testing
|
Testing
|
||||||
~~~~~~~
|
~~~~~~~
|
||||||
|
|
||||||
To run the test suite, you can do:
|
To run the test suite, you need to install `pytest <http://docs.pytest.org/en/latest/>`__.
|
||||||
|
When you run the ``pytest`` command, the tests will run against the
|
||||||
.. code:: sh
|
|
||||||
|
|
||||||
python setup.py test
|
|
||||||
|
|
||||||
If you have `pytest <http://docs.pytest.org/en/latest/>`__, you can run
|
|
||||||
the ``pytest`` command directly. The tests will run against the
|
|
||||||
installed ``fontTools`` package, or the first one found in the
|
installed ``fontTools`` package, or the first one found in the
|
||||||
``PYTHONPATH``.
|
``PYTHONPATH``.
|
||||||
|
|
||||||
|
@ -30,9 +30,6 @@ universal = 1
|
|||||||
[sdist]
|
[sdist]
|
||||||
formats = zip
|
formats = zip
|
||||||
|
|
||||||
[aliases]
|
|
||||||
test = pytest
|
|
||||||
|
|
||||||
[metadata]
|
[metadata]
|
||||||
license_file = LICENSE
|
license_file = LICENSE
|
||||||
|
|
||||||
|
7
setup.py
7
setup.py
@ -23,8 +23,6 @@ def doraise_py_compile(file, cfile=None, dfile=None, doraise=False):
|
|||||||
|
|
||||||
py_compile.compile = doraise_py_compile
|
py_compile.compile = doraise_py_compile
|
||||||
|
|
||||||
needs_pytest = {'pytest', 'test'}.intersection(sys.argv)
|
|
||||||
pytest_runner = ['pytest_runner'] if needs_pytest else []
|
|
||||||
needs_wheel = {'bdist_wheel'}.intersection(sys.argv)
|
needs_wheel = {'bdist_wheel'}.intersection(sys.argv)
|
||||||
wheel = ['wheel'] if needs_wheel else []
|
wheel = ['wheel'] if needs_wheel else []
|
||||||
needs_bumpversion = {'release'}.intersection(sys.argv)
|
needs_bumpversion = {'release'}.intersection(sys.argv)
|
||||||
@ -353,10 +351,7 @@ setup(
|
|||||||
packages=find_packages("Lib"),
|
packages=find_packages("Lib"),
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
data_files=find_data_files(),
|
data_files=find_data_files(),
|
||||||
setup_requires=pytest_runner + wheel + bumpversion,
|
setup_requires=wheel + bumpversion,
|
||||||
tests_require=[
|
|
||||||
'pytest>=3.0',
|
|
||||||
],
|
|
||||||
extras_require=extras_require,
|
extras_require=extras_require,
|
||||||
entry_points={
|
entry_points={
|
||||||
'console_scripts': [
|
'console_scripts': [
|
||||||
|
Loading…
x
Reference in New Issue
Block a user