fixup! move ffi module to separate crate

PyO3 · Jan 26, 2022 · 39dbfdb · 39dbfdb
1 parent 49e2a4b
commit 39dbfdb
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 35 deletions.
diff --git a/build.rs b/build.rs
@@ -1,6 +1,36 @@
 use std::{env, process::Command};
 
-use pyo3_build_config::pyo3_build_script_impl::{errors::Result, resolve_interpreter_config};
+use pyo3_build_config::pyo3_build_script_impl::{cargo_env_var, errors::Result};
+use pyo3_build_config::{bail, InterpreterConfig};
+
+fn ensure_auto_initialize_ok(interpreter_config: &InterpreterConfig) -> Result<()> {
+    if cargo_env_var("CARGO_FEATURE_AUTO_INITIALIZE").is_some() {
+        if !interpreter_config.shared {
+            bail!(
+                "The `auto-initialize` feature is enabled, but your python installation only supports \
+                embedding the Python interpreter statically. If you are attempting to run tests, or a \
+                binary which is okay to link dynamically, install a Python distribution which ships \
+                with the Python shared library.\n\
+                \n\
+                Embedding the Python interpreter statically does not yet have first-class support in \
+                PyO3. If you are sure you intend to do this, disable the `auto-initialize` feature.\n\
+                \n\
+                For more information, see \
+                https://pyo3.rs/v{pyo3_version}/\
+                    building_and_distribution.html#embedding-python-in-rust",
+                pyo3_version = env::var("CARGO_PKG_VERSION").unwrap()
+            );
+        }
+
+        // TODO: PYO3_CI env is a hack to workaround CI with PyPy, where the `dev-dependencies`
+        // currently cause `auto-initialize` to be enabled in CI.
+        // Once MSRV is 1.51 or higher, use cargo's `resolver = "2"` instead.
+        if interpreter_config.implementation.is_pypy() && env::var_os("PYO3_CI").is_none() {
+            bail!("the `auto-initialize` feature is not supported with PyPy");
+        }
+    }
+    Ok(())
+}
 
 fn rustc_minor_version() -> Option<u32> {
     let rustc = env::var_os("RUSTC")?;
@@ -21,11 +51,12 @@ fn rustc_minor_version() -> Option<u32> {
 /// Emits the cargo configuration based on this config as well as a few checks of the Rust compiler
 /// version to enable features which aren't supported on MSRV.
 fn configure_pyo3() -> Result<()> {
-    let interpreter_config = resolve_interpreter_config()?;
+    let interpreter_config = pyo3_build_config::get();
 
     interpreter_config.emit_pyo3_cfgs();
 
     let rustc_minor_version = rustc_minor_version().unwrap_or(0);
+    ensure_auto_initialize_ok(interpreter_config)?;
 
     // Enable use of const generics on Rust 1.51 and greater
     if rustc_minor_version >= 51 {

diff --git a/pyo3-ffi/build.rs b/pyo3-ffi/build.rs
@@ -1,5 +1,3 @@
-use std::env;
-
 use pyo3_build_config::{
     bail, ensure,
     pyo3_build_script_impl::{
@@ -9,7 +7,7 @@ use pyo3_build_config::{
 };
 
 /// Minimum Python version PyO3 supports.
-const MINIMUM_SUPPORTED_VERSION: PythonVersion = PythonVersion { major: 3, minor: 6 };
+const MINIMUM_SUPPORTED_VERSION: PythonVersion = PythonVersion { major: 3, minor: 7 };
 
 fn ensure_python_version(interpreter_config: &InterpreterConfig) -> Result<()> {
     ensure!(
@@ -44,35 +42,6 @@ fn ensure_target_pointer_width(interpreter_config: &InterpreterConfig) -> Result
     Ok(())
 }
 
-fn ensure_auto_initialize_ok(interpreter_config: &InterpreterConfig) -> Result<()> {
-    if cargo_env_var("CARGO_FEATURE_AUTO_INITIALIZE").is_some() {
-        if !interpreter_config.shared {
-            bail!(
-                "The `auto-initialize` feature is enabled, but your python installation only supports \
-                embedding the Python interpreter statically. If you are attempting to run tests, or a \
-                binary which is okay to link dynamically, install a Python distribution which ships \
-                with the Python shared library.\n\
-                \n\
-                Embedding the Python interpreter statically does not yet have first-class support in \
-                PyO3. If you are sure you intend to do this, disable the `auto-initialize` feature.\n\
-                \n\
-                For more information, see \
-                https://pyo3.rs/v{pyo3_version}/\
-                    building_and_distribution.html#embedding-python-in-rust",
-                pyo3_version = env::var("CARGO_PKG_VERSION").unwrap()
-            );
-        }
-
-        // TODO: PYO3_CI env is a hack to workaround CI with PyPy, where the `dev-dependencies`
-        // currently cause `auto-initialize` to be enabled in CI.
-        // Once MSRV is 1.51 or higher, use cargo's `resolver = "2"` instead.
-        if interpreter_config.implementation.is_pypy() && env::var_os("PYO3_CI").is_none() {
-            bail!("the `auto-initialize` feature is not supported with PyPy");
-        }
-    }
-    Ok(())
-}
-
 fn emit_link_config(interpreter_config: &InterpreterConfig) -> Result<()> {
     let target_os = cargo_env_var("CARGO_CFG_TARGET_OS").unwrap();
     let is_extension_module = cargo_env_var("CARGO_FEATURE_EXTENSION_MODULE").is_some();
@@ -119,7 +88,6 @@ fn configure_pyo3() -> Result<()> {
 
     ensure_python_version(&interpreter_config)?;
     ensure_target_pointer_width(&interpreter_config)?;
-    ensure_auto_initialize_ok(&interpreter_config)?;
 
     if !interpreter_config.suppress_build_script_link_lines {
         emit_link_config(&interpreter_config)?;