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

[3.7] bpo-34022: Stop forcing of hash-based invalidation with SOURCE_DATE_EPOCH (GH-9607) #10775

Merged
merged 1 commit into from
Nov 28, 2018

Conversation

miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Nov 28, 2018

Unconditional forcing of CHECKED_HASH invalidation was introduced in
3.7.0 in bpo-29708. The change is bad, as it unconditionally overrides
invalidation_mode, even if it was passed as an explicit argument to
py_compile.compile() or compileall. An environment variable
should never override an explicit argument to a library function.
That change leads to multiple test failures if the SOURCE_DATE_EPOCH
environment variable is set.

This changes py_compile.compile() to only look at
SOURCE_DATE_EPOCH if no explicit invalidation_mode was specified.
I also made various relevant tests run with explicit control over the
value of SOURCE_DATE_EPOCH.

While looking at this, I noticed that zipimport does not work
with hash-based .pycs at all, though I left the fixes for
subsequent commits.
(cherry picked from commit a6b3ec5)

Co-authored-by: Elvis Pranskevichus elvis@magic.io

https://bugs.python.org/issue34022

…POCH (pythonGH-9607)

Unconditional forcing of ``CHECKED_HASH`` invalidation was introduced in
3.7.0 in bpo-29708.  The change is bad, as it unconditionally overrides
*invalidation_mode*, even if it was passed as an explicit argument to
``py_compile.compile()`` or ``compileall``.  An environment variable
should *never* override an explicit argument to a library function.
That change leads to multiple test failures if the ``SOURCE_DATE_EPOCH``
environment variable is set.

This changes ``py_compile.compile()`` to only look at
``SOURCE_DATE_EPOCH`` if no explicit *invalidation_mode* was specified.
I also made various relevant tests run with explicit control over the
value of ``SOURCE_DATE_EPOCH``.

While looking at this, I noticed that ``zipimport`` does not work
with hash-based .pycs _at all_, though I left the fixes for
subsequent commits.
(cherry picked from commit a6b3ec5)

Co-authored-by: Elvis Pranskevichus <elvis@magic.io>
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

LGTM.

@miss-islington
Copy link
Contributor Author

@elprans and @vstinner: Status check is done, and it's a success ✅ .

@miss-islington miss-islington merged commit 24b51b1 into python:3.7 Nov 28, 2018
@miss-islington miss-islington deleted the backport-a6b3ec5-3.7 branch November 28, 2018 17:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants