p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

depend on py, not pylib distro

This commit is contained in:
holger krekel 2010-11-23 17:21:34 +01:00
parent 4fa7a2e8ce
commit 11e8e5570e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pytest.py
View File

@ -5,7 +5,7 @@ see http://pytest.org for documentation and details
(c) Holger Krekel and others, 2004-2010 (c) Holger Krekel and others, 2004-2010
""" """
__version__ = '2.0.0.dev33' __version__ = '2.0.0.dev34'
__all__ = ['main'] __all__ = ['main']
from _pytest.core import main, UsageError, _preloadplugins from _pytest.core import main, UsageError, _preloadplugins

4
setup.py
View File

@ -22,14 +22,14 @@ def main():
name='pytest', name='pytest',
description='py.test: simple powerful testing with Python', description='py.test: simple powerful testing with Python',
long_description = long_description, long_description = long_description,
version='2.0.0.dev33', version='2.0.0.dev34',
url='http://pytest.org', url='http://pytest.org',
license='MIT license', license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
author='holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others', author='holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others',
author_email='holger at merlinux.eu', author_email='holger at merlinux.eu',
entry_points= make_entry_points(), entry_points= make_entry_points(),
install_requires=['pylib>=1.9.9'], install_requires=['py>=1.4.0a2'],
classifiers=['Development Status :: 5 - Production', classifiers=['Development Status :: 5 - Production',
'Intended Audience :: Developers', 'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License', 'License :: OSI Approved :: MIT License',

6
tox.ini
View File

@ -15,7 +15,7 @@ deps=
[testenv:genscript] [testenv:genscript]
changedir=. changedir=.
commands= py.test --genscript=pytest1 commands= py.test --genscript=pytest1
deps=pylib deps=py>=1.4.0a2
[testenv:py27-xdist] [testenv:py27-xdist]
changedir=. changedir=.
@ -41,7 +41,7 @@ commands=
make html make html
[testenv:py31] [testenv:py31]
deps=pylib deps=py>=1.4.0a2
[testenv:py31-xdist] [testenv:py31-xdist]
deps=pytest-xdist deps=pytest-xdist
@ -50,7 +50,7 @@ commands=
--junitxml={envlogdir}/junit-{envname}.xml [] --junitxml={envlogdir}/junit-{envname}.xml []
[testenv:py32] [testenv:py32]
deps=pylib deps=py>=1.4.0a2
[testenv:pypy] [testenv:pypy]
basepython=pypy-c basepython=pypy-c