Avoid symlinking the contents of /usr into PyPy3 virtualenvs #2310
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PyPy >= 3.8 supports a standard prefix installation, where older versions always used a portable/developent style installation. If this is a standard prefix installation, skip the logic that symlinks libraries in a portable PyPy distribution. Fixes: pypa#2309
gaborbernat
requested changes
Mar 5, 2022
stefanor
force-pushed
the
pypy3.8
branch
10 times, most recently
from
b259d1b to
32206e7
Compare
1. Portable PyPy3.8 build, as downloaded from upstream. This should include the provided shared libraries, libpypy3-c.so has an rpath of $ORIGIN/../lib to point to them. 2. Debian's /usr/lib/pypy3 layout for PyPy3 < 3.8. This should include libpypy3-c.so. 3. Debian's /usr layout for PyPy3 > 3.8. This should exclude libpypy3-c.so, as it's on the standard linker search path. It should also not include anything else from /usr/lib. (See pypa#2309)
Signed-off-by: Bernát Gábor <[email protected]>
|
This now has been released as https://pypi.org/project/virtualenv/20.13.3/ |
mergify bot
pushed a commit
to andrewbolster/bolster
that referenced
this pull request
Mar 8, 2022
Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.13.0 to 20.13.3. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst">virtualenv's changelog</a>.</em></p> <blockquote> <h2>v20.13.3 (2022-03-07)</h2> <p>Bugfixes - 20.13.3</p> <pre><code>- Avoid symlinking the contents of ``/usr`` into PyPy3.8+ virtualenvs - by :user:`stefanor`. (`[#2310](pypa/virtualenv#2310) <https://github.com/pypa/virtualenv/issues/2310>`_) - Bump embed pip from ``22.0.3`` to ``22.0.4`` - by :user:`gaborbernat`. (`[#2311](pypa/virtualenv#2311) <https://github.com/pypa/virtualenv/issues/2311>`_) <h2>v20.13.2 (2022-02-24)</h2> <p>Bugfixes - 20.13.2 </code></pre></p> <ul> <li>Upgrade embedded setuptools to <code>60.9.3</code> from <code>60.6.0</code> - by :user:<code>gaborbernat</code>. (<code>[#2306](pypa/virtualenv#2306) <https://github.com/pypa/virtualenv/issues/2306></code>_)</li> </ul> <h2>v20.13.1 (2022-02-05)</h2> <p>Bugfixes - 20.13.1</p> <pre><code>- fix "execv() arg 2 must contain only strings" error on M1 MacOS (`[#2282](pypa/virtualenv#2282) <https://github.com/pypa/virtualenv/issues/2282>`_) - Ugrade embedded setuptools to ``60.5.0`` from ``60.2.0`` - by :user:`asottile`. (`[#2289](pypa/virtualenv#2289) <https://github.com/pypa/virtualenv/issues/2289>`_) - Upgrade embedded pip to ``22.0.3`` and setuptools to ``60.6.0`` - by :user:`gaborbernat` and :user:`asottile`. (`[#2294](pypa/virtualenv#2294) <https://github.com/pypa/virtualenv/issues/2294>`_) </code></pre> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/pypa/virtualenv/commit/e3c30b7e6a9d6743e2374cba8885c599801be767"><code>e3c30b7</code></a> release 20.13.3</li> <li><a href="https://github.com/pypa/virtualenv/commit/471e7cc5e180909481caf9c901dd8451eb8a49fe"><code>471e7cc</code></a> Upgrade pip to 22.0.4 (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2311">#2311</a>)</li> <li><a href="https://github.com/pypa/virtualenv/commit/3a90a6bb48313ad45bfc448637b91c630b5014ac"><code>3a90a6b</code></a> Avoid symlinking the contents of /usr into PyPy3 virtualenvs (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2310">#2310</a>)</li> <li><a href="https://github.com/pypa/virtualenv/commit/bb3131a36917a8100afa624b1da7e4971e23030e"><code>bb3131a</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2307">#2307</a> from pypa/release-20.13.2</li> <li><a href="https://github.com/pypa/virtualenv/commit/bcf9bb892d020ba8993bd06ce8a6c43796ae97e0"><code>bcf9bb8</code></a> release 20.13.2</li> <li><a href="https://github.com/pypa/virtualenv/commit/6378f7240130810e498e26f893a780096a743fa0"><code>6378f72</code></a> Bump setuptools (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2306">#2306</a>)</li> <li><a href="https://github.com/pypa/virtualenv/commit/7424a015d1c28e26fd9324b8c47dab6d6c15b184"><code>7424a01</code></a> use the workflow as part of the concurrency group (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2300">#2300</a>)</li> <li><a href="https://github.com/pypa/virtualenv/commit/253bee65b26e8adde4934f8c9ffe484efe965db7"><code>253bee6</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2299">#2299</a> from pypa/release-20.13.1</li> <li><a href="https://github.com/pypa/virtualenv/commit/16ad07fdcc7fe1d5f9a40ff5cf9cec005ff2cb1c"><code>16ad07f</code></a> release 20.13.1</li> <li><a href="https://github.com/pypa/virtualenv/commit/5ee5ad9a1941aaf0a64062208eabccf85e9f9004"><code>5ee5ad9</code></a> fix setuptools zipimport breakage by downgrading setuptools (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2296">#2296</a>)</li> <li>Additional commits viewable in <a href="https://github.com/pypa/virtualenv/compare/20.13.0...20.13.3">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
bors bot
added a commit
to ChrisRBe/PP-P2P-Parser
that referenced
this pull request
Mar 8, 2022
513: build(deps): bump virtualenv from 20.13.2 to 20.13.3 r=ChrisRBe a=dependabot[bot] Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.13.2 to 20.13.3. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst">virtualenv's changelog</a>.</em></p> <blockquote> <h2>v20.13.3 (2022-03-07)</h2> <p>Bugfixes - 20.13.3</p> <pre><code>- Avoid symlinking the contents of ``/usr`` into PyPy3.8+ virtualenvs - by :user:`stefanor`. (`[#2310](pypa/virtualenv#2310) <https://github.com/pypa/virtualenv/issues/2310>`_) - Bump embed pip from ``22.0.3`` to ``22.0.4`` - by :user:`gaborbernat`. (`[#2311](pypa/virtualenv#2311) <https://github.com/pypa/virtualenv/issues/2311>`_) </code></pre> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/pypa/virtualenv/commit/e3c30b7e6a9d6743e2374cba8885c599801be767"><code>e3c30b7</code></a> release 20.13.3</li> <li><a href="https://github.com/pypa/virtualenv/commit/471e7cc5e180909481caf9c901dd8451eb8a49fe"><code>471e7cc</code></a> Upgrade pip to 22.0.4 (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2311">#2311</a>)</li> <li><a href="https://github.com/pypa/virtualenv/commit/3a90a6bb48313ad45bfc448637b91c630b5014ac"><code>3a90a6b</code></a> Avoid symlinking the contents of /usr into PyPy3 virtualenvs (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2310">#2310</a>)</li> <li><a href="https://github.com/pypa/virtualenv/commit/bb3131a36917a8100afa624b1da7e4971e23030e"><code>bb3131a</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2307">#2307</a> from pypa/release-20.13.2</li> <li>See full diff in <a href="https://github.com/pypa/virtualenv/compare/20.13.2...20.13.3">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - ``@dependabot` rebase` will rebase this PR - ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it - ``@dependabot` merge` will merge this PR after your CI passes on it - ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it - ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging - ``@dependabot` reopen` will reopen this PR if it is closed - ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
mergify bot
pushed a commit
to andrewbolster/bolster
that referenced
this pull request
Mar 25, 2022
Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.13.4 to 20.14.0. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/pypa/virtualenv/blob/20.14.0/docs/changelog.rst">virtualenv's changelog</a>.</em></p> <blockquote> <h2>v20.14.0 (2022-03-25)</h2> <p>Features - 20.14.0</p> <pre><code>- Support Nushell activation scripts with nu version ``0.60`` - by :user:`kubouch`. (`[#2321](pypa/virtualenv#2321) <https://github.com/pypa/virtualenv/issues/2321>`_) <p>Bugfixes - 20.14.0 </code></pre></p> <ul> <li>Improve performance of python startup inside created virtualenvs - by :user:<code>asottile</code>. (<code>[#2317](pypa/virtualenv#2317) <https://github.com/pypa/virtualenv/issues/2317></code>_)</li> <li>Upgrade embedded setuptools to <code>60.10.0</code> from <code>60.9.3</code> - by :user:<code>gaborbernat</code>. (<code>[#2320](pypa/virtualenv#2320) <https://github.com/pypa/virtualenv/issues/2320></code>_)</li> <li>Upgrade embedded setuptools to <code>61.0.0</code> from <code>60.10.0</code> - by :user:<code>gaborbernat</code>. (<code>[#2322](pypa/virtualenv#2322) <https://github.com/pypa/virtualenv/issues/2322></code>_)</li> </ul> <h2>v20.13.3 (2022-03-07)</h2> <p>Bugfixes - 20.13.3</p> <pre><code>- Avoid symlinking the contents of ``/usr`` into PyPy3.8+ virtualenvs - by :user:`stefanor`. (`[#2310](pypa/virtualenv#2310) <https://github.com/pypa/virtualenv/issues/2310>`_) - Bump embed pip from ``22.0.3`` to ``22.0.4`` - by :user:`gaborbernat`. (`[#2311](pypa/virtualenv#2311) <https://github.com/pypa/virtualenv/issues/2311>`_) <h2>v20.13.2 (2022-02-24)</h2> <p>Bugfixes - 20.13.2 </code></pre></p> <ul> <li>Upgrade embedded setuptools to <code>60.9.3</code> from <code>60.6.0</code> - by :user:<code>gaborbernat</code>. (<code>[#2306](pypa/virtualenv#2306) <https://github.com/pypa/virtualenv/issues/2306></code>_)</li> </ul> <h2>v20.13.1 (2022-02-05)</h2> <p>Bugfixes - 20.13.1</p> <pre><code>- fix "execv() arg 2 must contain only strings" error on M1 MacOS (`[#2282](pypa/virtualenv#2282) <https://github.com/pypa/virtualenv/issues/2282>`_) - Ugrade embedded setuptools to ``60.5.0`` from ``60.2.0`` - by :user:`asottile`. (`[#2289](pypa/virtualenv#2289) <https://github.com/pypa/virtualenv/issues/2289>`_) - Upgrade embedded pip to ``22.0.3`` and setuptools to ``60.6.0`` - by :user:`gaborbernat` and :user:`asottile`. (`[#2294](pypa/virtualenv#2294) <https://github.com/pypa/virtualenv/issues/2294>`_) <h2>v20.13.0 (2022-01-02)</h2> <p>Features - 20.13.0 </code></pre></p> <ul> <li>Add downloaded wheel information in the relevant JSON embed file to prevent additional downloads of the same wheel. - by :user:<code>mayeut</code>. (<code>[#2268](pypa/virtualenv#2268) <https://github.com/pypa/virtualenv/issues/2268></code>_)</li> </ul> <p>Bugfixes - 20.13.0</p> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/pypa/virtualenv/commit/a731637cbaf2da326a8ce5c857e2e873ef1120ce"><code>a731637</code></a> release 20.14.0</li> <li><a href="https://github.com/pypa/virtualenv/commit/04296970d44c5399ed84cd6008901bd1be96b20d"><code>0429697</code></a> Bump embeded setuptools to v61 (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2322">#2322</a>)</li> <li><a href="https://github.com/pypa/virtualenv/commit/ee018a3b2d6684f6965e5ddbf14ed7477627160e"><code>ee018a3</code></a> Update Nushell activation scripts to 0.60 (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2321">#2321</a>)</li> <li>See full diff in <a href="https://github.com/pypa/virtualenv/compare/20.13.4...20.14.0">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
|
We just discovered this issue on Fedora 35 and spent some time trying to figure out what's going on. Thanks for fixing it @stefanor! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PyPy >= 3.8 supports a standard prefix installation, where older versions always used a portable/developent style installation.
If this is a standard prefix installation, skip the logic that symlinks libraries in a portable PyPy distribution.
Fixes: #2309
Thanks for contributing, make sure you address all the checklists (for details on how see
development documentation)!
tox -e fix_lint)docs/changelogfolder