from wasmer import Memory, MemoryType, Store
store = Store()
-memory = Memory(store, MemoryType(128, shared=False))
+memory = Memory(store, MemoryType(minimum=128))
# Let's write data with a `Int8Array` view for example.
int8 = memory.int8_view()
@@ -579,7 +579,7 @@ Example
"""
)
-memory = Memory(store, MemoryType(1, shared=False))
+memory = Memory(store, MemoryType(minimum=1))
view = memory.uint8_view(offset=0)
import_object = ImportObject()
@@ -668,7 +668,7 @@ Example
"env",
{
"sum": Function(store, sum),
- "memory": Memory(store, MemoryType(1, shared=False))
+ "memory": Memory(store, MemoryType(minimum=1))
}
)
from wasmer import Store, Memory, MemoryType
store = Store()
-memory_type = MemoryType(3, shared=False)
+memory_type = MemoryType(minimum=3)
memory = Memory(store, memory_type)
assert memory.size == 3
@@ -989,7 +989,7 @@ Example
from wasmer import Store, Memory, MemoryType, Buffer
store = Store()
-memory_type = MemoryType(3, shared=False)
+memory_type = MemoryType(minimum=3)
memory = Memory(store, memory_type)
assert isinstance(memory.buffer, Buffer)
@@ -1002,7 +1002,7 @@ Example
from wasmer import Store, Memory, MemoryType
store = Store()
-memory_type = MemoryType(3, shared=False)
+memory_type = MemoryType(minimum=3)
memory = Memory(store, memory_type)
assert memory.data_size == 196608
@@ -1015,7 +1015,7 @@ Example
from wasmer import Store, Memory, MemoryType
store = Store()
-memory_type = MemoryType(3, shared=False)
+memory_type = MemoryType(minimum=3)
memory = Memory(store, memory_type)
assert memory.size == 3
@@ -1049,7 +1049,7 @@ Example
from wasmer import Store, Memory, MemoryType
store = Store()
-memory_type = MemoryType(3, shared=False)
+memory_type = MemoryType(minimum=3)
memory = Memory(store, memory_type)
assert memory.size == 3
@@ -1110,7 +1110,7 @@ Examples
from wasmer import Store, Memory, MemoryType, Uint8Array
store = Store()
-memory_type = MemoryType(3, shared=False)
+memory_type = MemoryType(minimum=3)
memory = Memory(store, memory_type)
assert isinstance(memory.uint8_view(offset=42), Uint8Array)
@@ -1120,7 +1120,7 @@ Examples
class MemoryType
-(minimum, maximum, shared)
+(minimum, /, maximum, shared)
A descriptor for a WebAssembly memory type.
diff --git a/packages/README.md b/packages/README.md
index 17084786..6721585f 100644
--- a/packages/README.md
+++ b/packages/README.md
@@ -5,9 +5,9 @@ Wasmer provides several Python packages. We recommend to read the
Succinctly, here is a short description of this directory:
-* `any/` contains a fallback to make `wasmer` always installable on
- all platforms, but it could raise an `ImportError` if the current
- platform isn't supported,
+* `any*/` contain fallbacks to make `wasmer` and sibling packages
+ always installable on all platforms, but it could raise an
+ `ImportError` if the current platform isn't supported,
* `api/` contains the `wasmer` package,
diff --git a/packages/api/Cargo.toml b/packages/api/Cargo.toml
index 6df2de8c..08bd1819 100644
--- a/packages/api/Cargo.toml
+++ b/packages/api/Cargo.toml
@@ -17,14 +17,17 @@ crate-type = ["cdylib"]
[dependencies]
wasmer = { version = "2.0", default-features = false, features = ["wat", "universal", "dylib", "compiler"] }
-wasmer_engines = { path = "../engines/" }
+wasmer-engines = { path = "../engines/" }
wasmer-types = "2.0"
wasmer-wasi = "2.0"
-pyo3 = { version = "0.13", features = ["extension-module"] }
+pyo3 = { version = "0.14", features = ["extension-module", "auto-initialize"] }
wat = "1.0"
wasmprinter = "0.2"
cfg-if = "1.0"
+[build-dependencies]
+pyo3-build-config = "0.14"
+
[package.metadata.maturin]
classifier = [
"Programming Language :: Python",
diff --git a/packages/api/build.rs b/packages/api/build.rs
index 219cea18..1a8ec5aa 100644
--- a/packages/api/build.rs
+++ b/packages/api/build.rs
@@ -3,4 +3,5 @@ fn main() {
"cargo:rustc-env=WASMER_VERSION={}",
env!("CARGO_PKG_VERSION")
);
+ pyo3_build_config::add_extension_module_link_args();
}
diff --git a/packages/api/src/engines.rs b/packages/api/src/engines.rs
index 371e53fe..2e033e10 100644
--- a/packages/api/src/engines.rs
+++ b/packages/api/src/engines.rs
@@ -1,3 +1,3 @@
-pub use wasmer_engines::{Dylib, Universal};
+pub use crate::wasmer_inner::wasmer_engines::{Dylib, Universal};
// Deprecated engines.
-pub use wasmer_engines::{Native, JIT};
+pub use crate::wasmer_inner::wasmer_engines::{Native, JIT};
diff --git a/packages/api/src/externals/function.rs b/packages/api/src/externals/function.rs
index 55e2fc51..1c6b65c6 100644
--- a/packages/api/src/externals/function.rs
+++ b/packages/api/src/externals/function.rs
@@ -91,7 +91,7 @@ use std::{io, sync::Arc};
/// function = Function(store, sum, FunctionType([Type.I32, Type.I32], [Type.I32]))
/// ```
#[pyclass(unsendable)]
-#[text_signature = "(store, function, function_type)"]
+#[pyo3(text_signature = "(store, function, function_type)")]
pub struct Function {
inner: wasmer::Function,
}
diff --git a/packages/api/src/externals/global.rs b/packages/api/src/externals/global.rs
index 7c6ee61c..9c4a9c4d 100644
--- a/packages/api/src/externals/global.rs
+++ b/packages/api/src/externals/global.rs
@@ -39,7 +39,7 @@ use pyo3::{
/// assert global_.mutable == True
/// ```
#[pyclass(unsendable)]
-#[text_signature = "(store, value, mutable)"]
+#[pyo3(text_signature = "(store, value, mutable)")]
pub struct Global {
inner: wasmer::Global,
}
diff --git a/packages/api/src/externals/memory.rs b/packages/api/src/externals/memory.rs
index 5414d637..3b353bff 100644
--- a/packages/api/src/externals/memory.rs
+++ b/packages/api/src/externals/memory.rs
@@ -31,7 +31,7 @@ use pyo3::{exceptions::PyRuntimeError, prelude::*};
/// from wasmer import Store, Memory, MemoryType
///
/// store = Store()
-/// memory_type = MemoryType(3, shared=False)
+/// memory_type = MemoryType(minimum=3)
/// memory = Memory(store, memory_type)
///
/// assert memory.size == 3
@@ -50,7 +50,7 @@ use pyo3::{exceptions::PyRuntimeError, prelude::*};
/// assert isinstance(memory, Memory)
/// ```
#[pyclass(unsendable)]
-#[text_signature = "(store, memory_type)"]
+#[pyo3(text_signature = "(store, memory_type)")]
pub struct Memory {
inner: wasmer::Memory,
}
@@ -83,7 +83,7 @@ impl Memory {
/// from wasmer import Store, Memory, MemoryType
///
/// store = Store()
- /// memory_type = MemoryType(3, shared=False)
+ /// memory_type = MemoryType(minimum=3)
/// memory = Memory(store, memory_type)
///
/// assert memory.size == 3
@@ -101,7 +101,7 @@ impl Memory {
/// from wasmer import Store, Memory, MemoryType
///
/// store = Store()
- /// memory_type = MemoryType(3, shared=False)
+ /// memory_type = MemoryType(minimum=3)
/// memory = Memory(store, memory_type)
///
/// assert memory.data_size == 196608
@@ -119,7 +119,7 @@ impl Memory {
/// from wasmer import Store, Memory, MemoryType
///
/// store = Store()
- /// memory_type = MemoryType(3, shared=False)
+ /// memory_type = MemoryType(minimum=3)
/// memory = Memory(store, memory_type)
///
/// assert memory.size == 3
@@ -128,7 +128,7 @@ impl Memory {
///
/// assert memory.size == 5
/// ```
- #[text_signature = "($self, number_of_pages)"]
+ #[pyo3(text_signature = "($self, number_of_pages)")]
fn grow(&self, number_of_pages: u32) -> PyResult {
self.inner
.grow(number_of_pages)
@@ -145,7 +145,7 @@ impl Memory {
/// from wasmer import Store, Memory, MemoryType, Buffer
///
/// store = Store()
- /// memory_type = MemoryType(3, shared=False)
+ /// memory_type = MemoryType(minimum=3)
/// memory = Memory(store, memory_type)
///
/// assert isinstance(memory.buffer, Buffer)
@@ -165,12 +165,12 @@ impl Memory {
/// from wasmer import Store, Memory, MemoryType, Uint8Array
///
/// store = Store()
- /// memory_type = MemoryType(3, shared=False)
+ /// memory_type = MemoryType(minimum=3)
/// memory = Memory(store, memory_type)
///
/// assert isinstance(memory.uint8_view(offset=42), Uint8Array)
/// ```
- #[text_signature = "($self, /, offset=0)"]
+ #[pyo3(text_signature = "($self, /, offset=0)")]
#[args(offset = 0)]
fn uint8_view(&self, offset: usize) -> Uint8Array {
Uint8Array {
@@ -182,7 +182,7 @@ impl Memory {
/// Creates a read-and-write over the memory data where elements
/// are of kind `int8`. See the `Int8Array` view to learn more,
/// and the `Memory.uint8_view` method to see an example.
- #[text_signature = "($self, /, offset=0)"]
+ #[pyo3(text_signature = "($self, /, offset=0)")]
#[args(offset = 0)]
fn int8_view(&self, offset: usize) -> Int8Array {
Int8Array {
@@ -194,7 +194,7 @@ impl Memory {
/// Creates a read-and-write over the memory data where elements
/// are of kind `uint16`. See the `Uint16Array` view to learn
/// more, and the `Memory.uint8_view` method to see an example.
- #[text_signature = "($self, /, offset=0)"]
+ #[pyo3(text_signature = "($self, /, offset=0)")]
#[args(offset = 0)]
fn uint16_view(&self, offset: usize) -> Uint16Array {
Uint16Array {
@@ -206,7 +206,7 @@ impl Memory {
/// Creates a read-and-write over the memory data where elements
/// are of kind `int16`. See the `Int16Array` view to learn more,
/// and the `Memory.uint8_view` method to see an example.
- #[text_signature = "($self, /, offset=0)"]
+ #[pyo3(text_signature = "($self, /, offset=0)")]
#[args(offset = 0)]
fn int16_view(&self, offset: usize) -> Int16Array {
Int16Array {
@@ -218,7 +218,7 @@ impl Memory {
/// Creates a read-and-write over the memory data where elements
/// are of kind `uint32`. See the `Uint32Array` view to learn
/// more, and the `Memory.uint8_view` method to see an example.
- #[text_signature = "($self, /, offset=0)"]
+ #[pyo3(text_signature = "($self, /, offset=0)")]
#[args(offset = 0)]
fn uint32_view(&self, offset: usize) -> Uint32Array {
Uint32Array {
@@ -230,7 +230,7 @@ impl Memory {
/// Creates a read-and-write over the memory data where elements
/// are of kind `int32`. See the `Int32Array` view to learn more,
/// and the `Memory.uint8_view` method to see an example.
- #[text_signature = "($self, /, offset=0)"]
+ #[pyo3(text_signature = "($self, /, offset=0)")]
#[args(offset = 0)]
fn int32_view(&self, offset: usize) -> Int32Array {
Int32Array {
diff --git a/packages/api/src/externals/table.rs b/packages/api/src/externals/table.rs
index 5b92ae40..496bab9b 100644
--- a/packages/api/src/externals/table.rs
+++ b/packages/api/src/externals/table.rs
@@ -13,7 +13,7 @@ use pyo3::{exceptions::PyRuntimeError, prelude::*};
///
/// Specification: https://webassembly.github.io/spec/core/exec/runtime.html#table-instances
#[pyclass(unsendable)]
-#[text_signature = "(store, table_type, initial_value)"]
+#[pyo3(text_signature = "(store, table_type, initial_value)")]
pub struct Table {
inner: wasmer::Table,
}
diff --git a/packages/api/src/import_object.rs b/packages/api/src/import_object.rs
index f23d25b0..2f74f1b8 100644
--- a/packages/api/src/import_object.rs
+++ b/packages/api/src/import_object.rs
@@ -70,7 +70,7 @@ use pyo3::{
/// """
/// )
///
-/// memory = Memory(store, MemoryType(1, shared=False))
+/// memory = Memory(store, MemoryType(minimum=1))
/// view = memory.uint8_view(offset=0)
///
/// import_object = ImportObject()
@@ -130,7 +130,7 @@ use pyo3::{
///
/// etc.
#[pyclass(unsendable)]
-#[text_signature = "()"]
+#[pyo3(text_signature = "()")]
pub struct ImportObject {
inner: wasmer::ImportObject,
}
@@ -163,7 +163,7 @@ impl ImportObject {
///
/// assert import_object.contains_namespace("foo") == False
/// ```
- #[text_signature = "($self, namespace_name)"]
+ #[pyo3(text_signature = "($self, namespace_name)")]
fn contains_namespace(&self, namespace_name: &str) -> bool {
self.inner.contains_namespace(namespace_name)
}
@@ -186,11 +186,11 @@ impl ImportObject {
/// "env",
/// {
/// "sum": Function(store, sum),
- /// "memory": Memory(store, MemoryType(1, shared=False))
+ /// "memory": Memory(store, MemoryType(minimum=1))
/// }
/// )
/// ```
- #[text_signature = "($self, namespace_name, namespace)"]
+ #[pyo3(text_signature = "($self, namespace_name, namespace)")]
fn register(&mut self, namespace_name: &str, namespace: &PyDict) -> PyResult<()> {
let mut wasmer_namespace = wasmer::Exports::new();
diff --git a/packages/api/src/instance.rs b/packages/api/src/instance.rs
index 0282b469..fd363916 100644
--- a/packages/api/src/instance.rs
+++ b/packages/api/src/instance.rs
@@ -83,7 +83,7 @@ use pyo3::{exceptions::PyRuntimeError, prelude::*};
/// assert instance.exports.add_one(41) == 42
/// ```
#[pyclass(unsendable)]
-#[text_signature = "(module, import_object)"]
+#[pyo3(text_signature = "(module, import_object)")]
pub struct Instance {
#[allow(unused)]
inner: wasmer::Instance,
diff --git a/packages/api/src/lib.rs b/packages/api/src/lib.rs
index 21e1e477..65db9104 100644
--- a/packages/api/src/lib.rs
+++ b/packages/api/src/lib.rs
@@ -99,8 +99,8 @@ fn wasmer(py: Python, module: &PyModule) -> PyResult<()> {
///
/// assert wat2wasm('(module)') == b'\x00asm\x01\x00\x00\x00'
/// ```
- #[pyfn(module, "wat2wasm")]
- #[text_signature = "(wat)"]
+ #[pyfn(module)]
+ #[pyo3(text_signature = "(wat)")]
fn wat2wasm<'py>(py: Python<'py>, wat: String) -> PyResult<&'py PyBytes> {
wat::wat2wasm(py, wat)
}
@@ -114,8 +114,8 @@ fn wasmer(py: Python, module: &PyModule) -> PyResult<()> {
///
/// assert wasm2wat(b'\x00asm\x01\x00\x00\x00') == '(module)'
/// ```
- #[pyfn(module, "wasm2wat")]
- #[text_signature = "(bytes)"]
+ #[pyfn(module)]
+ #[pyo3(text_signature = "(bytes)")]
fn wasm2wat(bytes: &PyBytes) -> PyResult {
wat::wasm2wat(bytes)
}
@@ -149,20 +149,17 @@ fn wasmer(py: Python, module: &PyModule) -> PyResult<()> {
// Enums.
module.add(
"Type",
- enum_module.call1(
- "IntEnum",
- PyTuple::new(
- py,
- &[
- "Type",
- types::Type::iter()
- .map(Into::into)
- .collect::>()
- .join(" ")
- .as_str(),
- ],
- ),
- )?,
+ enum_module.getattr("IntEnum")?.call1(PyTuple::new(
+ py,
+ &[
+ "Type",
+ types::Type::iter()
+ .map(Into::into)
+ .collect::>()
+ .join(" ")
+ .as_str(),
+ ],
+ ))?,
)?;
// Modules.
@@ -338,8 +335,8 @@ fn wasi(py: Python, module: &PyModule) -> PyResult<()> {
/// namespace. A non-strict detection expects that at least one WASI
/// namespace exits to detect the version. Note that the strict
/// detection is faster than the non-strict one.
- #[pyfn(module, "get_version")]
- #[text_signature = "(module, strict)"]
+ #[pyfn(module)]
+ #[pyo3(text_signature = "(module, strict)")]
fn get_version(module: &module::Module, strict: bool) -> Option {
wasi::get_version(module, strict)
}
@@ -351,20 +348,17 @@ fn wasi(py: Python, module: &PyModule) -> PyResult<()> {
// Enums.
module.add(
"Version",
- enum_module.call1(
- "IntEnum",
- PyTuple::new(
- py,
- &[
- "Version",
- wasi::Version::iter()
- .map(Into::into)
- .collect::>()
- .join(" ")
- .as_str(),
- ],
- ),
- )?,
+ enum_module.getattr("IntEnum")?.call1(PyTuple::new(
+ py,
+ &[
+ "Version",
+ wasi::Version::iter()
+ .map(Into::into)
+ .collect::>()
+ .join(" ")
+ .as_str(),
+ ],
+ ))?,
)?;
Ok(())
diff --git a/packages/api/src/memory/buffer.rs b/packages/api/src/memory/buffer.rs
index 18adca90..e1e8f276 100644
--- a/packages/api/src/memory/buffer.rs
+++ b/packages/api/src/memory/buffer.rs
@@ -34,7 +34,7 @@ use std::{
/// from wasmer import Memory, MemoryType, Store
///
/// store = Store()
-/// memory = Memory(store, MemoryType(128, shared=False))
+/// memory = Memory(store, MemoryType(minimum=128))
///
/// # Let's write data with a `Int8Array` view for example.
/// int8 = memory.int8_view()
diff --git a/packages/api/src/module.rs b/packages/api/src/module.rs
index 8536aeaa..69714dc5 100644
--- a/packages/api/src/module.rs
+++ b/packages/api/src/module.rs
@@ -35,7 +35,7 @@ use std::convert::TryInto;
/// module = Module(store, '(module)')
/// ```
#[pyclass(unsendable)]
-#[text_signature = "(store, bytes)"]
+#[pyo3(text_signature = "(store, bytes)")]
pub struct Module {
inner: wasmer::Module,
}
@@ -62,7 +62,7 @@ impl Module {
///
/// assert Module.validate(Store(), wasm_bytes)
/// ```
- #[text_signature = "(bytes)"]
+ #[pyo3(text_signature = "(bytes)")]
#[staticmethod]
fn validate(store: &Store, bytes: &PyAny) -> bool {
match bytes.downcast::() {
@@ -178,7 +178,7 @@ impl Module {
/// assert module.custom_sections('hello') == [b'World!']
/// assert module.custom_sections('foo') == []
/// ```
- #[text_signature = "($self, name)"]
+ #[pyo3(text_signature = "($self, name)")]
fn custom_sections<'p>(&self, py: Python<'p>, name: &str) -> &'p PyList {
PyList::new(
py,
@@ -203,7 +203,7 @@ impl Module {
///
/// assert type(serialized_module) == bytes
/// ```
- #[text_signature = "($self)"]
+ #[pyo3(text_signature = "($self)")]
fn serialize<'p>(&self, py: Python<'p>) -> PyResult<&'p PyBytes> {
Ok(PyBytes::new(
py,
@@ -253,7 +253,7 @@ impl Module {
///
/// assert isinstance(module, Module)
/// ```
- #[text_signature = "($self, bytes)"]
+ #[pyo3(text_signature = "($self, bytes)")]
#[staticmethod]
fn deserialize(store: &Store, bytes: &PyBytes) -> PyResult {
let module = unsafe { wasmer::Module::deserialize(store.inner(), bytes.as_bytes()) }
diff --git a/packages/api/src/store.rs b/packages/api/src/store.rs
index c44d63c2..614eda1f 100644
--- a/packages/api/src/store.rs
+++ b/packages/api/src/store.rs
@@ -44,7 +44,7 @@ use pyo3::{exceptions::PyTypeError, prelude::*};
/// `compiler_compiler_singlepass`, otherwise it will run in headless
/// mode.
#[pyclass]
-#[text_signature = "(engine)"]
+#[pyo3(text_signature = "(engine)")]
pub struct Store {
inner: wasmer::Store,
engine_name: String,
@@ -95,7 +95,7 @@ impl Store {
.or_else(|_| py.import("wasmer_compiler_llvm"))
.or_else(|_| py.import("wasmer_compiler_singlepass"))
// If any, load the `Compiler` class.
- .and_then(|compiler_module| compiler_module.get("Compiler"))
+ .and_then(|compiler_module| compiler_module.getattr("Compiler"))
.ok();
let target = None;
diff --git a/packages/api/src/target.rs b/packages/api/src/target.rs
index fec51b14..7fe4c6a1 100644
--- a/packages/api/src/target.rs
+++ b/packages/api/src/target.rs
@@ -1 +1 @@
-pub use wasmer_engines::{CpuFeatures, Target, Triple};
+pub use crate::wasmer_inner::wasmer_engines::{CpuFeatures, Target, Triple};
diff --git a/packages/api/src/types.rs b/packages/api/src/types.rs
index b91db5ae..af58a1d4 100644
--- a/packages/api/src/types.rs
+++ b/packages/api/src/types.rs
@@ -127,7 +127,7 @@ impl Into for Type {
/// )
/// ```
#[pyclass]
-#[text_signature = "(params, results)"]
+#[pyo3(text_signature = "(params, results)")]
pub struct FunctionType {
/// Parameters, i.e. inputs, of the function.
#[pyo3(get)]
@@ -198,7 +198,7 @@ impl PyObjectProtocol for FunctionType {
/// )
/// ```
#[pyclass]
-#[text_signature = "(minimum, maximum, shared)"]
+#[pyo3(text_signature = "(minimum, /, maximum, shared)")]
pub struct MemoryType {
/// The minimum number of pages in the memory.
#[pyo3(get)]
@@ -216,6 +216,7 @@ pub struct MemoryType {
#[pymethods]
impl MemoryType {
#[new]
+ #[args(maximum = "None", shared = "false")]
fn new(minimum: u32, maximum: Option, shared: bool) -> Self {
Self {
minimum,
@@ -268,7 +269,7 @@ impl PyObjectProtocol for MemoryType {
/// global_type = GlobalType(Type.I32, mutable=False)
/// ```
#[pyclass]
-#[text_signature = "(type, mutable)"]
+#[pyo3(text_signature = "(type, mutable)")]
pub struct GlobalType {
/// The type of the value stored in the global.
#[pyo3(get)]
@@ -321,7 +322,7 @@ impl PyObjectProtocol for GlobalType {
/// table_type = TableType(Type.I32, minimum=7, maximum=42)
/// ```
#[pyclass]
-#[text_signature = "(type, minium, maximum)"]
+#[pyo3(text_signature = "(type, minium, maximum)")]
pub struct TableType {
/// The type of data stored in elements of the table.
#[pyo3(get)]
@@ -421,7 +422,7 @@ impl PyObjectProtocol for TableType {
/// assert exports[3].type.shared == False
/// ```
#[pyclass]
-#[text_signature = "(name, type)"]
+#[pyo3(text_signature = "(name, type)")]
pub struct ExportType {
/// The name of the export.
#[pyo3(get)]
@@ -504,7 +505,7 @@ impl TryFrom for ExportType {
/// assert imports[3].type.shared == False
/// ```
#[pyclass]
-#[text_signature = "(module, name, type)"]
+#[pyo3(text_signature = "(module, name, type)")]
pub struct ImportType {
/// The namespace name (also known as module name).
#[pyo3(get)]
diff --git a/packages/api/src/values.rs b/packages/api/src/values.rs
index 918bfdbd..10d801de 100644
--- a/packages/api/src/values.rs
+++ b/packages/api/src/values.rs
@@ -125,7 +125,7 @@ impl Value {
/// value = Value.i32(42)
/// ```
#[staticmethod]
- #[text_signature = "(value)"]
+ #[pyo3(text_signature = "(value)")]
fn i32(value: i32) -> Self {
Self {
inner: wasmer::Value::I32(value),
@@ -142,7 +142,7 @@ impl Value {
/// value = Value.i64(42)
/// ```
#[staticmethod]
- #[text_signature = "(value)"]
+ #[pyo3(text_signature = "(value)")]
fn i64(value: i64) -> Self {
Self {
inner: wasmer::Value::I64(value),
@@ -159,7 +159,7 @@ impl Value {
/// value = Value.f32(4.2)
/// ```
#[staticmethod]
- #[text_signature = "(value)"]
+ #[pyo3(text_signature = "(value)")]
fn f32(value: f32) -> Self {
Self {
inner: wasmer::Value::F32(value),
@@ -176,7 +176,7 @@ impl Value {
/// value = Value.f64(4.2)
/// ```
#[staticmethod]
- #[text_signature = "(value)"]
+ #[pyo3(text_signature = "(value)")]
fn f64(value: f64) -> Self {
Self {
inner: wasmer::Value::F64(value),
@@ -193,7 +193,7 @@ impl Value {
/// value = Value.v128(42)
/// ```
#[staticmethod]
- #[text_signature = "(value)"]
+ #[pyo3(text_signature = "(value)")]
fn v128(value: u128) -> Self {
Self {
inner: wasmer::Value::V128(value),
diff --git a/packages/api/src/wasi.rs b/packages/api/src/wasi.rs
index 1ae0851f..3e36c2bf 100644
--- a/packages/api/src/wasi.rs
+++ b/packages/api/src/wasi.rs
@@ -98,7 +98,7 @@ impl Into for Version {
/// wasi_state_builder = wasi.StateBuilder('test-program')
/// ```
#[pyclass]
-#[text_signature = "(arguments=[], environments={}, preopen_directories=[], map_directories={})"]
+#[pyo3(text_signature = "(arguments=[], environments={}, preopen_directories=[], map_directories={})")]
pub struct StateBuilder {
inner: wasmer_wasi::WasiStateBuilder,
}
@@ -211,7 +211,7 @@ impl StateBuilder {
/// wasi.StateBuilder('test-program'). \
/// arguments(['--verbose --help'])
/// ```
- #[text_signature = "($self, arguments)"]
+ #[pyo3(text_signature = "($self, arguments)")]
pub fn arguments<'py>(
slf: &'py PyCell,
arguments: &PyList,
@@ -238,7 +238,7 @@ impl StateBuilder {
/// argument('--verbose'). \
/// argument('--help')
/// ```
- #[text_signature = "($self, argument)"]
+ #[pyo3(text_signature = "($self, argument)")]
pub fn argument<'py>(slf: &'py PyCell, argument: String) -> PyResult<&'py PyCell> {
let mut slf_mut = slf.try_borrow_mut()?;
slf_mut.self_argument(argument);
@@ -262,7 +262,7 @@ impl StateBuilder {
/// wasi.StateBuilder('test-program'). \
/// environments({"ABC": "DEF", "X": "YZ"})
/// ```
- #[text_signature = "($self, environments)"]
+ #[pyo3(text_signature = "($self, environments)")]
pub fn environments<'py>(
slf: &'py PyCell,
environments: &PyDict,
@@ -290,7 +290,7 @@ impl StateBuilder {
/// environment("ABC", "DEF"). \
/// environment("X", "YZ")
/// ```
- #[text_signature = "($self, key, value)"]
+ #[pyo3(text_signature = "($self, key, value)")]
pub fn environment<'py>(
slf: &'py PyCell,
key: String,
@@ -319,7 +319,7 @@ impl StateBuilder {
/// wasi.StateBuilder('test-program'). \
/// preopen_directories(["."])
/// ```
- #[text_signature = "($self, preopen_directories)"]
+ #[pyo3(text_signature = "($self, preopen_directories)")]
pub fn preopen_directories<'py>(
slf: &'py PyCell,
preopen_directories: &PyList,
@@ -347,7 +347,7 @@ impl StateBuilder {
/// wasi.StateBuilder('test-program'). \
/// preopen_directory(".")
/// ```
- #[text_signature = "($self, preopen_directory)"]
+ #[pyo3(text_signature = "($self, preopen_directory)")]
pub fn preopen_directory<'py>(
slf: &'py PyCell,
preopen_directory: String,
@@ -371,7 +371,7 @@ impl StateBuilder {
/// wasi.StateBuilder('test-program'). \
/// map_directories({"foo": "."})
/// ```
- #[text_signature = "($self, map_directories)"]
+ #[pyo3(text_signature = "($self, map_directories)")]
pub fn map_directories<'py>(
slf: &'py PyCell,
map_directories: &PyDict,
@@ -395,7 +395,7 @@ impl StateBuilder {
/// wasi.StateBuilder('test-program'). \
/// map_directory("foo", ".")
/// ```
- #[text_signature = "($self, alias, directory)"]
+ #[pyo3(text_signature = "($self, alias, directory)")]
pub fn map_directory<'py>(
slf: &'py PyCell,
alias: String,
@@ -419,7 +419,7 @@ impl StateBuilder {
/// argument('--foo'). \
/// finalize()
/// ```
- #[text_signature = "($self)"]
+ #[pyo3(text_signature = "($self)")]
pub fn finalize(&mut self) -> PyResult {
Ok(Environment::raw_new(
self.inner
@@ -462,7 +462,7 @@ impl Environment {
/// wasi_env = wasi.StateBuilder('test-program').argument('--foo').finalize()
/// import_object = wasi_env.generate_import_object(store, wasi.Version.SNAPSHOT1)
/// ```
- //#[text_signature = "($self, store, wasi_version)"]
+ //#[pyo3(text_signature = "($self, store, wasi_version)")]
fn generate_import_object(&self, store: &Store, wasi_version: Version) -> ImportObject {
let import_object = wasmer_wasi::generate_import_object_from_env(
store.inner(),
diff --git a/packages/compiler-cranelift/Cargo.toml b/packages/compiler-cranelift/Cargo.toml
index 3239aebc..fe3a2759 100644
--- a/packages/compiler-cranelift/Cargo.toml
+++ b/packages/compiler-cranelift/Cargo.toml
@@ -15,9 +15,9 @@ name = "wasmer_compiler_cranelift"
crate-type = ["cdylib"]
[dependencies]
-wasmer_engines = { path = "../engines/" }
+wasmer-engines = { path = "../engines/" }
wasmer-compiler-cranelift = "2.0"
-pyo3 = { version = "0.13", features = ["extension-module"] }
+pyo3 = { version = "0.14", features = ["extension-module"] }
[package.metadata.maturin]
classifier = [
diff --git a/packages/compiler-llvm/Cargo.toml b/packages/compiler-llvm/Cargo.toml
index 93ff96a0..7b78c048 100644
--- a/packages/compiler-llvm/Cargo.toml
+++ b/packages/compiler-llvm/Cargo.toml
@@ -15,9 +15,9 @@ name = "wasmer_compiler_llvm"
crate-type = ["cdylib"]
[dependencies]
-wasmer_engines = { path = "../engines/" }
+wasmer-engines = { path = "../engines/" }
wasmer-compiler-llvm = "2.0"
-pyo3 = { version = "0.13", features = ["extension-module"] }
+pyo3 = { version = "0.14", features = ["extension-module"] }
[package.metadata.maturin]
classifier = [
diff --git a/packages/compiler-singlepass/Cargo.toml b/packages/compiler-singlepass/Cargo.toml
index 3bdbb653..1557d517 100644
--- a/packages/compiler-singlepass/Cargo.toml
+++ b/packages/compiler-singlepass/Cargo.toml
@@ -15,9 +15,9 @@ name = "wasmer_compiler_singlepass"
crate-type = ["cdylib"]
[dependencies]
-wasmer_engines = { path = "../engines/" }
+wasmer-engines = { path = "../engines/" }
wasmer-compiler-singlepass = "2.0"
-pyo3 = { version = "0.13", features = ["extension-module"] }
+pyo3 = { version = "0.14", features = ["extension-module"] }
[package.metadata.maturin]
classifier = [
diff --git a/packages/engines/Cargo.toml b/packages/engines/Cargo.toml
index 381d01de..decf15f1 100644
--- a/packages/engines/Cargo.toml
+++ b/packages/engines/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "wasmer_engines"
+name = "wasmer-engines"
version = "1.0.0"
authors = ["Wasmer Engineering Team "]
edition = "2018"
@@ -13,5 +13,5 @@ publish = false
[dependencies]
wasmer = { version = "2.0", default-features = false, features = ["wat", "universal", "dylib", "compiler"] }
wasmer-compiler = "2.0"
-pyo3 = { version = "0.13", features = ["extension-module"] }
+pyo3 = { version = "0.14", features = ["extension-module"] }
enumset = "1.0.6"
\ No newline at end of file
diff --git a/packages/engines/README.md b/packages/engines/README.md
index db535201..4abbe5e6 100644
--- a/packages/engines/README.md
+++ b/packages/engines/README.md
@@ -1,4 +1,4 @@
-# `wasmer_engines`
+# `wasmer-engines`
This crate is not compiled to a Python package. It represents engines
and sibling types that are shared between the `wasmer` and the
diff --git a/packages/engines/src/engines.rs b/packages/engines/src/engines.rs
index 3bcca765..138e9b2a 100644
--- a/packages/engines/src/engines.rs
+++ b/packages/engines/src/engines.rs
@@ -12,7 +12,7 @@ use std::mem::ManuallyDrop;
/// It is possible to specify a `Target` to possibly cross-compile for
/// a different target. It requires a compiler.
#[pyclass(unsendable, subclass)]
-#[text_signature = "(/, compiler, target)"]
+#[pyo3(text_signature = "(/, compiler, target)")]
pub struct Universal {
inner: wasmer::UniversalEngine,
compiler_name: Option,
@@ -102,7 +102,7 @@ impl Universal {
/// It is possible to specify a `Target` to possibly cross-compile for
/// a different target. It requires a compiler.
#[pyclass(unsendable, subclass)]
-#[text_signature = "(/, compiler, target)"]
+#[pyo3(text_signature = "(/, compiler, target)")]
pub struct Dylib {
inner: wasmer::DylibEngine,
compiler_name: Option,
diff --git a/packages/engines/src/target_lexicon.rs b/packages/engines/src/target_lexicon.rs
index 334f5b67..c11c00fc 100644
--- a/packages/engines/src/target_lexicon.rs
+++ b/packages/engines/src/target_lexicon.rs
@@ -20,7 +20,7 @@ use std::str::FromStr;
/// target = target.Target(triple, cpu_features)
/// ```
#[pyclass]
-#[text_signature = "(triple, cpu_features)"]
+#[pyo3(text_signature = "(triple, cpu_features)")]
pub struct Target {
inner: wasmer_compiler::Target,
}
@@ -70,7 +70,7 @@ impl Target {
/// assert triple.default_calling_convention == 'system_v'
/// ```
#[pyclass]
-#[text_signature = "(triple)"]
+#[pyo3(text_signature = "(triple)")]
pub struct Triple {
inner: wasmer_compiler::Triple,
}
@@ -245,7 +245,7 @@ impl PyObjectProtocol for Triple {
/// cpu_features.add('sse2')
/// ```
#[pyclass]
-#[text_signature = "()"]
+#[pyo3(text_signature = "()")]
pub struct CpuFeatures {
inner: EnumSet,
}
@@ -266,7 +266,7 @@ impl CpuFeatures {
}
/// Add a new CPU feature.
- #[text_signature = "($self, feature)"]
+ #[pyo3(text_signature = "($self, feature)")]
fn add(&mut self, feature: &str) -> PyResult<()> {
self.inner.insert(
wasmer_compiler::CpuFeature::from_str(feature)
diff --git a/tests/test_import_object.py b/tests/test_import_object.py
index bf513389..2e4ecf4f 100644
--- a/tests/test_import_object.py
+++ b/tests/test_import_object.py
@@ -56,7 +56,7 @@ def test_import_memory():
"""
)
- memory = Memory(store, MemoryType(1, shared=False))
+ memory = Memory(store, MemoryType(minimum=1))
view = memory.uint8_view(offset=0)
import_object = ImportObject()
diff --git a/tests/test_memory.py b/tests/test_memory.py
index 4e8a4ff6..b15c31bb 100644
--- a/tests/test_memory.py
+++ b/tests/test_memory.py
@@ -13,7 +13,7 @@ def instance():
def test_constructor():
store = Store()
- memory_type = MemoryType(3, shared=False)
+ memory_type = MemoryType(minimum=3)
memory = Memory(store, memory_type)
assert memory.size == 3
diff --git a/tests/test_wasi.py b/tests/test_wasi.py
index 366f5308..96f0b15a 100644
--- a/tests/test_wasi.py
+++ b/tests/test_wasi.py
@@ -43,23 +43,14 @@ def test_wasi_env_memory():
instance = Instance(Module(store, TEST_BYTES), import_object)
def test_wasi():
- python = sys.executable
- result = subprocess.check_output(
- [
- python,
- '-c',
- 'from wasmer import wasi, Store, Module, Instance; \
- store = Store(); \
- module = Module(store, open("tests/wasi.wasm", "rb").read()); \
- wasi_version = wasi.get_version(module, strict=True); \
- wasi_env = wasi.StateBuilder("test-program").argument("--foo").environments({"ABC": "DEF", "X": "YZ"}).map_directory("the_host_current_dir", ".").finalize(); \
- import_object = wasi_env.generate_import_object(store, wasi_version); \
- instance = Instance(module, import_object); \
- instance.exports._start()'
- ]
- )
+ store = Store()
+ wasi_env = \
+ wasi.StateBuilder("test-program"). \
+ argument("--foo"). \
+ environments({"ABC": "DEF", "X": "YZ"}). \
+ map_directory("the_host_current_dir", "."). \
+ finalize()
+ import_object = wasi_env.generate_import_object(store, wasi.Version.LATEST)
- assert result == b'Found program name: `test-program`\n\
-Found 1 arguments: --foo\n\
-Found 2 environment variables: ABC=DEF, X=YZ\n\
-Found 1 preopened directories: DirEntry("/the_host_current_dir")\n'
+ instance = Instance(Module(store, TEST_BYTES), import_object)
+ instance.exports._start()