mirror of
https://github.com/Chia-Network/chia-blockchain.git
synced 2026-08-24 10:05:29 -05:00
[LABS-247] Move defaults from 3.10 to 3.12 (#20115)
* initial changes * poetry fix * Address ruff * Install scripts issues * Experiment a little bit * Okay now try for rocky linux and use 3.12 instead * Remove the now unused thing * Move defaults from 3.10 to 3.12 * Setup python3.12 * debug * debug * whoops * listen I really dont know what Im doing * debug * debug * debug * debug * debug * debug * debug * debug * debug * debug * Use Chia action * Use an upstream change * debug * Move the python setup to the install action * try something dumb * back to sh * debug * Cleanup after extensive debug * Add SQLite version report * test with new images * remove python setup * try this image? * back to this * Try hyphenless * Use published pyhon312 tags
This commit is contained in:
Matt Hauff
@@ -56,7 +56,7 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
python-version: ["3.10"]
|
||||
python-version: ["3.12"]
|
||||
env:
|
||||
CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
|
||||
BLOCKS_AND_PLOTS_VERSION: 0.44.0
|
||||
@@ -73,6 +73,11 @@ jobs:
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up Python 3.12
|
||||
uses: Chia-Network/actions/setup-python@main
|
||||
with:
|
||||
python-version: "3.12"
|
||||
|
||||
- uses: chia-network/actions/cache-pip@main
|
||||
with:
|
||||
mode: poetry
|
||||
|
||||
@@ -47,12 +47,12 @@ jobs:
|
||||
runs-on: ${{ matrix.os.runs-on }}
|
||||
needs:
|
||||
- version
|
||||
container: chianetwork/ubuntu-22.04-builder:latest
|
||||
container: chianetwork/ubuntu-22.04-builder:python312
|
||||
timeout-minutes: 120
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
python-version: ["3.10"]
|
||||
python-version: ["3.12"]
|
||||
os:
|
||||
- runs-on: ubuntu-latest
|
||||
arch: amd64
|
||||
@@ -207,7 +207,7 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
configuration:
|
||||
- python-version: ["3.10"]
|
||||
- python-version: ["3.12"]
|
||||
os:
|
||||
- matrix: debian
|
||||
file-type:
|
||||
|
||||
@@ -48,12 +48,12 @@ jobs:
|
||||
needs:
|
||||
- version
|
||||
container:
|
||||
image: chianetwork/rocky8-builder:latest
|
||||
image: chianetwork/rocky8-builder:python312
|
||||
timeout-minutes: 40
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
python-version: ["3.10"]
|
||||
python-version: ["3.12"]
|
||||
os:
|
||||
- arch-artifact-name: intel
|
||||
|
||||
@@ -206,7 +206,7 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
configuration:
|
||||
- python-version: ["3.10"]
|
||||
- python-version: ["3.12"]
|
||||
os:
|
||||
- matrix: redhat
|
||||
file-type:
|
||||
|
||||
@@ -51,7 +51,7 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
python-version: ["3.10"]
|
||||
python-version: ["3.12"]
|
||||
os:
|
||||
- runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
|
||||
name: intel
|
||||
@@ -242,7 +242,7 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
configuration:
|
||||
- python-version: ["3.10"]
|
||||
- python-version: ["3.12"]
|
||||
os:
|
||||
- matrix: macos
|
||||
file-type:
|
||||
|
||||
@@ -51,7 +51,7 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
python-version: ["3.10"]
|
||||
python-version: ["3.12"]
|
||||
|
||||
env:
|
||||
CHIA_INSTALLER_VERSION: ${{ needs.version.outputs.chia-installer-version }}
|
||||
@@ -263,7 +263,7 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
configuration:
|
||||
- python-version: ["3.10"]
|
||||
- python-version: ["3.12"]
|
||||
os:
|
||||
- matrix: windows
|
||||
file-type:
|
||||
|
||||
@@ -32,7 +32,7 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
python:
|
||||
- major-dot-minor: "3.10"
|
||||
- major-dot-minor: "3.12"
|
||||
os:
|
||||
- name: Linux
|
||||
emoji: 🐧
|
||||
|
||||
@@ -76,6 +76,9 @@ jobs:
|
||||
apt: "3.10"
|
||||
install_sh: "3.10"
|
||||
matrix: "3.10"
|
||||
exclude_from:
|
||||
limited: True
|
||||
main: True
|
||||
- name: "3.11"
|
||||
file_name: "3.11"
|
||||
action: "3.11"
|
||||
@@ -87,15 +90,10 @@ jobs:
|
||||
main: True
|
||||
- name: "3.12"
|
||||
file_name: "3.12"
|
||||
# TODO: https://github.com/python/cpython/issues/128479
|
||||
# return to just `3.12` after presumably 3.12.9 becomes available with the fix
|
||||
action: "3.12.7"
|
||||
action: "3.12"
|
||||
apt: "3.12"
|
||||
install_sh: "3.12"
|
||||
matrix: "3.12"
|
||||
exclude_from:
|
||||
limited: True
|
||||
main: True
|
||||
exclude:
|
||||
- arch:
|
||||
matrix: arm
|
||||
|
||||
@@ -89,7 +89,7 @@ jobs:
|
||||
- name: Setup Python environment
|
||||
uses: Chia-Network/actions/setup-python@main
|
||||
with:
|
||||
python-version: "3.10"
|
||||
python-version: "3.12"
|
||||
|
||||
- name: Generate matrix configuration
|
||||
id: configure
|
||||
@@ -213,11 +213,11 @@ jobs:
|
||||
name: Ubuntu
|
||||
runs-on: ubuntu-latest
|
||||
python:
|
||||
- name: "3.10"
|
||||
action: "3.10"
|
||||
apt: "3.10"
|
||||
install_sh: "3.10"
|
||||
matrix: "3.10"
|
||||
- name: "3.12"
|
||||
action: "3.12"
|
||||
apt: "3.12"
|
||||
install_sh: "3.12"
|
||||
matrix: "3.12"
|
||||
|
||||
steps:
|
||||
- uses: re-actors/alls-green@release/v1.2
|
||||
|
||||
@@ -124,7 +124,7 @@ jobs:
|
||||
- name: Intel
|
||||
matrix: intel
|
||||
python:
|
||||
- major_dot_minor: "3.10"
|
||||
- major_dot_minor: "3.12"
|
||||
check:
|
||||
- name: ruff
|
||||
command: ruff format --check --diff .
|
||||
@@ -182,7 +182,7 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
python:
|
||||
- major_dot_minor: "3.10"
|
||||
- major_dot_minor: "3.12"
|
||||
os: [ubuntu-latest]
|
||||
|
||||
steps:
|
||||
|
||||
@@ -93,6 +93,9 @@ if ($openSSLVersion -lt 269488367)
|
||||
Write-Output "Anything before 1.1.1n is vulnerable to CVE-2022-0778."
|
||||
}
|
||||
|
||||
$SQLiteVersionStr = (py -$pythonVersion -c 'import sys; import sqlite3; print(sqlite3.sqlite_version)')
|
||||
Write-Output "SQLite version is: $SQLiteVersionStr"
|
||||
|
||||
$extras_cli = @()
|
||||
foreach ($extra in $extras)
|
||||
{
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o errexit
|
||||
|
||||
USAGE_TEXT="\
|
||||
|
||||
-21
@@ -3938,36 +3938,19 @@ markers = "python_version == \"3.12\""
|
||||
files = [
|
||||
{file = "zstd-1.5.5.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b5cd20afab8d13c52d2b2219bf18cc765eae87b8219343bce20647007890adab"},
|
||||
{file = "zstd-1.5.5.1-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:0f467ab9b57ab8b4b874e6974d38b802f20406803bb7ec9308df923553cd48f7"},
|
||||
{file = "zstd-1.5.5.1-cp310-cp310-macosx_13_0_arm64.whl", hash = "sha256:1866fd2eb37bc80cd0a1bab8f099df5e778a773e829378c633f9fa1325a5dae1"},
|
||||
{file = "zstd-1.5.5.1-cp310-cp310-macosx_13_0_x86_64.whl", hash = "sha256:b90ab3e3a2cc196c55151b8d0c506bc7488cb7d7c6479a9f535a047703c29427"},
|
||||
{file = "zstd-1.5.5.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:bdf76b7c92d50e0ba3e76db6684ca58a419877436de948e39a8b72df1e3a0ff2"},
|
||||
{file = "zstd-1.5.5.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ca7df4319ef56b50b441ee6f6427e94672db811ad890bbb487d42bb0a6eebeb"},
|
||||
{file = "zstd-1.5.5.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9a4d2d6302834a22550a5885f9ae27d1baa1896afb0d40d70e0e9090c026fa5b"},
|
||||
{file = "zstd-1.5.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:06d91d45b912417e83793a78a3f6668be631a1744a7841ecde4dbfeee309f5ca"},
|
||||
{file = "zstd-1.5.5.1-cp310-cp310-win_amd64.whl", hash = "sha256:408d3f56bbf0f091a2bab33a3dee62ac9bafe94bb96940b5e4611e43dcf0ee68"},
|
||||
{file = "zstd-1.5.5.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:23f6fb9a631f7e7934cccdfbb69e06a47e1a5e64d69b09a7a2a5cf6e1db5014d"},
|
||||
{file = "zstd-1.5.5.1-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:02ecf7d9c41ae9a5685a7fdbf2aebbfb185125c07622819512fed41459233d51"},
|
||||
{file = "zstd-1.5.5.1-cp311-cp311-macosx_13_0_arm64.whl", hash = "sha256:abfdcc4df4388dbbde1f1999e0d3cdb794cab371ca03521500192aa6689da403"},
|
||||
{file = "zstd-1.5.5.1-cp311-cp311-macosx_13_0_x86_64.whl", hash = "sha256:38e9f1505bd181111defca1c00bc772674ad12a581413cea33dc954002dfefd1"},
|
||||
{file = "zstd-1.5.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a1f0734b74587f4a14d3b1ac194cb260a7e919d665118eeed3155bade21f9c8e"},
|
||||
{file = "zstd-1.5.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d3d13647ff05da2f8a9c1067b6e4182102fc4b6547c49ecdd3031e7ae2cadc1a"},
|
||||
{file = "zstd-1.5.5.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2892f9e76a9ba9e0fcd32977d5b1fc8394568465dd54eac5bef24f84804bc208"},
|
||||
{file = "zstd-1.5.5.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b0f0c81d4241226eab831a500120ddaf9a35dd59593eeb48ed7879e2c722c24c"},
|
||||
{file = "zstd-1.5.5.1-cp311-cp311-win_amd64.whl", hash = "sha256:62d2ab79a32bb2d09c74e550636cf4639c1ff3760625f03dccd30e2606b24e66"},
|
||||
{file = "zstd-1.5.5.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ec16bc70e3db77a88129c001fb62ce0956a1a3321e0ea4ee389c78d7f616ac50"},
|
||||
{file = "zstd-1.5.5.1-cp312-cp312-macosx_11_0_x86_64.whl", hash = "sha256:b8e7f5ee15e7d5d9a5deebc49f62316c901000d8485e68c5f5d602312bfba9ae"},
|
||||
{file = "zstd-1.5.5.1-cp312-cp312-macosx_13_0_arm64.whl", hash = "sha256:a4efaba2324628af8f31662c6e5adc363778a8454f6605ac01ece37dfcc9ba6e"},
|
||||
{file = "zstd-1.5.5.1-cp312-cp312-macosx_13_0_x86_64.whl", hash = "sha256:0ffd07b4a44668ece31dc6281021c36517d6802ce8e20cc455863a99007ea324"},
|
||||
{file = "zstd-1.5.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:46237c84f7817dc4d9c40cc43c7c9325a587f5ec593f364bae501cccada534ac"},
|
||||
{file = "zstd-1.5.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:55bcbcca3a342e8298fd23e58f300b13a33e65667e837cb34dd16c8126cdf77a"},
|
||||
{file = "zstd-1.5.5.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3aabfce08716b06357718fc73a63b5ead4e9ad3fe6765f8b37386ab94c58fb49"},
|
||||
{file = "zstd-1.5.5.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95c3f06af07fc8976114bb233c426c499b3ac219a6545d163b3c1a4989c40288"},
|
||||
{file = "zstd-1.5.5.1-cp312-cp312-win_amd64.whl", hash = "sha256:ab96e69cd4a70c5a4d3c613e85d6492817c35a9ba3921ee86f9d26a788c1522b"},
|
||||
{file = "zstd-1.5.5.1-cp313-cp313-macosx_13_0_arm64.whl", hash = "sha256:d6599f5e0783728388c574e743640bc7d0f826c4d73030ff1541b16f3dd0a36f"},
|
||||
{file = "zstd-1.5.5.1-cp313-cp313-macosx_13_0_x86_64.whl", hash = "sha256:60631652d49f2cd892cd8beadadb0e18a940489baf59a54f17cba8dfd197bb27"},
|
||||
{file = "zstd-1.5.5.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b003e7319286b8f87ec4da872e9d1be811edb057ab99b3fde498168d48853987"},
|
||||
{file = "zstd-1.5.5.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:858a7892483cc5a2902fa91b5da33b18d7c495a51e429ec5a6d8abe34907da2d"},
|
||||
{file = "zstd-1.5.5.1-cp313-cp313-win_amd64.whl", hash = "sha256:020f2c4805d2c6dff58da71a9f84689e64852fa885869faf73c39c9230dd8540"},
|
||||
{file = "zstd-1.5.5.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:1b111beaf6a4d98b6382e0891287a0d61ae44c3ec819b37f2256a482cc2ccc08"},
|
||||
{file = "zstd-1.5.5.1-cp38-cp38-macosx_11_0_x86_64.whl", hash = "sha256:4a434d83bcfa8a0d843451bc073fe60bae9f710dce796c9dba716c66df49c311"},
|
||||
{file = "zstd-1.5.5.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cccbafaeda62b98f3d3c70b5e686c6c539c0ea76cab88a9817f1cf3842d4272d"},
|
||||
@@ -3975,11 +3958,7 @@ files = [
|
||||
{file = "zstd-1.5.5.1-cp38-cp38-win_amd64.whl", hash = "sha256:eb17b3401e3fa2c16ecfee4b00cca82fbc71ffd6c64c97619605b2779bc7f5d0"},
|
||||
{file = "zstd-1.5.5.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8612bb288facb0e24d171f7010f2ea2159d8bd7d8243667f707994f398b6d26d"},
|
||||
{file = "zstd-1.5.5.1-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:8cee6c496fe49a27f4a641c75814681ee932201680eb4b07c88afde1b730b633"},
|
||||
{file = "zstd-1.5.5.1-cp39-cp39-macosx_13_0_arm64.whl", hash = "sha256:905577dfb0182aafeb4bee396ca9426a63efe38b384c6684102f98433ac411f7"},
|
||||
{file = "zstd-1.5.5.1-cp39-cp39-macosx_13_0_x86_64.whl", hash = "sha256:7c36475a570d5e6c031afd12a6f9990c57afc59106dd2f55e52388fd3d79e429"},
|
||||
{file = "zstd-1.5.5.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:52e9e5d9f2e71f5bb86f795bb9f7648be8407f5305bcb3b698d271d6a9678b02"},
|
||||
{file = "zstd-1.5.5.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b629e950bd0bcd169149af8c9c312d8091a922c07adeef0cd6e9fb06dc11216a"},
|
||||
{file = "zstd-1.5.5.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5d87a075de6347d8804e41441fd41d9d17e362c07bac9d39ec361caef92c6ae6"},
|
||||
{file = "zstd-1.5.5.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:86a968e443d735ff4716c18fda91b88d30fee7419c381d26ab2f92e779e69c22"},
|
||||
{file = "zstd-1.5.5.1-cp39-cp39-win_amd64.whl", hash = "sha256:7e4a460b169110b16d39eb05249d36c9b09c9d1b4831e72ead13a484b5404029"},
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user