From ac7ffb7cf5af7094eb072abc253078ebbbf64042 Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Tue, 4 Oct 2022 11:47:05 +0300
Subject: [PATCH] Remove outdated PyPy stdlib overrides

---
 docs/changelog/2426.feature.rst                 |  1 +
 docs/installation.rst                           |  2 +-
 .../create/via_global_ref/builtin/pypy/pypy3.py | 17 -----------------
 3 files changed, 2 insertions(+), 18 deletions(-)
 create mode 100644 docs/changelog/2426.feature.rst

diff --git a/docs/changelog/2426.feature.rst b/docs/changelog/2426.feature.rst
new file mode 100644
index 000000000..39ee94a72
--- /dev/null
+++ b/docs/changelog/2426.feature.rst
@@ -0,0 +1 @@
+Drop support for PyPy3.6, PyPy3.7 which are no longer supported upstream.
diff --git a/docs/installation.rst b/docs/installation.rst
index 46956fe25..57e57d968 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 ca5778c2c..9db36e848 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 @@ 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"""
-        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