From 569e0b2253c557943a930416274ccbc6eb416047 Mon Sep 17 00:00:00 2001 From: Armen Zambrano G <44410+armenzg@users.noreply.github.com> Date: Tue, 17 Sep 2024 14:18:54 -0400 Subject: [PATCH 1/7] Build wheels with Python 3.10 This will generate the cp310 wheels --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04541d0..64ac0ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,8 @@ jobs: - uses: actions/checkout@v4 - run: rustup toolchain install stable --profile minimal --no-self-update - uses: actions/setup-python@v5 + with: + python-version: '3.10' - name: Build wheels uses: PyO3/maturin-action@v1 @@ -38,6 +40,8 @@ jobs: - uses: actions/checkout@v4 - run: rustup toolchain install stable --profile minimal --no-self-update - uses: actions/setup-python@v5 + with: + python-version: '3.10' - name: Build wheels uses: PyO3/maturin-action@v1 From fdc87364c8a6efd3f1d63a558057a18289371631 Mon Sep 17 00:00:00 2001 From: Armen Zambrano G <44410+armenzg@users.noreply.github.com> Date: Wed, 18 Sep 2024 08:06:28 -0400 Subject: [PATCH 2/7] Partially revert "Update to Python 3.11 and `cargo update` (#56)" This partially reverts commit 8d9b342d65d7895cca32c8797408fb478bd696e3. --- .python-version | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.python-version b/.python-version index b6d8b76..920121e 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.11.8 +3.10.13 \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 326bfd5..59d5daa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ manifest-path = "bindings/Cargo.toml" python-source = "python" [tool.mypy] -python_version = "3.11" +python_version = "3.10" plugins = ["pydantic.mypy"] files = ["."] exclude = ["^.venv/"] From 30d1c07bd60ead8861c8fa714d797d9c5d05711a Mon Sep 17 00:00:00 2001 From: Armen Zambrano G <44410+armenzg@users.noreply.github.com> Date: Wed, 18 Sep 2024 08:57:06 -0400 Subject: [PATCH 3/7] 3.10.15 --- .python-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.python-version b/.python-version index 920121e..8cc1b46 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.10.13 \ No newline at end of file +3.10.15 From 13452dfdbd97448b83a07bfe18c68177536c4d2b Mon Sep 17 00:00:00 2001 From: Armen Zambrano G <44410+armenzg@users.noreply.github.com> Date: Wed, 18 Sep 2024 08:59:26 -0400 Subject: [PATCH 4/7] Add python-version to tests --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9a7b2e..8e42932 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,6 +64,8 @@ jobs: - run: cargo test --workspace --all-features --doc - uses: actions/setup-python@v5 + with: + python-version: "3.10" - uses: actions/cache@v3 with: From 1dd3ae4ba12ffbf54a4fe32e59c699b72156e8bb Mon Sep 17 00:00:00 2001 From: Armen Zambrano G <44410+armenzg@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:11:55 -0400 Subject: [PATCH 5/7] Cargo toml --- bindings/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/Cargo.toml b/bindings/Cargo.toml index afd8336..5203ed3 100644 --- a/bindings/Cargo.toml +++ b/bindings/Cargo.toml @@ -14,7 +14,7 @@ pyo3 = { version = "0.22.1", features = [ "anyhow", "extension-module", "serde", - "abi3-py311", + "abi3-py310", ] } rust-ophio = { path = "../rust" } smol_str = "0.2.0" From 64a0a4c0d43f738f59aab8743a015a978eaee8ee Mon Sep 17 00:00:00 2001 From: Armen Zambrano G <44410+armenzg@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:14:31 -0400 Subject: [PATCH 6/7] remove wityh --- .github/workflows/build.yml | 4 ---- .github/workflows/ci.yml | 2 -- 2 files changed, 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 64ac0ea..04541d0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,8 +14,6 @@ jobs: - uses: actions/checkout@v4 - run: rustup toolchain install stable --profile minimal --no-self-update - uses: actions/setup-python@v5 - with: - python-version: '3.10' - name: Build wheels uses: PyO3/maturin-action@v1 @@ -40,8 +38,6 @@ jobs: - uses: actions/checkout@v4 - run: rustup toolchain install stable --profile minimal --no-self-update - uses: actions/setup-python@v5 - with: - python-version: '3.10' - name: Build wheels uses: PyO3/maturin-action@v1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e42932..c9a7b2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,8 +64,6 @@ jobs: - run: cargo test --workspace --all-features --doc - uses: actions/setup-python@v5 - with: - python-version: "3.10" - uses: actions/cache@v3 with: From 399f3c7b7bae80a280b1ad203fd71b201fe5c216 Mon Sep 17 00:00:00 2001 From: Armen Zambrano G <44410+armenzg@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:16:40 -0400 Subject: [PATCH 7/7] 3.10.11 --- .python-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.python-version b/.python-version index 8cc1b46..09dcc78 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.10.15 +3.10.11