Jason R. Coombs avatar Jason R. Coombs committed a8cc38c

Reorganized improts; removed pytest runner

Comments (0)

Files changed (1)

 """
 Setup script for building jaraco.util distribution
 
-Copyright © 2004-2011 Jason R. Coombs
+Copyright © 2004-2012 Jason R. Coombs
 """
 
 from __future__ import unicode_literals
 
 import sys
 
-from setuptools import find_packages, Command
-
-class PyTest(Command):
-	user_options = []
-
-	def initialize_options(self):
-		pass
-
-	def finalize_options(self):
-		pass
-
-	def run(self):
-		import py.test
-		raise SystemExit(py.test.main(args=[]))
+import setuptools
 
 name = 'jaraco.util'
 
 	author = 'Jason R. Coombs',
 	author_email = 'jaraco@jaraco.com',
 	url = 'http://pypi.python.org/pypi/' + name,
-	packages = find_packages(exclude=['tests']),
+	packages = setuptools.find_packages(exclude=['tests']),
 	# convert to bytes to work around TypeError when installed with PIP
 	# https://github.com/pypa/pip/issues/449
 	namespace_packages = [str('jaraco')],
 		'pytest>=2',
 	],
 	setup_requires=[
-		'hgtools>=0.4',
+		'hgtools',
 	],
-	cmdclass=dict(
-		test=PyTest,
-	),
 	use_2to3=True,
 	use_2to3_exclude_fixers=['lib2to3.fixes.fix_import'],
 )
 
 if __name__ == '__main__':
-	from setuptools import setup
 	import pkg_resources
 	if sys.version_info >= (3,):
 		# distribute 0.6.24 is required to exclude the fixers
-		pkg_resources.require('distribute>=0.6.24dev')
-	setup(**setup_params)
+		pkg_resources.require('distribute>=0.6.24')
+	setuptools.setup(**setup_params)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.