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.

Sign up for GitHub

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

Jump to bottom

Remove outdated PyPy stdlib overrides #2426

Merged
merged 2 commits into from
Oct 25, 2022
Merged

Remove outdated PyPy stdlib overrides #2426

merged 2 commits into from
Oct 25, 2022

Conversation

mattip
Copy link
Contributor

@mattip mattip commented Oct 4, 2022 •
edited
Loading

PyPy changed its layout in the 7.3.6 release (Oct 17, 2021) for pypy3.8+. Since PyPy3.7 and earlier are no longer supported upstream, remove the shims put into place to override sysconfig stdlib_path with a different layout.

Maybe too early for this PR if virtualenv wants to continue to support pypy3.6, pypy3.7?

  • ran the linter to address style issues (tox -e fix_lint)
  • wrote descriptive pull request text
  • ensured there are test(s) validating the fix
  • added news fragment in docs/changelog folder
  • updated/extended the documentation

mattip
mattip commented Oct 4, 2022
View reviewed changes
src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
@@ -20,11 +20,6 @@ def exe_names(cls, interpreter):
class PyPy3Posix(PyPy3, PosixSupports):
"""PyPy 3 on POSIX"""

@property
def stdlib(self):
"""PyPy3 respects sysconfig only for the host python, virtual envs is instead lib/pythonx.y/site-packages"""
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This comment was the impetus for the PR since it is clearly wrong, it should say lib/pypyx.y/site-packages

@mattip
Copy link
Contributor Author

mattip commented Oct 4, 2022

CI shows that 3.6, 3.7 are still OK even without the shims.

@gaborbernat gaborbernat merged commit 3cff34f into pypa:main Oct 25, 2022
@mattip
Copy link
Contributor Author

mattip commented Oct 25, 2022

Thanks

github-actions bot added a commit to MaRDI4NFDI/open-interfaces that referenced this pull request Oct 31, 2022
@github-actions
⬆️ Bump virtualenv from 20.16.5 to 20.16.6 (#106)
2d36213 
Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.16.5 to
20.16.6.
<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.16.6 (2022-10-25)</h2>
<p>Features - 20.16.6</p>
<pre><code>- Drop unneeded shims for PyPy3 directory structure
(`[#2426](pypa/virtualenv#2426)
&lt;https://github.com/pypa/virtualenv/issues/2426&gt;`_)
<p>Bugfixes - 20.16.6
</code></pre></p>
<ul>
<li>Fix selected scheme on debian derivatives for python 3.10 when
<code>python3-distutils</code> is not installed or the <code>venv</code>
scheme is not avaiable - by :user:<code>asottile</code>.
(<code>[#2350](pypa/virtualenv#2350)
&lt;https://github.com/pypa/virtualenv/issues/2350&gt;</code>_)</li>
<li>Allow the test suite to pass even with the original C shell (rather
than <code>tcsh</code>) - by :user:<code>kulikjak</code>.
(<code>[#2418](pypa/virtualenv#2418)
&lt;https://github.com/pypa/virtualenv/issues/2418&gt;</code>_)</li>
<li>Fix fallback handling of downloading wheels for bundled packages -
by :user:<code>schaap</code>.
(<code>[#2429](pypa/virtualenv#2429)
&lt;https://github.com/pypa/virtualenv/issues/2429&gt;</code>_)</li>
<li>Upgrade embedded setuptools to <code>65.5.0</code> from
<code>65.3.0</code> and pip to <code>22.3</code> from
<code>22.2.2</code> - by :user:<code>gaborbernat</code>.
(<code>[#2434](pypa/virtualenv#2434)
&lt;https://github.com/pypa/virtualenv/issues/2434&gt;</code>_)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/pypa/virtualenv/commit/26f68e205dfbe36c47fdd1886b0c0060024dbeec"><code>26f68e2</code></a>
release 20.16.6</li>
<li><a
href="https://github.com/pypa/virtualenv/commit/b4564569171628ee839e14853a00f296686cae6a"><code>b456456</code></a>
Upgrade pip and setuptools (<a
href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2434">#2434</a>)</li>
<li><a
href="https://github.com/pypa/virtualenv/commit/3cff34f7dc46d9ad147a3d70df31e75cab77612d"><code>3cff34f</code></a>
Remove outdated PyPy stdlib overrides (<a
href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2426">#2426</a>)</li>
<li><a
href="https://github.com/pypa/virtualenv/commit/ae2594c5a822f62964f2ccef7832c26306bc66b1"><code>ae2594c</code></a>
Fix test_csh when running with the original csh (<a
href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2418">#2418</a>)</li>
<li><a
href="https://github.com/pypa/virtualenv/commit/cdf4225c689150010af8da1cc913e8f32bee06d2"><code>cdf4225</code></a>
Allow empty string as version for <code>find_compatible_in_house</code>
(<a
href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2430">#2430</a>)</li>
<li><a
href="https://github.com/pypa/virtualenv/commit/3ed75b25cc0c318fc789938bf6bad9c8326da739"><code>3ed75b2</code></a>
[pre-commit.ci] pre-commit autoupdate (<a
href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2423">#2423</a>)</li>
<li><a
href="https://github.com/pypa/virtualenv/commit/445a68dffa7ba5c0af3b02ec0545b760cd8c04ba"><code>445a68d</code></a>
fix building python3.10 virtualenvs on debian derivatives (<a
href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2415">#2415</a>)</li>
<li><a
href="https://github.com/pypa/virtualenv/commit/56003ce62101c3d2cfe1a8eb82ef7defbe0d138f"><code>56003ce</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2413">#2413</a>
from pypa/release-20.16.5</li>
<li>See full diff in <a
href="https://github.com/pypa/virtualenv/compare/20.16.5...20.16.6">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=virtualenv&package-manager=pip&previous-version=20.16.5&new-version=20.16.6)](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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mattip @gaborbernat