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

Upgrade to pex 1.4.8 and eliminate workarounds. #6594

Merged
merged 2 commits into from Oct 8, 2018

Conversation

Projects
None yet
4 participants
@jsirois
Copy link
Member

jsirois commented Oct 4, 2018

Pex now allows us to float setuptools high and run on python 3.7 and
it supports sane platform expansion as well as graceful handling of
non-standard setuptools platform reporting for Apple system
interpreters allowing us to eliminate several workarounds.

We also pickup a fix for concurrent pex extraction which is particularly
useful when running pants from a pex using PEX_FORCE_LOCAL.

Fixes #5922
Fixes #6363
Fixes #6397

@jsirois

This comment has been minimized.

Copy link
Member

jsirois commented Oct 5, 2018

Eeenteresting!: nedbat/coveragepy#715

I can hack around this. Fix forthcoming.

@jsirois jsirois requested review from stuhood , Eric-Arellano and baroquebobcat Oct 5, 2018

@Eric-Arellano
Copy link
Contributor

Eric-Arellano left a comment

Great that this closes a couple issues and kills off so much code! Thank you John.

I see you are working on fixing coverage library itself. If you want to merge this before that goes through, no worries on waiting for upstream. Seems like that could be a followup PR.

@jsirois

This comment has been minimized.

Copy link
Member

jsirois commented Oct 5, 2018

I see you are working on fixing coverage library itself. If you want to merge this before that goes through, no worries on waiting for upstream. Seems like that could be a followup PR.

Yeah - I will not block. I think Ned takes a pretty conservative approach, especially when there is a workaround. For example:

# TODO(John Sirois): Kill the workaround overrides below if there is a useable upstream
# resolution to:
# https://bitbucket.org/ned/coveragepy/issues/646/modifying-coverage-reporting-for-python
@property
def parser(self):
if self._parser is None:
self._parser = PythonParser(filename=self.filename)
self._parser.parse_source()
return self._parser
def no_branch_lines(self):
return self.parser.lines_matching(join_regex(DEFAULT_PARTIAL[:]),
join_regex(DEFAULT_PARTIAL_ALWAYS[:]))

@stuhood

stuhood approved these changes Oct 5, 2018

Copy link
Member

stuhood left a comment

Awesome!

@jsirois

This comment has been minimized.

Copy link
Member

jsirois commented Oct 5, 2018

... and bit by an unrelated jupyter failure which I was working on independently anyhow:

                     E   	Exception message: Could not satisfy all requirements for prompt-toolkit<2.0.0,>=1.0.4:
                     E   	    prompt-toolkit<2.0.0,>=1.0.4(from: ipython<6), prompt-toolkit<2.1.0,>=2.0.0(from: jupyter==1.0.0->jupyter-console)

Fix forthcoming for that in #6600; then I'll rebase here to pick up green CI.

@jsirois jsirois force-pushed the jsirois:issues/5922 branch from 2d95756 to ec5080e Oct 5, 2018

jsirois added some commits Oct 4, 2018

Upgrade to pex 1.4.8 and eliminate workarounds.
Pex now allows us to float setuptools high and run on python 3.7 and
it supports sane platform expansion as well as graceful handling of
non-standard `setuptools` platform reporting for Apple system
interpreters allowing us to eliminate several workarounds.

We also pickup a fix for concurrent pex extraction which is particularly
useful when running pants from a pex using `PEX_FORCE_LOCAL`.

Fixes #5922
Fixes #6363
Hack around longstanding coverage gotcha.
We were always having our 1st sys.path entry nuked, but it just so
happened the 0th position used to be held by the pex bootstrap which was
no longer needed by the time coverage ran.

@jsirois jsirois force-pushed the jsirois:issues/5922 branch from ec5080e to af47584 Oct 7, 2018

@jsirois jsirois merged commit 38ccf42 into pantsbuild:master Oct 8, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@jsirois jsirois deleted the jsirois:issues/5922 branch Oct 8, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment