diff options
| author | Matti Picus <matti.picus@gmail.com> | 2022-10-25 08:01:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-24 22:01:12 -0700 |
| commit | 3cff34f7dc46d9ad147a3d70df31e75cab77612d (patch) | |
| tree | b296e33a8218644d1c4e91928a49cb41b276ac9b | |
| parent | ae2594c5a822f62964f2ccef7832c26306bc66b1 (diff) | |
| download | virtualenv-3cff34f7dc46d9ad147a3d70df31e75cab77612d.tar.gz | |
Remove outdated PyPy stdlib overrides (#2426)
| -rw-r--r-- | docs/changelog/2426.feature.rst | 1 | ||||
| -rw-r--r-- | docs/installation.rst | 2 | ||||
| -rw-r--r-- | src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py | 17 |
3 files changed, 2 insertions, 18 deletions
diff --git a/docs/changelog/2426.feature.rst b/docs/changelog/2426.feature.rst new file mode 100644 index 0000000..3cfac25 --- /dev/null +++ b/docs/changelog/2426.feature.rst @@ -0,0 +1 @@ +Drop unneeded shims for PyPy3 directory structure diff --git a/docs/installation.rst b/docs/installation.rst index 46956fe..57e57d9 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -89,7 +89,7 @@ Python and OS Compatibility virtualenv works with the following Python interpreter implementations: - `CPython <https://www.python.org/>`_ versions 2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10 -- `PyPy <https://pypy.org/>`_ 2.7 and 3.5+. +- `PyPy <https://pypy.org/>`_ 2.7, 3.6, 3.7, 3.8, 3.9 This means virtualenv works on the latest patch version of each of these minor versions. Previous patch versions are supported on a best effort approach. diff --git a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py index ca5778c..9db36e8 100644 --- a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py +++ b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py @@ -20,11 +20,6 @@ class PyPy3(PyPy, Python3Supports, metaclass=abc.ABCMeta): 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""" - return self.dest / "lib" / f"pypy{self.interpreter.version_release_str}" / "site-packages" - @classmethod def _shared_libs(cls, python_dir): # glob for libpypy3-c.so, libpypy3-c.dylib, libpypy3.9-c.so ... @@ -64,18 +59,6 @@ class Pypy3Windows(PyPy3, WindowsSupports): def less_v37(self): return self.interpreter.version_info.minor < 7 - @property - def stdlib(self): - """PyPy3 respects sysconfig only for the host python, virtual envs is instead Lib/site-packages""" - if self.less_v37: - return self.dest / "site-packages" - return self.dest / "Lib" / "site-packages" - - @property - def bin_dir(self): - """PyPy3 needs to fallback to pypy definition""" - return self.dest / "Scripts" - @classmethod def _shared_libs(cls, python_dir): # glob for libpypy*.dll and libffi*.dll |