Jason R. Coombs avatar Jason R. Coombs committed 87de592 Merge

Merge with CherryPy 3.2

Comments (0)

Files changed (2)

 import os
 import platform
 import shutil
+import importlib
 
 VERSION='3.2.4'
 
 	'cherrypy/wsgiserver/wsgiserver3.py',
 )
 
+def check_wheel():
+	"""
+	Ensure 'wheel' is installed (required for bdist_wheel).
+	"""
+	try:
+		importlib.import_module('wheel')
+	except ImportError:
+		print("CherryPy requires 'wheel' be installed to produce wheels.",
+			file=sys.stderr)
+		raise SystemExit(5)
+
 def check_status():
 	"""
 	Make sure there aren't outstanding changesets that are unpushed, maybe
 	[sys.executable, 'setup.py', 'sdist', '--format=zip'],
 	[sys.executable, 'setup.py', 'sdist', '--format=gztar'],
 	[sys.executable, 'setup.py', 'bdist_wininst'],
+	[sys.executable, 'setup.py', 'bdist_wheel'],
 ]
 
 def build():
 		"or later.")
 	assert platform.system() == 'Windows', ('You must release on Windows '
 		'(to create Windows installers)')
+	check_wheel()
 	check_status()
 	bump_versions()
 	tag_release()
 logging-filter=cherrypy
 verbosity=2
 nocapture=True
+
+[wheel]
+universal=1
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.