diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 12d3ac1c..74407926 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v5.0.0 - name: Install dependencies if: matrix.target.id == 'linux-amd64' @@ -61,7 +61,7 @@ jobs: override: true target: ${{ matrix.target.target-name }} - - uses: Swatinem/rust-cache@v1 + - uses: Swatinem/rust-cache@v2.8.0 - name: Set current Python version shell: bash @@ -168,7 +168,7 @@ jobs: ls -lhaGiR target/wheels/*.whl - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.6.2 with: name: wheels-${{ matrix.python }}-${{ matrix.target.id }} path: target/wheels @@ -184,10 +184,10 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v5.0.0 - name: Download the Artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4.6.2 with: path: artifacts @@ -226,7 +226,7 @@ jobs: pyenv install --skip-existing "$(cat .python-version)" # Caching is disabled because it interferes with artifact creation - #- uses: Swatinem/rust-cache@v1 + #- uses: Swatinem/rust-cache@v2.8.0 - name: Set up utilities shell: bash diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 45b44045..867a7f90 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,7 +54,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v5.0.0 - name: Install dependencies if: matrix.target.id == 'linux-amd64' @@ -72,7 +72,7 @@ jobs: target: ${{ matrix.target.target-name }} # Caching is disabled because it interferes with artifact creation - # - uses: Swatinem/rust-cache@v2 + # - uses: Swatinem/rust-cache@v2.8.0 # with: # shared-key: "rust-cache" @@ -83,7 +83,7 @@ jobs: - name: Set up Python ${{ matrix.python }} (amd64) if: matrix.target.id != 'linux-aarch64' - uses: actions/setup-python@v4 + uses: actions/setup-python@v6.0.0 with: python-version: ${{ matrix.python }} architecture: x64 @@ -201,7 +201,7 @@ jobs: ls -lhaGiR target/wheels/*.whl - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.6.2 with: name: wheels-${{ matrix.python }}-${{ matrix.target.id }} path: target/wheels @@ -218,10 +218,10 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v5.0.0 - name: Download the Artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4.6.2 with: path: artifacts @@ -237,7 +237,7 @@ jobs: - name: Set up Python ${{ matrix.python }} (amd64) if: matrix.target.id != 'linux-aarch64' - uses: actions/setup-python@v4 + uses: actions/setup-python@v6.0.0 with: python-version: 3.11 @@ -253,7 +253,7 @@ jobs: pyenv install --skip-existing "$(cat .python-version)" # Caching is disabled because it interferes with artifact creation - #- uses: Swatinem/rust-cache@v1 + #- uses: Swatinem/rust-cache@v2.8.0 - name: Set up just shell: bash diff --git a/Cargo.lock b/Cargo.lock index c3592224..1d7e2e54 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -426,26 +426,9 @@ dependencies = [ [[package]] name = "indoc" -version = "0.3.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" -dependencies = [ - "indoc-impl", - "proc-macro-hack", -] - -[[package]] -name = "indoc-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", - "unindent", -] +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "inkwell" @@ -687,25 +670,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", -] - [[package]] name = "pest" version = "2.1.3" @@ -788,44 +752,56 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.14.5" +version = "0.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35100f9347670a566a67aa623369293703322bb9db77d99d7df7313b575ae0c8" +checksum = "0220c44442c9b239dd4357aa856ac468a4f5e1f0df19ddb89b2522952eb4c6ca" dependencies = [ "cfg-if 1.0.0", "indoc", "libc", "parking_lot", - "paste", - "pyo3-build-config 0.14.5", + "pyo3-build-config 0.16.6", + "pyo3-ffi", "pyo3-macros", "unindent", ] [[package]] name = "pyo3-build-config" -version = "0.14.5" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d12961738cacbd7f91b7c43bc25cfeeaa2698ad07a04b3be0aa88b950865738f" +checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410" dependencies = [ "once_cell", ] [[package]] name = "pyo3-build-config" -version = "0.15.1" +version = "0.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf9e4d128bfbddc898ad3409900080d8d5095c379632fbbfbb9c8cfb1fb852b" +checksum = "9c819d397859445928609d0ec5afc2da5204e0d0f73d6bf9e153b04e83c9cdc2" dependencies = [ "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.16.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca882703ab55f54702d7bfe1189b41b0af10272389f04cae38fe4cd56c65f75f" +dependencies = [ + "libc", + "pyo3-build-config 0.16.6", ] [[package]] name = "pyo3-macros" -version = "0.14.5" +version = "0.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0bc5215d704824dfddddc03f93cb572e1155c68b6761c37005e1c288808ea8" +checksum = "568749402955ad7be7bad9a09b8593851cd36e549ac90bfd44079cea500f3f21" dependencies = [ + "proc-macro2", "pyo3-macros-backend", "quote", "syn", @@ -833,12 +809,11 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.14.5" +version = "0.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71623fc593224afaab918aa3afcaf86ed2f43d34f6afde7f3922608f253240df" +checksum = "611f64e82d98f447787e82b8e7b0ebc681e1eb78fc1252668b2c605ffb4e1eb8" dependencies = [ "proc-macro2", - "pyo3-build-config 0.14.5", "quote", "syn", ] @@ -1436,7 +1411,7 @@ version = "1.2.0" dependencies = [ "cfg-if 1.0.0", "pyo3", - "pyo3-build-config 0.15.1", + "pyo3-build-config 0.15.2", "wasmer 2.1.1", "wasmer-engines", "wasmer-types", diff --git a/packages/api/Cargo.toml b/packages/api/Cargo.toml index 5989316a..85c8d9bf 100644 --- a/packages/api/Cargo.toml +++ b/packages/api/Cargo.toml @@ -20,7 +20,7 @@ wasmer = { version = "2.1.1", default-features = false, features = ["wat", "univ wasmer-engines = { path = "../engines/" } wasmer-types = "2.1.1" wasmer-wasi = "2.1.1" -pyo3 = { version = "0.14", features = ["extension-module", "auto-initialize"] } +pyo3 = { version = "0.16", features = ["extension-module", "auto-initialize"] } wat = "1.0" wasmprinter = "0.2" cfg-if = "1.0" diff --git a/packages/compiler-cranelift/Cargo.toml b/packages/compiler-cranelift/Cargo.toml index 374aaf36..9cc78d77 100644 --- a/packages/compiler-cranelift/Cargo.toml +++ b/packages/compiler-cranelift/Cargo.toml @@ -17,4 +17,4 @@ crate-type = ["cdylib"] [dependencies] wasmer-engines = { path = "../engines/" } wasmer-compiler-cranelift = "2.1.1" -pyo3 = { version = "0.14", features = ["extension-module"] } +pyo3 = { version = "0.16", features = ["extension-module"] } diff --git a/packages/compiler-llvm/Cargo.toml b/packages/compiler-llvm/Cargo.toml index 458c2295..1f0b4882 100644 --- a/packages/compiler-llvm/Cargo.toml +++ b/packages/compiler-llvm/Cargo.toml @@ -17,4 +17,4 @@ crate-type = ["cdylib"] [dependencies] wasmer-engines = { path = "../engines/" } wasmer-compiler-llvm = "2.1.1" -pyo3 = { version = "0.14", features = ["extension-module"] } +pyo3 = { version = "0.16", features = ["extension-module"] } diff --git a/packages/compiler-singlepass/Cargo.toml b/packages/compiler-singlepass/Cargo.toml index b6c002cc..3af97f6b 100644 --- a/packages/compiler-singlepass/Cargo.toml +++ b/packages/compiler-singlepass/Cargo.toml @@ -17,4 +17,4 @@ crate-type = ["cdylib"] [dependencies] wasmer-engines = { path = "../engines/" } wasmer-compiler-singlepass = "2.1.1" -pyo3 = { version = "0.14", features = ["extension-module"] } +pyo3 = { version = "0.16", features = ["extension-module"] } diff --git a/packages/engines/Cargo.toml b/packages/engines/Cargo.toml index 1f005f3e..6e3ead6f 100644 --- a/packages/engines/Cargo.toml +++ b/packages/engines/Cargo.toml @@ -13,5 +13,5 @@ publish = false [dependencies] wasmer = { version = "2.1.1", default-features = false, features = ["wat", "universal", "dylib", "compiler"] } wasmer-compiler = "2.1.1" -pyo3 = { version = "0.14", features = ["extension-module"] } +pyo3 = { version = "0.16", features = ["extension-module"] } enumset = "1.0.6"