Merged in jurko/pytest/setup cleanup (pull request #169)
setup.py cleanup/update (updated from pull request #167)
This commit is contained in:
commit
748fce94fd
46
setup.py
46
setup.py
|
@ -1,7 +1,7 @@
|
|||
import os, sys
|
||||
from setuptools import setup, Command
|
||||
|
||||
classifiers=['Development Status :: 6 - Mature',
|
||||
classifiers = ['Development Status :: 6 - Mature',
|
||||
'Intended Audience :: Developers',
|
||||
'License :: OSI Approved :: MIT License',
|
||||
'Operating System :: POSIX',
|
||||
|
@ -9,34 +9,33 @@ classifiers=['Development Status :: 6 - Mature',
|
|||
'Operating System :: MacOS :: MacOS X',
|
||||
'Topic :: Software Development :: Testing',
|
||||
'Topic :: Software Development :: Libraries',
|
||||
'Topic :: Utilities',
|
||||
'Programming Language :: Python :: 2',
|
||||
'Programming Language :: Python :: 3'] + [
|
||||
("Programming Language :: Python :: %s" % x) for x in
|
||||
"2.6 2.7 3.0 3.1 3.2 3.3".split()]
|
||||
'Topic :: Utilities'] + [
|
||||
('Programming Language :: Python :: %s' % x) for x in
|
||||
'2 2.6 2.7 3 3.2 3.3 3.4'.split()]
|
||||
|
||||
long_description = open('README.rst').read()
|
||||
|
||||
|
||||
long_description = open("README.rst").read()
|
||||
def main():
|
||||
install_requires = ["py>=1.4.20"]
|
||||
if (sys.version_info < (2,7) or
|
||||
sys.version_info > (3, ) and sys.version_info < (3, 2)):
|
||||
install_requires.append("argparse")
|
||||
if sys.platform == "win32":
|
||||
install_requires.append("colorama")
|
||||
install_requires = ['py>=1.4.20']
|
||||
if sys.version_info < (2, 7) or (3,) <= sys.version_info < (3, 2):
|
||||
install_requires.append('argparse')
|
||||
if sys.platform == 'win32':
|
||||
install_requires.append('colorama')
|
||||
|
||||
setup(
|
||||
name='pytest',
|
||||
description='pytest: simple powerful testing with Python',
|
||||
long_description = long_description,
|
||||
long_description=long_description,
|
||||
version='2.6.0.dev1',
|
||||
url='http://pytest.org',
|
||||
license='MIT license',
|
||||
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
|
||||
author='Holger Krekel, Benjamin Peterson, Ronny Pfannschmidt, Floris Bruynooghe and others',
|
||||
author_email='holger at merlinux.eu',
|
||||
entry_points= make_entry_points(),
|
||||
entry_points=make_entry_points(),
|
||||
classifiers=classifiers,
|
||||
cmdclass = {'test': PyTest},
|
||||
cmdclass={'test': PyTest},
|
||||
# the following should be enabled for release
|
||||
install_requires=install_requires,
|
||||
packages=['_pytest', '_pytest.assertion'],
|
||||
|
@ -44,24 +43,26 @@ def main():
|
|||
zip_safe=False,
|
||||
)
|
||||
|
||||
|
||||
def cmdline_entrypoints(versioninfo, platform, basename):
|
||||
target = 'pytest:main'
|
||||
if platform.startswith('java'):
|
||||
points = {'py.test-jython': target}
|
||||
else:
|
||||
if basename.startswith("pypy"):
|
||||
if basename.startswith('pypy'):
|
||||
points = {'py.test-%s' % basename: target}
|
||||
else: # cpython
|
||||
points = {'py.test-%s.%s' % versioninfo[:2] : target,}
|
||||
points = {'py.test-%s.%s' % versioninfo[:2] : target}
|
||||
points['py.test'] = target
|
||||
return points
|
||||
|
||||
|
||||
def make_entry_points():
|
||||
basename = os.path.basename(sys.executable)
|
||||
points = cmdline_entrypoints(sys.version_info, sys.platform, basename)
|
||||
keys = list(points.keys())
|
||||
keys.sort()
|
||||
l = ["%s = %s" % (x, points[x]) for x in keys]
|
||||
l = ['%s = %s' % (x, points[x]) for x in keys]
|
||||
return {'console_scripts': l}
|
||||
|
||||
|
||||
|
@ -72,12 +73,13 @@ class PyTest(Command):
|
|||
def finalize_options(self):
|
||||
pass
|
||||
def run(self):
|
||||
import sys,subprocess
|
||||
PPATH=[x for x in os.environ.get("PYTHONPATH", "").split(":") if x]
|
||||
import subprocess
|
||||
PPATH = [x for x in os.environ.get('PYTHONPATH', '').split(':') if x]
|
||||
PPATH.insert(0, os.getcwd())
|
||||
os.environ["PYTHONPATH"] = ":".join(PPATH)
|
||||
os.environ['PYTHONPATH'] = ':'.join(PPATH)
|
||||
errno = subprocess.call([sys.executable, 'pytest.py', '--ignore=doc'])
|
||||
raise SystemExit(errno)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
Loading…
Reference in New Issue