depend on py, not pylib distro
This commit is contained in:
parent
4fa7a2e8ce
commit
11e8e5570e
|
@ -5,7 +5,7 @@ see http://pytest.org for documentation and details
|
|||
|
||||
(c) Holger Krekel and others, 2004-2010
|
||||
"""
|
||||
__version__ = '2.0.0.dev33'
|
||||
__version__ = '2.0.0.dev34'
|
||||
__all__ = ['main']
|
||||
|
||||
from _pytest.core import main, UsageError, _preloadplugins
|
||||
|
|
6
setup.py
6
setup.py
|
@ -22,14 +22,14 @@ def main():
|
|||
name='pytest',
|
||||
description='py.test: simple powerful testing with Python',
|
||||
long_description = long_description,
|
||||
version='2.0.0.dev33',
|
||||
version='2.0.0.dev34',
|
||||
url='http://pytest.org',
|
||||
license='MIT license',
|
||||
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
|
||||
author='holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others',
|
||||
author_email='holger at merlinux.eu',
|
||||
entry_points= make_entry_points(),
|
||||
install_requires=['pylib>=1.9.9'],
|
||||
install_requires=['py>=1.4.0a2'],
|
||||
classifiers=['Development Status :: 5 - Production',
|
||||
'Intended Audience :: Developers',
|
||||
'License :: OSI Approved :: MIT License',
|
||||
|
@ -67,4 +67,4 @@ def make_entry_points():
|
|||
return {'console_scripts': l}
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
main()
|
||||
|
|
6
tox.ini
6
tox.ini
|
@ -15,7 +15,7 @@ deps=
|
|||
[testenv:genscript]
|
||||
changedir=.
|
||||
commands= py.test --genscript=pytest1
|
||||
deps=pylib
|
||||
deps=py>=1.4.0a2
|
||||
|
||||
[testenv:py27-xdist]
|
||||
changedir=.
|
||||
|
@ -41,7 +41,7 @@ commands=
|
|||
make html
|
||||
|
||||
[testenv:py31]
|
||||
deps=pylib
|
||||
deps=py>=1.4.0a2
|
||||
|
||||
[testenv:py31-xdist]
|
||||
deps=pytest-xdist
|
||||
|
@ -50,7 +50,7 @@ commands=
|
|||
--junitxml={envlogdir}/junit-{envname}.xml []
|
||||
|
||||
[testenv:py32]
|
||||
deps=pylib
|
||||
deps=py>=1.4.0a2
|
||||
|
||||
[testenv:pypy]
|
||||
basepython=pypy-c
|
||||
|
|
Loading…
Reference in New Issue