From b5f83871c31e89558b0b517d98ce211e117b0eb6 Mon Sep 17 00:00:00 2001 From: "Ilya (Marshal)" Date: Mon, 1 Apr 2024 12:45:38 +0200 Subject: [PATCH 1/9] Use stable pyo3 v0.21.0 release --- Cargo.toml | 2 +- profiling/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d2a5d27..a0f8afc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ name = "libipld" crate-type = ["rlib", "cdylib"] [dependencies] -pyo3 = { version = "0.21.0-beta.0", features = ["generate-import-lib", "anyhow"] } +pyo3 = { version = "0.21.0", features = ["generate-import-lib", "anyhow"] } python3-dll-a = "0.2.7" anyhow = "1.0.75" libipld = { version = "0.16.0", features = ["dag-cbor"] } diff --git a/profiling/Cargo.toml b/profiling/Cargo.toml index a9a47cc..04bd046 100644 --- a/profiling/Cargo.toml +++ b/profiling/Cargo.toml @@ -11,4 +11,4 @@ structopt = "0.3.26" clap = "4.5.1" [dependencies.pyo3] -version = "0.21.0-beta.0" +version = "0.21.0" From 81e38379ee71faf54a3cad737dad3969a8083103 Mon Sep 17 00:00:00 2001 From: "Ilya (Marshal)" Date: Mon, 1 Apr 2024 12:59:57 +0200 Subject: [PATCH 2/9] Revert "Use stable pyo3 v0.21.0 release" This reverts commit b5f83871c31e89558b0b517d98ce211e117b0eb6. --- Cargo.toml | 2 +- profiling/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a0f8afc..d2a5d27 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ name = "libipld" crate-type = ["rlib", "cdylib"] [dependencies] -pyo3 = { version = "0.21.0", features = ["generate-import-lib", "anyhow"] } +pyo3 = { version = "0.21.0-beta.0", features = ["generate-import-lib", "anyhow"] } python3-dll-a = "0.2.7" anyhow = "1.0.75" libipld = { version = "0.16.0", features = ["dag-cbor"] } diff --git a/profiling/Cargo.toml b/profiling/Cargo.toml index 04bd046..a9a47cc 100644 --- a/profiling/Cargo.toml +++ b/profiling/Cargo.toml @@ -11,4 +11,4 @@ structopt = "0.3.26" clap = "4.5.1" [dependencies.pyo3] -version = "0.21.0" +version = "0.21.0-beta.0" From 4f63de544f7cb3ea31bc9a611bd69be42149cafc Mon Sep 17 00:00:00 2001 From: "Ilya (Marshal)" Date: Mon, 1 Apr 2024 13:24:49 +0200 Subject: [PATCH 3/9] lock old pycparser version --- pytests/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/pytests/requirements.txt b/pytests/requirements.txt index 631d928..d5ab836 100644 --- a/pytests/requirements.txt +++ b/pytests/requirements.txt @@ -2,3 +2,4 @@ pytest==7.4.4 pytest-benchmark==4.0.0 pytest-codspeed==2.2.0 pytest-xdist==3.5.0 +pycparser==2.21 From f9614954960d1e17ea081a3783be0c5b4f3ae1be Mon Sep 17 00:00:00 2001 From: "Ilya (Marshal)" Date: Mon, 1 Apr 2024 13:31:40 +0200 Subject: [PATCH 4/9] lock old rust version --- .github/workflows/codspeed.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/codspeed.yml b/.github/workflows/codspeed.yml index 3c21aaa..daabaf4 100644 --- a/.github/workflows/codspeed.yml +++ b/.github/workflows/codspeed.yml @@ -27,6 +27,7 @@ jobs: uses: dtolnay/rust-toolchain@stable with: components: llvm-tools + toolchain: 1.76.0 - name: Cache rust. uses: Swatinem/rust-cache@v2 From 3a8dcd7b3097fcba53fcaf7e494fc1a12666713c Mon Sep 17 00:00:00 2001 From: "Ilya (Marshal)" Date: Mon, 1 Apr 2024 13:40:41 +0200 Subject: [PATCH 5/9] finally fix CI? --- .github/workflows/codspeed.yml | 2 +- Cargo.toml | 2 +- profiling/Cargo.toml | 2 +- pytests/requirements.txt | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codspeed.yml b/.github/workflows/codspeed.yml index daabaf4..a74bbdc 100644 --- a/.github/workflows/codspeed.yml +++ b/.github/workflows/codspeed.yml @@ -41,7 +41,7 @@ jobs: run: pytest . --benchmark-enable - name: Prepare merged PGO data. - run: rustup run stable bash -c '$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata merge -o ${{ github.workspace }}/merged.profdata ${{ github.workspace }}/profdata' + run: rustup run 1.76.0 bash -c '$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata merge -o ${{ github.workspace }}/merged.profdata ${{ github.workspace }}/profdata' - name: Compile with profile. run: pip install -v -e . diff --git a/Cargo.toml b/Cargo.toml index d2a5d27..a0f8afc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ name = "libipld" crate-type = ["rlib", "cdylib"] [dependencies] -pyo3 = { version = "0.21.0-beta.0", features = ["generate-import-lib", "anyhow"] } +pyo3 = { version = "0.21.0", features = ["generate-import-lib", "anyhow"] } python3-dll-a = "0.2.7" anyhow = "1.0.75" libipld = { version = "0.16.0", features = ["dag-cbor"] } diff --git a/profiling/Cargo.toml b/profiling/Cargo.toml index a9a47cc..04bd046 100644 --- a/profiling/Cargo.toml +++ b/profiling/Cargo.toml @@ -11,4 +11,4 @@ structopt = "0.3.26" clap = "4.5.1" [dependencies.pyo3] -version = "0.21.0-beta.0" +version = "0.21.0" diff --git a/pytests/requirements.txt b/pytests/requirements.txt index d5ab836..631d928 100644 --- a/pytests/requirements.txt +++ b/pytests/requirements.txt @@ -2,4 +2,3 @@ pytest==7.4.4 pytest-benchmark==4.0.0 pytest-codspeed==2.2.0 pytest-xdist==3.5.0 -pycparser==2.21 From 1b2272c50b27090eed2fa7e478fe1a59642f93ce Mon Sep 17 00:00:00 2001 From: "Ilya (Marshal)" Date: Tue, 2 Apr 2024 13:36:17 +0200 Subject: [PATCH 6/9] move back to rust 1.17; bump pyo3 --- .github/workflows/codspeed.yml | 4 ++-- Cargo.toml | 2 +- profiling/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codspeed.yml b/.github/workflows/codspeed.yml index a74bbdc..9527479 100644 --- a/.github/workflows/codspeed.yml +++ b/.github/workflows/codspeed.yml @@ -27,7 +27,7 @@ jobs: uses: dtolnay/rust-toolchain@stable with: components: llvm-tools - toolchain: 1.76.0 + toolchain: stable - name: Cache rust. uses: Swatinem/rust-cache@v2 @@ -41,7 +41,7 @@ jobs: run: pytest . --benchmark-enable - name: Prepare merged PGO data. - run: rustup run 1.76.0 bash -c '$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata merge -o ${{ github.workspace }}/merged.profdata ${{ github.workspace }}/profdata' + run: rustup run stable bash -c '$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata merge -o ${{ github.workspace }}/merged.profdata ${{ github.workspace }}/profdata' - name: Compile with profile. run: pip install -v -e . diff --git a/Cargo.toml b/Cargo.toml index a0f8afc..f92f657 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ name = "libipld" crate-type = ["rlib", "cdylib"] [dependencies] -pyo3 = { version = "0.21.0", features = ["generate-import-lib", "anyhow"] } +pyo3 = { version = "0.21.1", features = ["generate-import-lib", "anyhow"] } python3-dll-a = "0.2.7" anyhow = "1.0.75" libipld = { version = "0.16.0", features = ["dag-cbor"] } diff --git a/profiling/Cargo.toml b/profiling/Cargo.toml index 04bd046..9606242 100644 --- a/profiling/Cargo.toml +++ b/profiling/Cargo.toml @@ -11,4 +11,4 @@ structopt = "0.3.26" clap = "4.5.1" [dependencies.pyo3] -version = "0.21.0" +version = "0.21.1" From bb566d92991d62c71966e53c1eac4833f6aeac9c Mon Sep 17 00:00:00 2001 From: "Ilya (Marshal)" Date: Wed, 3 Apr 2024 13:22:18 +0200 Subject: [PATCH 7/9] try nightly rust --- .github/workflows/codspeed.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codspeed.yml b/.github/workflows/codspeed.yml index 9527479..ed4c016 100644 --- a/.github/workflows/codspeed.yml +++ b/.github/workflows/codspeed.yml @@ -27,7 +27,7 @@ jobs: uses: dtolnay/rust-toolchain@stable with: components: llvm-tools - toolchain: stable + toolchain: nightly - name: Cache rust. uses: Swatinem/rust-cache@v2 @@ -41,7 +41,7 @@ jobs: run: pytest . --benchmark-enable - name: Prepare merged PGO data. - run: rustup run stable bash -c '$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata merge -o ${{ github.workspace }}/merged.profdata ${{ github.workspace }}/profdata' + run: rustup run nightly bash -c '$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata merge -o ${{ github.workspace }}/merged.profdata ${{ github.workspace }}/profdata' - name: Compile with profile. run: pip install -v -e . From f9279afce58a426b38b4829c628753012049406b Mon Sep 17 00:00:00 2001 From: "Ilya (Marshal)" Date: Tue, 9 Apr 2024 14:34:08 +0200 Subject: [PATCH 8/9] Revert "try nightly rust" This reverts commit bb566d92991d62c71966e53c1eac4833f6aeac9c. --- .github/workflows/codspeed.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codspeed.yml b/.github/workflows/codspeed.yml index ed4c016..9527479 100644 --- a/.github/workflows/codspeed.yml +++ b/.github/workflows/codspeed.yml @@ -27,7 +27,7 @@ jobs: uses: dtolnay/rust-toolchain@stable with: components: llvm-tools - toolchain: nightly + toolchain: stable - name: Cache rust. uses: Swatinem/rust-cache@v2 @@ -41,7 +41,7 @@ jobs: run: pytest . --benchmark-enable - name: Prepare merged PGO data. - run: rustup run nightly bash -c '$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata merge -o ${{ github.workspace }}/merged.profdata ${{ github.workspace }}/profdata' + run: rustup run stable bash -c '$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata merge -o ${{ github.workspace }}/merged.profdata ${{ github.workspace }}/profdata' - name: Compile with profile. run: pip install -v -e . From ae72a869744280527b42d8162e470b459f2694d0 Mon Sep 17 00:00:00 2001 From: "Ilya (Marshal)" Date: Sun, 8 Sep 2024 00:09:17 +0200 Subject: [PATCH 9/9] welcome to september