Use tox instead of pytest-runner
This commit is contained in:
parent
03c1cc8684
commit
750a2b3896
|
@ -4,8 +4,7 @@ python:
|
||||||
- 2.7
|
- 2.7
|
||||||
- 3.5
|
- 3.5
|
||||||
script:
|
script:
|
||||||
- pip install -U pytest
|
- tox
|
||||||
- python setup.py test
|
|
||||||
branches:
|
branches:
|
||||||
except:
|
except:
|
||||||
- skeleton
|
- skeleton
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
[pytest]
|
[pytest]
|
||||||
norecursedirs=*.egg .eggs dist build
|
norecursedirs=dist build .tox
|
||||||
addopts=--doctest-modules
|
addopts=--doctest-modules
|
||||||
doctest_optionflags=ALLOW_UNICODE ELLIPSIS
|
doctest_optionflags=ALLOW_UNICODE ELLIPSIS
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
[aliases]
|
[aliases]
|
||||||
release = dists upload
|
release = dists upload
|
||||||
dists = clean --all sdist bdist_wheel
|
dists = clean --all sdist bdist_wheel
|
||||||
test = pytest
|
|
||||||
|
|
||||||
[wheel]
|
[wheel]
|
||||||
universal = 1
|
universal = 1
|
||||||
|
|
7
setup.py
7
setup.py
|
@ -10,8 +10,6 @@ import setuptools
|
||||||
with io.open('README.rst', encoding='utf-8') as readme:
|
with io.open('README.rst', encoding='utf-8') as readme:
|
||||||
long_description = readme.read()
|
long_description = readme.read()
|
||||||
|
|
||||||
needs_pytest = {'pytest', 'test'}.intersection(sys.argv)
|
|
||||||
pytest_runner = ['pytest_runner'] if needs_pytest else []
|
|
||||||
needs_wheel = {'release', 'bdist_wheel', 'dists'}.intersection(sys.argv)
|
needs_wheel = {'release', 'bdist_wheel', 'dists'}.intersection(sys.argv)
|
||||||
wheel = ['wheel'] if needs_wheel else []
|
wheel = ['wheel'] if needs_wheel else []
|
||||||
|
|
||||||
|
@ -35,10 +33,7 @@ setup_params = dict(
|
||||||
},
|
},
|
||||||
setup_requires=[
|
setup_requires=[
|
||||||
'setuptools_scm>=1.9',
|
'setuptools_scm>=1.9',
|
||||||
] + pytest_runner + wheel,
|
] + wheel,
|
||||||
tests_require=[
|
|
||||||
'pytest>=2.8',
|
|
||||||
],
|
|
||||||
classifiers=[
|
classifiers=[
|
||||||
"Development Status :: 5 - Production/Stable",
|
"Development Status :: 5 - Production/Stable",
|
||||||
"Intended Audience :: Developers",
|
"Intended Audience :: Developers",
|
||||||
|
|
1
tests/requirements.txt
Normal file
1
tests/requirements.txt
Normal file
|
@ -0,0 +1 @@
|
||||||
|
pytest >= 2.8
|
Loading…
Reference in New Issue
Block a user