Merge pull request #304 from Chia-Network/EL-update-python

update python and maturin versions

Author: prozacchiwawa

.github/workflows/build-arm64-wheels.yml

@@ -36,13 +36,13 @@ jobs:
         rustup default stable
         rustup target add aarch64-unknown-linux-musl
         rm -rf venv
-        export PATH="${PATH}:/opt/python/cp39-cp39/bin/:/opt/python/cp38-cp38/bin/:/opt/python/cp37-cp37m/bin/"
+        export PATH="${PATH}:/opt/python/cp10-cp10/bin/"
     - name: Build Python wheels
       run: |
-        /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==1.7.0
+        pip install maturin==1.10.2
         CC=gcc maturin build --release --strip --manylinux 2_28
     - name: Upload artifacts
       uses: actions/upload-artifact@v6

.github/workflows/build-m1-wheel.yml

@@ -59,7 +59,7 @@ jobs:
         python3 -m venv venv
         . ./venv/bin/activate
         export PATH=~/.cargo/bin:$PATH
-        pip install maturin==1.7.0
+        pip install maturin==1.10.2
         maturin build -i python --release --strip
         cargo test
 

.github/workflows/build-test.yml

@@ -51,7 +51,7 @@ jobs:
     - name: Install dependencies
       run: |
           python -m pip install --upgrade pip
-          python -m pip install maturin==1.7.0
+          python -m pip install maturin==1.10.2
 
     - name: Build MacOs with maturin on Python ${{ matrix.python }}
       if: startsWith(matrix.os, 'macos')
@@ -63,7 +63,7 @@ jobs:
     - name: Build Linux in manylinux_2_28 with maturin on Python ${{ matrix.python }}
       if: startsWith(matrix.os, 'ubuntu')
       run: |
-        docker run --rm -v $(pwd):/io ghcr.io/pyo3/maturin:v1.8.3 build --release --strip --manylinux 2_28 --sdist
+        docker run --rm -v $(pwd):/io ghcr.io/pyo3/maturin:v1.10.2 build --release --strip --manylinux 2_28 --sdist
         # Refresh in case any ownerships changed.
         mv target target.docker && cp -r target.docker target
         # Ensure an empty .cargo-lock file exists.
@@ -164,7 +164,7 @@ jobs:
         # chia_puzzles_py/manage_clvm.py while being in ./chia_puzzles.
         cp support/install_deps.sh support/verify_compiler_version.sh chia_puzzles
         (cd chia_puzzles && python -m venv .venv && . .venv/bin/activate && pip install --upgrade pip && \
-        python -m pip install maturin==1.7.0 && \
+        python -m pip install maturin==1.10.2 && \
         cd .. && \
         pip install --no-index --find-links target/wheels/ chialisp && \
         cd chia_puzzles && \
@@ -412,7 +412,7 @@ jobs:
       - name: install maturin & pytest
         run: |
           source venv/bin/activate
-          python -m pip install maturin==1.7.0
+          python -m pip install maturin==1.10.2
           pip install pytest
       - name: Build maturin interface
         run: |

.github/workflows/extensive-tests.yml

@@ -41,43 +41,25 @@ jobs:
       with:
         python-version: 3.11
 
-    - name: Update pip
+    - uses: chia-network/actions/create-venv@main
+      id: create-venv
+
+    - uses: chia-network/actions/activate-venv@main
+      with:
+        directories: ${{ steps.create-venv.outputs.activate-venv-directories }}
+
+    - name: Update pip and dependencies
       run: |
-          python -m pip install --upgrade pip
+        python -m pip install --upgrade pip maturin==1.10.2
 
     - name: Set up rust
       uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
 
-    - name: Install dependencies
-      run: |
-          python -m pip install maturin==1.7.0
-
     - name: Build Linux in manylinux_2_28 with maturin on Python ${{ matrix.python }}
       run: |
-        podman run --rm=true \
-          -v ${{ github.workspace }}:/ws:rw --workdir=/ws \
-          ghcr.io/chia-network/build-images/centos-pypa-rust-x86_64 \
-          bash -exc '\
-            yum -y install libc6 openssl-devel && \
-            source $HOME/.cargo/env && \
-            rustup target add x86_64-unknown-linux-musl && \
-            rm -rf venv && \
-            PY_VERSION=${{ matrix.python }}
-            PY_VERSION=${PY_VERSION/.} && \
-            echo "Python version with dot removed is $PY_VERSION" && \
-            if [ "$PY_VERSION" = "37" ]; \
-            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 && \
-            if [ ! -f "activate" ]; then ln -s venv/bin/activate; fi && \
-            . ./activate && \
-            pip install --upgrade pip
-          '
-        docker run --rm -v $(pwd):/io ghcr.io/pyo3/maturin:v1.8.3 build --release --strip --manylinux 2_28
+        docker run --rm -v $(pwd):/io ghcr.io/pyo3/maturin:v1.10.2 build --release --strip --manylinux 2_28
         # Refresh in case any ownerships changed.
         mv target target.docker && cp -r target.docker target
         # Ensure an empty .cargo-lock file exists.
@@ -86,23 +68,20 @@ jobs:
     - name: Install chialisp wheel
       if: ${{ !startsWith(matrix.os, 'windows') }}
       run: |
-        . ./activate
         ls target/wheels/
         # this mess puts the name of the `.whl` file into `$WHEEL_PATH`
         # remove the dot, use the `glob` lib to grab the file from the directory
-        export WHEEL_PATH=$(echo ${{ matrix.python }} | python -c 'DOTLESS=input().replace(".", ""); import glob; print(" ".join(filter(lambda x: "musl" not in x, glob.glob("target/wheels/chialisp-*-cp*-*.whl"))))' )
+        export WHEEL_PATH=$(echo "3.10" | python -c 'DOTLESS=input().replace(".", ""); import glob; print(" ".join(filter(lambda x: "musl" not in x, glob.glob("target/wheels/chialisp-*-cp*-*.whl"))))' )
         echo ${WHEEL_PATH}
         pip install ${WHEEL_PATH}
 
     - name: Install other wheels
       run: |
-        . ./activate
         python -m pip install pytest
         python -m pip install blspy
 
     - name: install clvm & clvm_tools
       run: |
-        . ./activate
         git clone https://github.com/Chia-Network/clvm.git --branch=main --single-branch
         python -m pip install ./clvm
 
@@ -119,7 +98,6 @@ jobs:
 
     - name: Run game referee test
       run: |
-        . ./activate
         cp support/test-game-referee.sh .
         sh test-game-referee.sh resources/tests/game-referee-in-cl23
         sh test-game-referee.sh resources/tests/game-referee-in-cl21

Cargo.toml

@@ -40,7 +40,7 @@ chia-bls = "0.32.0"
 
 [dependencies.pyo3]
 version = "0.24.1"
-features = ["abi3-py39", "extension-module"]
+features = ["abi3-py310", "extension-module"]
 optional = true
 
 [dev-dependencies]