stylistic setup.py code cleanup
--HG-- branch : setup cleanup
This commit is contained in:
		
							parent
							
								
									d6281b4206
								
							
						
					
					
						commit
						c64af0d9ce
					
				
							
								
								
									
										60
									
								
								setup.py
								
								
								
								
							
							
						
						
									
										60
									
								
								setup.py
								
								
								
								
							| 
						 | 
					@ -1,42 +1,41 @@
 | 
				
			||||||
import os, sys
 | 
					import os, sys
 | 
				
			||||||
from setuptools import setup, Command
 | 
					from setuptools import setup, Command
 | 
				
			||||||
 | 
					
 | 
				
			||||||
classifiers=['Development Status :: 6 - Mature',
 | 
					classifiers = ['Development Status :: 6 - Mature',
 | 
				
			||||||
             'Intended Audience :: Developers',
 | 
					               'Intended Audience :: Developers',
 | 
				
			||||||
             'License :: OSI Approved :: MIT License',
 | 
					               'License :: OSI Approved :: MIT License',
 | 
				
			||||||
             'Operating System :: POSIX',
 | 
					               'Operating System :: POSIX',
 | 
				
			||||||
             'Operating System :: Microsoft :: Windows',
 | 
					               'Operating System :: Microsoft :: Windows',
 | 
				
			||||||
             '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.0 3.1 3.2 3.3'.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',
 | 
				
			||||||
        description='pytest: simple powerful testing with Python',
 | 
					        description='pytest: simple powerful testing with Python',
 | 
				
			||||||
        long_description = long_description,
 | 
					        long_description=long_description,
 | 
				
			||||||
        version='2.6.0.dev1',
 | 
					        version='2.6.0.dev1',
 | 
				
			||||||
        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, Benjamin Peterson, Ronny Pfannschmidt, Floris Bruynooghe and others',
 | 
					        author='Holger Krekel, Benjamin Peterson, Ronny Pfannschmidt, Floris Bruynooghe and others',
 | 
				
			||||||
        author_email='holger at merlinux.eu',
 | 
					        author_email='holger at merlinux.eu',
 | 
				
			||||||
        entry_points= make_entry_points(),
 | 
					        entry_points=make_entry_points(),
 | 
				
			||||||
        classifiers=classifiers,
 | 
					        classifiers=classifiers,
 | 
				
			||||||
        cmdclass = {'test': PyTest},
 | 
					        cmdclass={'test': PyTest},
 | 
				
			||||||
        # the following should be enabled for release
 | 
					        # the following should be enabled for release
 | 
				
			||||||
        install_requires=install_requires,
 | 
					        install_requires=install_requires,
 | 
				
			||||||
        packages=['_pytest', '_pytest.assertion'],
 | 
					        packages=['_pytest', '_pytest.assertion'],
 | 
				
			||||||
| 
						 | 
					@ -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()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue