update: update default pyo3 version from 0.18.3 to 0.21.2

Author: mityax

README.md

@@ -1,7 +1,7 @@
 # rustimport - Import Rust directly from Python! 
 
 <p align=center>
-    <a target="_blank" href="https://www.python.org/downloads/" title="Python version"><img src="https://img.shields.io/badge/python-%3E=_3.6-green.svg"></a>
+    <a target="_blank" href="https://www.python.org/downloads/" title="Python version"><img src="https://img.shields.io/badge/python-%3E=_3.8-green.svg"></a>
     <a target="_blank" href="https://pypi.org/project/rustimport/" title="PyPI version"><img src="https://img.shields.io/pypi/v/rustimport?logo=pypi"></a>
     <a target="_blank" href="LICENSE" title="License: MIT"><img src="https://img.shields.io/badge/License-MIT-blue.svg"></a></a>
 </p>
@@ -93,7 +93,7 @@ features = [ "extension-module",]
 3. It generated a code block exporting your method and appended it to the end of your file:
 ```rust
 #[pymodule]
-fn somecode(_py: Python, m: &PyModule) -> PyResult<()> {
+fn somecode(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
   m.add_function(wrap_pyfunction!(square, m)?)?;
   Ok(())
 }

examples/singlefile.rs

@@ -25,7 +25,7 @@
 //: # "cdylib" is necessary to produce a shared library for Python to import from.
 //:
 //: [dependencies]
-//: pyo3 = { version = "0.16.2", features = ["extension-module"] }
+//: pyo3 = { version = "0.21.2", features = ["extension-module"] }
 
 use pyo3::prelude::*;
 
@@ -40,7 +40,7 @@ fn sum_as_string(a: usize, b: usize) -> String {
 // The name of this function must match the `lib.name` setting in the cargo manifest,
 // else Python will not be able to import the module.
 #[pymodule]
-fn singlefile(_py: Python, m: &PyModule) -> PyResult<()> {
+fn singlefile(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(sum_as_string, m)?)?;
     Ok(())
 }

examples/singlefile_manifest_only_templating.rs

@@ -18,7 +18,7 @@ fn try_divide(a: usize, b: usize) -> PyResult<usize> {
 
 /// A Python module implemented in Rust.
 #[pymodule]
-fn singlefile_manifest_only_templating(_py: Python, m: &PyModule) -> PyResult<()> {
+fn singlefile_manifest_only_templating(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(try_divide, m)?)?;
     Ok(())
 }

examples/string_sum/Cargo.toml

@@ -16,4 +16,4 @@ name = "string_sum"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.16.2", features = ["extension-module"] }
+pyo3 = { version = "0.21.2", features = ["extension-module"] }

examples/string_sum/src/lib.rs

@@ -10,7 +10,7 @@ fn sum_as_string(a: usize, b: usize) -> PyResult<String> {
 /// the `lib.name` setting in the `Cargo.toml`, else Python will not be able to
 /// import the module.
 #[pymodule]
-fn string_sum(_py: Python, m: &PyModule) -> PyResult<()> {
+fn string_sum(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(sum_as_string, m)?)?;
     Ok(())
 }

examples/test_crate/Cargo.toml

@@ -25,4 +25,4 @@ name = "test_crate"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.16.2", features = ["extension-module"] }
+pyo3 = { version = "0.21.2", features = ["extension-module"] }

examples/test_crate/src/lib.rs

@@ -12,7 +12,7 @@ fn say_hello() -> String {
 // #[pyfunction] and all structs annotated with #[pyclass].
 //
 //#[pymodule]
-//fn test_crate(_py: Python, m: &PyModule) -> PyResult<()> {
+//fn test_crate(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
 //    m.add_function(wrap_pyfunction!(say_hello, m)?)?;
 //    Ok(())
 //}

examples/test_workspace/crate_c/Cargo.toml

@@ -25,5 +25,5 @@ name = "crate_c"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.18.3", features = ["extension-module"] }
+pyo3 = { version = "0.21.2", features = ["extension-module"] }
 crate_b = { path = "../crate_b" }

rustimport/__main__.py

@@ -6,6 +6,7 @@
 from typing import List
 
 from rustimport import build_all, build_filepath, settings
+from rustimport.pre_processing import PyO3Template
 
 rust_lib_template = """// rustimport:pyo3
 
@@ -21,7 +22,7 @@
 // #[pyfunction] and all structs annotated with #[pyclass].
 //
 //#[pymodule]
-//fn {{EXTENSION_NAME}}(_py: Python, m: &PyModule) -> PyResult<()> {
+//fn {{EXTENSION_NAME}}(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
 //    m.add_function(wrap_pyfunction!(say_hello, m)?)?;
 //    Ok(())
 //}
@@ -54,7 +55,7 @@
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.18.3", features = ["extension-module"] }
+pyo3 = { version = "{{PYO3_VERSION}}", features = ["extension-module"] }
 """
 
 
@@ -75,7 +76,9 @@ def create_extension(name: str, cwd: str = '.'):
         with open(os.path.join(src_dir, 'lib.rs'), 'w+') as f:
             f.write(rust_lib_template.replace('{{EXTENSION_NAME}}', name))
         with open(os.path.join(path, 'Cargo.toml'), 'w+') as f:
-            f.write(cargo_toml_template.replace('{{EXTENSION_NAME}}', name))
+            f.write(cargo_toml_template
+                    .replace('{{EXTENSION_NAME}}', name)
+                    .replace('{{PYO3_VERSION}}', PyO3Template.PYO3_VERSION))
         with open(os.path.join(path, '.rustimport'), 'w+') as f:
             f.write("This is a marker-file to make this crate importable by rustimport.")
 

rustimport/pre_processing/pyo3_template.py

@@ -6,6 +6,8 @@
 
 
 class PyO3Template(Template):
+    PYO3_VERSION = "0.21.2"
+
     def process(self) -> Template.TemplatingResult:
         return Template.TemplatingResult(
             cargo_manifest=self.__generate_manifest(),
@@ -25,7 +27,7 @@ def __generate_manifest(self) -> bytes:
                 'crate-type': ['cdylib'],
             },
             'dependencies': {
-                'pyo3': {'version': '0.18.3', 'features': ['extension-module']}
+                'pyo3': {'version': PyO3Template.PYO3_VERSION, 'features': ['extension-module']}
             }
         })
 
@@ -43,7 +45,7 @@ def __generate_pymodule(self) -> bytes:
 
         res = [
             b'#[pymodule]',
-            b'fn ' + self.lib_name.encode() + b'(_py: Python, m: &PyModule) -> PyResult<()> {',
+            b'fn ' + self.lib_name.encode() + b"(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {",
             *[
                 b'  m.add_function(wrap_pyfunction!(' + func.group(1) + b', m)?)?;'
                 for func in functions