floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in jurko/pytest/setup cleanup (pull request #169) 

setup.py cleanup/update (updated from pull request #167)
This commit is contained in:
holger krekel 2014-05-14 09:10:13 +02:00
parent d6281b4206 8f9a88ef7a
commit 748fce94fd
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
setup.py
View File

@ -9,20 +9,19 @@ classifiers=['Development Status :: 6 - Mature',
'Operating System :: MacOS :: MacOS X', 'Operating System :: MacOS :: MacOS X',
'Topic :: Software Development :: Testing', 'Topic :: Software Development :: Testing',
'Topic :: Software Development :: Libraries', 'Topic :: Software Development :: Libraries',
'Topic :: Utilities', 'Topic :: Utilities'] + [
'Programming Language :: Python :: 2', ('Programming Language :: Python :: %s' % x) for x in
'Programming Language :: Python :: 3'] + [ '2 2.6 2.7 3 3.2 3.3 3.4'.split()]
("Programming Language :: Python :: %s" % x) for x in
"2.6 2.7 3.0 3.1 3.2 3.3".split()] long_description = open('README.rst').read()
long_description = open("README.rst").read()
def main(): def main():
install_requires = ["py>=1.4.20"] install_requires = ['py>=1.4.20']
if (sys.version_info < (2,7) or if sys.version_info < (2, 7) or (3,) <= sys.version_info < (3, 2):
sys.version_info > (3, ) and sys.version_info < (3, 2)): install_requires.append('argparse')
install_requires.append("argparse") if sys.platform == 'win32':
if sys.platform == "win32": install_requires.append('colorama')
install_requires.append("colorama")
setup( setup(
name='pytest', name='pytest',
@ -44,24 +43,26 @@ def main():
zip_safe=False, zip_safe=False,
) )
def cmdline_entrypoints(versioninfo, platform, basename): def cmdline_entrypoints(versioninfo, platform, basename):
target = 'pytest:main' target = 'pytest:main'
if platform.startswith('java'): if platform.startswith('java'):
points = {'py.test-jython': target} points = {'py.test-jython': target}
else: else:
if basename.startswith("pypy"): if basename.startswith('pypy'):
points = {'py.test-%s' % basename: target} points = {'py.test-%s' % basename: target}
else: # cpython else: # cpython
points = {'py.test-%s.%s' % versioninfo[:2] : target,} points = {'py.test-%s.%s' % versioninfo[:2] : target}
points['py.test'] = target points['py.test'] = target
return points return points
def make_entry_points(): def make_entry_points():
basename = os.path.basename(sys.executable) basename = os.path.basename(sys.executable)
points = cmdline_entrypoints(sys.version_info, sys.platform, basename) points = cmdline_entrypoints(sys.version_info, sys.platform, basename)
keys = list(points.keys()) keys = list(points.keys())
keys.sort() 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} return {'console_scripts': l}
@ -72,12 +73,13 @@ class PyTest(Command):
def finalize_options(self): def finalize_options(self):
pass pass
def run(self): def run(self):
import sys,subprocess import subprocess
PPATH=[x for x in os.environ.get("PYTHONPATH", "").split(":") if x] PPATH = [x for x in os.environ.get('PYTHONPATH', '').split(':') if x]
PPATH.insert(0, os.getcwd()) PPATH.insert(0, os.getcwd())
os.environ["PYTHONPATH"] = ":".join(PPATH) os.environ['PYTHONPATH'] = ':'.join(PPATH)
errno = subprocess.call([sys.executable, 'pytest.py', '--ignore=doc']) errno = subprocess.call([sys.executable, 'pytest.py', '--ignore=doc'])
raise SystemExit(errno) raise SystemExit(errno)
if __name__ == '__main__': if __name__ == '__main__':
main() main()