Update to PyO3 0.14 and bump versions.

Author: m-ou-se

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "inline-python"
-version = "0.6.0"
+version = "0.7.0"
 authors = [
 	"Mara Bos <[email protected]>",
 	"Maarten de Vries <[email protected]>",
@@ -13,8 +13,8 @@ keywords = ["python", "inline", "embed", "macro"]
 autoexamples = false
 
 [dependencies]
-inline-python-macros = { version = "0.5.0", path = "./macros" }
-pyo3 = { version = "0.11.0", default-features = false }
+inline-python-macros = { version = "=0.7.0", path = "./macros" }
+pyo3 = { version = "0.14.0", default-features = false, features = ["auto-initialize"] }
 
 [workspace]
 members = ["examples", "ct-python"]

ct-python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ct-python"
-version = "0.5.1"
+version = "0.5.2"
 authors = ["Mara Bos <[email protected]>"]
 description = "Execute Python code at compile time to generate Rust code"
 license = "BSD-2-Clause"
@@ -9,4 +9,4 @@ repository = "https://github.com/fusion-engineering/inline-python/tree/master/ct
 keywords = ["python", "macro", "generate", "compile-time"]
 
 [dependencies]
-inline-python-macros = { version = "0.5.1", path = "../macros" }
+inline-python-macros = { version = "=0.7.0", path = "../macros" }

examples/Cargo.toml

@@ -17,4 +17,4 @@ path = "rust-fn.rs"
 
 [dependencies]
 inline-python = { path = ".." }
-pyo3 = "0.11.0"
+pyo3 = "0.14.0"

macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "inline-python-macros"
-version = "0.5.3"
+version = "0.7.0"
 authors = [
 	"Mara Bos <[email protected]>",
 	"Maarten de Vries <[email protected]>",
@@ -16,7 +16,7 @@ proc_macro = true
 [dependencies]
 proc-macro2 = { version = "1.0", features = ["span-locations"] }
 quote = "1.0"
-pyo3 = { version = "0.11.0", default-features = false }
+pyo3 = { version = "0.14.0", default-features = false, features = ["auto-initialize"] }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.71"

macros/src/error.rs

@@ -1,19 +1,19 @@
 use proc_macro::Span;
 use proc_macro2::TokenStream;
 use pyo3::type_object::PyTypeObject;
-use pyo3::{AsPyRef, PyAny, PyErr, PyResult, Python, ToPyObject};
+use pyo3::{PyAny, PyErr, PyResult, Python, ToPyObject};
 use quote::{quote, quote_spanned};
 
 /// Format a nice error message for a python compilation error.
 pub fn compile_error_msg(py: Python, error: PyErr, tokens: TokenStream) -> TokenStream {
 	let value = error.to_object(py);
 
 	if value.is_none(py) {
-		let error = format!("python: {}", error.ptype.as_ref(py).name());
+		let error = format!("python: {}", error.ptype(py).name().unwrap());
 		return quote!(compile_error! {#error});
 	}
 
-	if error.matches(py, pyo3::exceptions::SyntaxError::type_object(py)) {
+	if error.matches(py, pyo3::exceptions::PySyntaxError::type_object(py)) {
 		let line: Option<usize> = value.getattr(py, "lineno").ok().and_then(|x| x.extract(py).ok());
 		let msg: Option<String> = value.getattr(py, "msg").ok().and_then(|x| x.extract(py).ok());
 		if let (Some(line), Some(msg)) = (line, msg) {
@@ -24,8 +24,8 @@ pub fn compile_error_msg(py: Python, error: PyErr, tokens: TokenStream) -> Token
 		}
 	}
 
-	if let Some(tb) = &error.ptraceback {
-		if let Ok((file, line)) = get_traceback_info(tb.as_ref(py)) {
+	if let Some(tb) = &error.ptraceback(py) {
+		if let Ok((file, line)) = get_traceback_info(tb) {
 			if file == Span::call_site().source_file().path().to_string_lossy() {
 				if let Ok(msg) = value.as_ref(py).str() {
 					if let Some(span) = span_for_line(tokens, line) {

macros/src/run.rs

@@ -15,8 +15,8 @@ fn ensure_libpython_symbols_loaded(py: Python) -> PyResult<()> {
 	// time with RTLD_GLOBAL enabled.
 
 	let sysconfig = py.import("sysconfig")?;
-	let libdir: String = sysconfig.call1("get_config_var", ("LIBDIR",))?.extract()?;
-	let so_name: String = sysconfig.call1("get_config_var", ("INSTSONAME",))?.extract()?;
+	let libdir: String = sysconfig.getattr("get_config_var")?.call1(("LIBDIR",))?.extract()?;
+	let so_name: String = sysconfig.getattr("get_config_var")?.call1(("INSTSONAME",))?.extract()?;
 	let path = std::ffi::CString::new(format!("{}/{}", libdir, so_name)).unwrap();
 	unsafe {
 		libc::dlopen(path.as_ptr(), libc::RTLD_NOW | libc::RTLD_GLOBAL);
@@ -33,7 +33,7 @@ fn run_and_capture(py: Python, code: PyObject) -> PyResult<String> {
 	let sys = py.import("sys")?;
 	let io = py.import("io")?;
 
-	let stdout = io.call0("StringIO")?;
+	let stdout = io.getattr("StringIO")?.call0()?;
 	let original_stdout = sys.dict().get_item("stdout");
 	sys.dict().set_item("stdout", stdout)?;
 

src/context.rs

@@ -1,6 +1,9 @@
 use crate::run::run_python_code;
 use crate::PythonBlock;
-use pyo3::{types::PyDict, AsPyRef, FromPyObject, Py, PyObject, PyResult, Python, ToPyObject};
+use pyo3::{
+	types::{PyCFunction, PyDict},
+	FromPyObject, Py, PyResult, Python, ToPyObject,
+};
 
 /// An execution context for Python code.
 ///
@@ -151,17 +154,17 @@ impl Context {
 	///
 	/// This function temporarily acquires the GIL.
 	/// If you already have the GIL, you can use [`Context::add_wrapped_with_gil`] instead.
-	pub fn add_wrapped(&self, wrapper: &impl Fn(Python) -> PyObject) {
+	pub fn add_wrapped(&self, wrapper: &impl Fn(Python) -> PyResult<&PyCFunction>) {
 		self.add_wrapped_with_gil(Python::acquire_gil().python(), wrapper);
 	}
 
 	/// Add a wrapped #[pyfunction] or #[pymodule] using its own `__name__`.
 	///
 	/// See [Context::add_wrapped].
-	pub fn add_wrapped_with_gil<'p>(&self, py: Python<'p>, wrapper: &impl Fn(Python) -> PyObject) {
-		let obj = wrapper(py);
-		let name = obj.getattr(py, "__name__").expect("Missing __name__");
-		self.set_with_gil(py, name.extract(py).unwrap(), obj)
+	pub fn add_wrapped_with_gil<'p>(&self, py: Python<'p>, wrapper: &impl Fn(Python) -> PyResult<&PyCFunction>) {
+		let obj = wrapper(py).unwrap();
+		let name = obj.getattr("__name__").expect("Missing __name__");
+		self.set_with_gil(py, name.extract().unwrap(), obj)
 	}
 
 	/// Run Python code using this context.