Merge pull request #883 from messense/fix-882

Fix PyPy pep517 build when abi3 feature is enabled

.github/workflows/test.yml

@@ -95,6 +95,8 @@ jobs:
           pypy3 -m pip install --force-reinstall --no-index --find-links test-crates/pyo3-pure/target/wheels pyo3-pure
           pypy3 -m pip install pytest
           pypy3 -m pytest test-crates/pyo3-pure/test_pyo3_pure.py
+
+          cargo run -- pep517 build-wheel -i pypy3 -m test-crates/pyo3-pure/Cargo.toml --cargo-extra-args="-vv"
       - uses: actions/setup-python@v2
         with:
           python-version: "3.10.0"

src/build_context.rs

@@ -211,7 +211,9 @@ impl BuildContext {
                     .cloned()
                     .collect();
                 let mut built_wheels = Vec::new();
-                built_wheels.extend(self.build_binding_wheel_abi3(&cpythons, *major, *minor)?);
+                if !cpythons.is_empty() {
+                    built_wheels.extend(self.build_binding_wheel_abi3(&cpythons, *major, *minor)?);
+                }
                 if !pypys.is_empty() {
                     println!(
                         "⚠️ Warning: PyPy does not yet support abi3 so the build artifacts will be version-specific. \

src/build_options.rs

@@ -766,7 +766,20 @@ pub fn find_interpreter(
                     Ok(interpreter)
                 } else if generate_abi3_import_lib {
                     println!("🐍 Not using a specific python interpreter (Automatically generating windows import library)");
-                    Ok(Vec::new())
+                    // fake a python interpreter
+                    Ok(vec![PythonInterpreter {
+                        major: *major as usize,
+                        minor: *minor as usize,
+                        abiflags: "".to_string(),
+                        target: target.clone(),
+                        executable: PathBuf::new(),
+                        ext_suffix: ".pyd".to_string(),
+                        interpreter_kind: InterpreterKind::CPython,
+                        abi_tag: None,
+                        libs_dir: PathBuf::new(),
+                        platform: None,
+                        runnable: false,
+                    }])
                 } else {
                     bail!("Failed to find a python interpreter");
                 }

src/main.rs

@@ -329,7 +329,8 @@ fn run() -> Result<()> {
             if !no_sdist {
                 build_context.build_source_distribution()?;
             }
-            build_context.build_wheels()?;
+            let wheels = build_context.build_wheels()?;
+            assert!(!wheels.is_empty());
         }
         #[cfg(feature = "upload")]
         Opt::Publish {