PyPy: glob for required dlls, check they exist (#2274)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

src/virtualenv/create/via_global_ref/builtin/pypy/common.py

@@ -43,11 +43,9 @@ def sources(cls, interpreter):
     def _add_shared_libs(cls, interpreter):
         # https://bitbucket.org/pypy/pypy/issue/1922/future-proofing-virtualenv
         python_dir = Path(interpreter.system_executable).resolve().parent
-        for libname in cls._shared_libs():
-            src = python_dir / libname
-            if src.exists():
-                yield src
+        for src in cls._shared_libs(python_dir):
+            yield src
 
     @classmethod
-    def _shared_libs(cls):
+    def _shared_libs(cls, python_dir):
         raise NotImplementedError

src/virtualenv/create/via_global_ref/builtin/pypy/pypy2.py

@@ -87,8 +87,8 @@ def modules(cls):
         return super(PyPy2Posix, cls).modules() + ["posixpath"]
 
     @classmethod
-    def _shared_libs(cls):
-        return ["libpypy-c.so", "libpypy-c.dylib"]
+    def _shared_libs(cls, python_dir):
+        return python_dir.glob("libpypy*.*")
 
     @property
     def lib(self):
@@ -111,8 +111,12 @@ def modules(cls):
         return super(Pypy2Windows, cls).modules() + ["ntpath"]
 
     @classmethod
-    def _shared_libs(cls):
-        return ["libpypy-c.dll", "libffi-7.dll", "libffi-8.dll"]
+    def _shared_libs(cls, python_dir):
+        # No glob in python2 PathLib
+        for candidate in ["libpypy-c.dll", "libffi-7.dll", "libffi-8.dll"]:
+            dll = python_dir / candidate
+            if dll.exists():
+                yield dll
 
     @classmethod
     def sources(cls, interpreter):

src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py

@@ -23,16 +23,17 @@ def exe_names(cls, interpreter):
 
 
 class PyPy3Posix(PyPy3, PosixSupports):
-    """PyPy 2 on POSIX"""
+    """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" / "pypy{}".format(self.interpreter.version_release_str) / "site-packages"
 
     @classmethod
-    def _shared_libs(cls):
-        return ["libpypy3-c.so", "libpypy3-c.dylib"]
+    def _shared_libs(cls, python_dir):
+        # glob for libpypy3-c.so, libpypy3-c.dylib, libpypy3.9-c.so ...
+        return python_dir.glob("libpypy3*.*")
 
     def to_lib(self, src):
         return self.dest / "lib" / src.name
@@ -71,5 +72,9 @@ def bin_dir(self):
         return self.dest / "Scripts"
 
     @classmethod
-    def _shared_libs(cls):
-        return ["libpypy3-c.dll", "libffi-7.dll", "libffi-8.dll"]
+    def _shared_libs(cls, python_dir):
+        # glob for libpypy*.dll and libffi*.dll
+        for pattern in ["libpypy*.dll", "libffi*.dll"]:
+            srcs = python_dir.glob(pattern)
+            for src in srcs:
+                yield src