Fix pypy wheel tag for pypy3.7-7.3

PyO3 · Feb 19, 2021 · 6099945 · 6099945
1 parent 296a4ad
commit 6099945
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 12 deletions.
diff --git a/src/python_interpreter.rs b/src/python_interpreter.rs
@@ -356,7 +356,7 @@ fn fun_with_abiflags(
 }
 
 impl PythonInterpreter {
-    /// Returns the supported python environment in the PEP 425 format:
+    /// Returns the supported python environment in the PEP 425 format used for the wheel filename:
     /// {python tag}-{abi tag}-{platform tag}
     ///
     /// Don't ask me why or how, this is just what setuptools uses so I'm also going to use
@@ -385,19 +385,13 @@ impl PythonInterpreter {
                 }
             }
             InterpreterKind::PyPy => {
-                // TODO: Use manylinux 2010 by default with pypy
-                if manylinux != &Manylinux::Off {
-                    eprintln!(
-                        "🛈  Note: PyPy doesn't support the manylinux yet, \
-                         so native wheels are built instead of manylinux wheels"
-                    );
-                }
-                // hack to never use manylinux for pypy
-                let platform = self.target.get_platform_tag(&Manylinux::Off, universal2);
+                let platform = self.target.get_platform_tag(manylinux, universal2);
                 // pypy uses its version as part of the ABI, e.g.
-                // pypy3 v7.1 => pp371-pypy3_71-linux_x86_64.whl
+                // pypy 3.7 7.3 => numpy-1.20.1-pp37-pypy37_pp73-manylinux2010_x86_64.whl
                 format!(
-                    "pp3{abi_tag}-pypy3_{abi_tag}-{platform}",
+                    "pp{major}{minor}-pypy{major}{minor}_{abi_tag}-{platform}",
+                    major = self.major,
+                    minor = self.minor,
                     // TODO: Proper tag handling for pypy
                     abi_tag = self
                         .abi_tag

diff --git a/sysconfig/pypy-linux-3.7-7.3.txt b/sysconfig/pypy-linux-3.7-7.3.txt
@@ -0,0 +1,55 @@
+Platform: "linux-x86_64"
+Python version: "3.7"
+Current installation scheme: "pypy"
+
+Paths: 
+	data = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3"
+	include = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3/include"
+	platinclude = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3/include"
+	platlib = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3/site-packages"
+	platstdlib = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3/lib-pypy"
+	purelib = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3/site-packages"
+	scripts = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3/bin"
+	stdlib = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3/lib-pypy"
+
+Variables: 
+	AR = "ar"
+	ARFLAGS = "rc"
+	CC = "gcc -pthread"
+	CCSHARED = "-fPIC"
+	CFLAGS = "-DNDEBUG -O2"
+	CXX = "g++ -pthread"
+	EXE = ""
+	EXT_SUFFIX = ".pypy37-pp73-x86_64-linux-gnu.so"
+	GNULD = "yes"
+	INCLUDEPY = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3/include"
+	LDSHARED = "gcc -pthread -shared"
+	LIBDIR = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3/bin"
+	LIBRARY = ""
+	OPT = "-DNDEBUG -O2"
+	SHLIB_SUFFIX = ".so"
+	SO = ".pypy37-pp73-x86_64-linux-gnu.so"
+	SOABI = "pypy37-pp73"
+	abiflags = ""
+	base = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3"
+	exec_prefix = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3"
+	implementation = "PyPy"
+	implementation_lower = "pypy"
+	installed_base = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3"
+	installed_platbase = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3"
+	platbase = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3"
+	prefix = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3"
+	projectbase = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3/bin"
+	py_version = "3.7.9"
+	py_version_nodot = "37"
+	py_version_short = "3.7"
+	srcdir = "/home/konsti/.pyenv/versions/pypy3.7-7.3.3/lib-pypy/config-3.7"
+	userbase = "/home/konsti/.local"
+User: 
+	data = "/home/konsti/.local"
+	include = "/home/konsti/.local/include/pypy3.7"
+	platlib = "/home/konsti/.local/lib/pypy3.7/site-packages"
+	platstdlib = "/home/konsti/.local/lib/pypy3.7"
+	purelib = "/home/konsti/.local/lib/pypy3.7/site-packages"
+	scripts = "/home/konsti/.local/bin"
+	stdlib = "/home/konsti/.local/lib/pypy3.7"