Commit 61e0c51d authored by Reinout van Rees's avatar Reinout van Rees

Default to setuptools' wheel support instead of failing

Setuptools 38.2.0 suddenly started supporting and downloading wheels.
.whl files would end up in the non-functioning and deprecated unpack_wheel().
The new default ('just use setuptools') works fine.

- If you use an older setuptools, setuptools won't download wheels and the new
  code won't be used.

- If you use buildout.wheel, you'll overwrite the unpacker anyway.
parent a546b761
......@@ -1637,11 +1637,11 @@ def unpack_wheel(location, dest):
[egg] = glob.glob(os.path.join(tmp_dest, '*.egg'))
unpack_egg(egg, dest)
shutil.rmtree(tmp_dest)
UNPACKERS = {
'.egg': unpack_egg,
'.whl': unpack_wheel,
'.whl': unpack_egg, # Since 38.2, setuptools handles wheels, too.
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment