Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve wheel support in pex. #388

Merged
merged 25 commits into from
Jul 8, 2017
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f7b9dd7
Improve wheel support in pex.
MarkChuCarroll May 15, 2017
533e641
Rewrite the pex wheel fix, using the wheel installer.
MarkChuCarroll May 28, 2017
bac461a
Clean up.
MarkChuCarroll May 30, 2017
cb5da41
Fix some path confusion.
MarkChuCarroll May 30, 2017
5a9575c
Switch to use os.walk instead of os.path.walk to increase compatibili…
MarkChuCarroll May 30, 2017
027635c
Tests pass locally; trying to get them to pass in CI.
MarkChuCarroll May 30, 2017
bb4088f
Update the wheel script finder so that it works during both pex gener…
MarkChuCarroll May 31, 2017
75014cf
Move "wheelfile" import so it only gets loaded during pex generation.
MarkChuCarroll Jun 1, 2017
95c01e1
Fix isort issue.
MarkChuCarroll Jun 1, 2017
86b420c
Add an explicit dependency on "wheel" to setup.py's test deps.
MarkChuCarroll Jun 1, 2017
0e45922
Update requirements to pull wheel in for py26.
MarkChuCarroll Jun 1, 2017
e63644a
Run isort to fix import sort issues.
MarkChuCarroll Jun 1, 2017
1cd5e1b
Add a bypass of the wheel install code for Python 2.6.
MarkChuCarroll Jun 22, 2017
1637e5a
Add a bypass of the wheel install code for Python 2.6.
MarkChuCarroll Jun 22, 2017
e66ade4
Another try at fixing the build.
MarkChuCarroll Jun 22, 2017
2ed5338
Another try at fixing the build.
MarkChuCarroll Jun 22, 2017
02a9e61
Try fixing the "skipif" flag.
MarkChuCarroll Jun 22, 2017
5625240
Add "skipif" to the texs_pex_builder_wheeldep for Python 2.6
MarkChuCarroll Jun 22, 2017
570c754
Duh.
MarkChuCarroll Jun 22, 2017
bb3e066
Update isort.
MarkChuCarroll Jun 22, 2017
fcdf3fd
Another try at the import issue.
MarkChuCarroll Jun 22, 2017
031463c
Address some review comments.
MarkChuCarroll Jul 7, 2017
2701d98
isort.
MarkChuCarroll Jul 7, 2017
d84f211
Fix the 26 test.
MarkChuCarroll Jul 7, 2017
1100e3f
Keep trying to fix the stupid isort.
MarkChuCarroll Jul 7, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pex/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import shutil
import uuid
from abc import abstractmethod

from email import message_from_string

from .common import safe_mkdtemp, safe_open
Expand Down
2 changes: 1 addition & 1 deletion pex/pex_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import tempfile

from pkg_resources import DefaultProvider, ZipProvider, get_provider
from wheel.install import WheelFile

from .common import Chroot, chmod_plus_x, open_zip, safe_mkdir, safe_mkdtemp
from .compatibility import to_bytes
Expand Down Expand Up @@ -274,6 +273,7 @@ def _add_dist_zip(self, path, dist_name):
# But wheels don't have to be importable, so we need to force them
# into an importable shape. We can do that by installing it into its own
# wheel dir.
from wheel.install import WheelFile
if dist_name.endswith("whl"):
try:
tmp = tempfile.mkdtemp()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use of pex.common.safe_mkdtemp is preferred.

Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
'twitter.common.lang>=0.3.1,<0.4.0',
'twitter.common.testing>=0.3.1,<0.4.0',
'twitter.common.dirutil>=0.3.1,<0.4.0',
'wheel==0.29.0',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that WHEEL_REQUIREMENT should now be in install_requires

'pytest',
],
entry_points = {
Expand Down