diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 8fc1ac6d..995636f7 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -26,9 +26,9 @@ jobs: fetch-depth: 1 - uses: chia-network/actions/setup-python@main - name: Install Python 3.9 + name: Install Python 3.12 with: - python-version: 3.9 + python-version: 3.12 - name: Update pip run: | @@ -50,9 +50,9 @@ jobs: fetch-depth: 1 - uses: chia-network/actions/setup-python@main - name: Install Python 3.9 + name: Install Python 3.12 with: - python-version: 3.9 + python-version: 3.12 - name: Update pip run: | diff --git a/.github/workflows/build-arm64-wheels.yml b/.github/workflows/build-arm64-wheels.yml index 8913a65a..2203e309 100644 --- a/.github/workflows/build-arm64-wheels.yml +++ b/.github/workflows/build-arm64-wheels.yml @@ -35,20 +35,16 @@ jobs: run: | docker run --rm \ -v ${{ github.workspace }}:/ws --workdir=/ws \ - quay.io/pypa/manylinux_2_28_aarch64 \ + ghcr.io/chia-network/build-images/centos-pypa-rust-aarch64 \ bash -exc '\ echo $PATH && \ - curl -L https://sh.rustup.rs > rustup-init.sh && \ - sh rustup-init.sh -y && \ yum -y install perl-IPC-Cmd && \ - yum -y install openssl-devel && \ + yum -y --disablerepo=epel install openssl-devel && \ source $HOME/.cargo/env && \ rustup target add aarch64-unknown-linux-musl && \ rm -rf venv && \ export PATH=/opt/python/cp310-cp310/bin/:$PATH && \ - export PATH=/opt/python/cp39-cp39/bin/:$PATH && \ - export PATH=/opt/python/cp38-cp38/bin/:$PATH && \ - /opt/python/cp38-cp38/bin/python -m venv venv && \ + /opt/python/cp310-cp310/bin/python -m venv venv && \ if [ ! -f "activate" ]; then ln -s venv/bin/activate; fi && \ . ./activate && \ pip install maturin && \ @@ -61,7 +57,7 @@ jobs: name: wheels path: target/wheels/ - - name: Install Twine + - name: Install setuptools_rust run: | if [ ! -f "venv" ]; then sudo rm -rf venv; fi sudo apt-get install python3-venv python3-pip -y diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 7867758a..ade09014 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -23,7 +23,7 @@ jobs: fail-fast: false matrix: os: [macos-15-intel, ubuntu-latest, windows-latest] - python: [3.8] + python: ["3.10"] steps: - uses: actions/checkout@v5 @@ -61,10 +61,8 @@ jobs: run: | docker run --rm \ -v ${{ github.workspace }}:/ws --workdir=/ws \ - quay.io/pypa/manylinux_2_28_x86_64 \ + ghcr.io/chia-network/build-images/centos-pypa-rust-x86_64 \ bash -exc '\ - curl -L https://sh.rustup.rs > rustup-init.sh && \ - sh rustup-init.sh -y && \ yum -y install perl-IPC-Cmd && \ yum -y --disablerepo=epel install openssl-devel && \ source $HOME/.cargo/env && \ @@ -72,12 +70,8 @@ jobs: PY_VERSION=${{ matrix.python }} PY_VERSION=${PY_VERSION/.} && \ echo "Python version with dot removed is $PY_VERSION" && \ - if [ "$PY_VERSION" = "38" ]; \ - then export SCND_VERSION="${PY_VERSION}m"; \ - else export SCND_VERSION="$PY_VERSION"; fi && \ - echo "Exporting path /opt/python/cp$PY_VERSION-cp$SCND_VERSION/bin" && \ - export PATH=/opt/python/cp$PY_VERSION-cp$SCND_VERSION/bin/:$PATH && \ - /opt/python/cp38-cp38/bin/python -m venv /venv && \ + export PATH=/opt/python/cp$PY_VERSION-cp$PY_VERSION/bin/:$PATH && \ + python -m venv /venv && \ . /venv/bin/activate && \ pip install --upgrade pip && \ pip install maturin && \ @@ -145,7 +139,7 @@ jobs: - name: Install python uses: Chia-Network/actions/setup-python@main with: - python-version: "3.10" + python-version: "3.12" - name: Download artifacts uses: actions/download-artifact@v6 @@ -184,7 +178,7 @@ jobs: fail-fast: false matrix: os: [macos-15-intel, ubuntu-latest] - python: [3.8] + python: ["3.10"] steps: - uses: actions/checkout@v5 with: @@ -216,7 +210,7 @@ jobs: fail-fast: false matrix: os: [macos-15-intel, ubuntu-latest, windows-latest] - python: [3.8] + python: ["3.10"] steps: - uses: actions/checkout@v5 with: @@ -224,6 +218,11 @@ jobs: - name: Set up rusts uses: dtolnay/rust-toolchain@1.89.0 + - uses: chia-network/actions/setup-python@main + name: Install Python ${{ matrix.python }} + with: + python-version: ${{ matrix.python }} + - name: build run: cargo build --workspace --exclude clvm_rs-fuzz diff --git a/wheel/Cargo.toml b/wheel/Cargo.toml index bdccd5d3..cdfd1f60 100644 --- a/wheel/Cargo.toml +++ b/wheel/Cargo.toml @@ -17,7 +17,7 @@ path = "src/lib.rs" [dependencies] clvmr = { workspace = true } -pyo3 = { workspace = true, features = ["abi3-py38", "extension-module"] } +pyo3 = { workspace = true, features = ["abi3-py310", "extension-module"] } [features] openssl = ["clvmr/openssl"]