Skip to content

Commit 0c7bf69

Browse files
committed
Merge remote-tracking branch 'origin/main' into fine_william___fine
2 parents e948c45 + 40bf5b5 commit 0c7bf69

33 files changed

+612
-359
lines changed

.github/workflows/benchmarks.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
strategy:
5757
fail-fast: false
5858
matrix:
59-
python-version: ["3.10"]
59+
python-version: ["3.12"]
6060
env:
6161
CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
6262
BLOCKS_AND_PLOTS_VERSION: 0.44.0
@@ -73,6 +73,11 @@ jobs:
7373
with:
7474
fetch-depth: 0
7575

76+
- name: Set up Python 3.12
77+
uses: Chia-Network/actions/setup-python@main
78+
with:
79+
python-version: "3.12"
80+
7681
- uses: chia-network/actions/cache-pip@main
7782
with:
7883
mode: poetry

.github/workflows/build-linux-installer-deb.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ jobs:
4747
runs-on: ${{ matrix.os.runs-on }}
4848
needs:
4949
- version
50-
container: chianetwork/ubuntu-22.04-builder:latest
50+
container: chianetwork/ubuntu-22.04-builder:python312
5151
timeout-minutes: 120
5252
strategy:
5353
fail-fast: false
5454
matrix:
55-
python-version: ["3.10"]
55+
python-version: ["3.12"]
5656
os:
5757
- runs-on: ubuntu-latest
5858
arch: amd64
@@ -93,7 +93,7 @@ jobs:
9393
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9494

9595
- name: Setup Node per .nvmrc in GUI
96-
uses: actions/setup-node@v5
96+
uses: actions/setup-node@v6
9797
with:
9898
node-version-file: chia-blockchain-gui/.nvmrc
9999

@@ -207,7 +207,7 @@ jobs:
207207
fail-fast: false
208208
matrix:
209209
configuration:
210-
- python-version: ["3.10"]
210+
- python-version: ["3.12"]
211211
os:
212212
- matrix: debian
213213
file-type:

.github/workflows/build-linux-installer-rpm.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ jobs:
4848
needs:
4949
- version
5050
container:
51-
image: chianetwork/rocky8-builder:latest
51+
image: chianetwork/rocky8-builder:python312
5252
timeout-minutes: 40
5353
strategy:
5454
fail-fast: false
5555
matrix:
56-
python-version: ["3.10"]
56+
python-version: ["3.12"]
5757
os:
5858
- arch-artifact-name: intel
5959

@@ -83,7 +83,7 @@ jobs:
8383
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8484

8585
- name: Setup Node per .nvmrc in GUI
86-
uses: actions/setup-node@v5
86+
uses: actions/setup-node@v6
8787
with:
8888
node-version-file: chia-blockchain-gui/.nvmrc
8989

@@ -206,7 +206,7 @@ jobs:
206206
fail-fast: false
207207
matrix:
208208
configuration:
209-
- python-version: ["3.10"]
209+
- python-version: ["3.12"]
210210
os:
211211
- matrix: redhat
212212
file-type:

.github/workflows/build-macos-installers.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
strategy:
5252
fail-fast: false
5353
matrix:
54-
python-version: ["3.10"]
54+
python-version: ["3.12"]
5555
os:
5656
- runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
5757
name: intel
@@ -177,7 +177,7 @@ jobs:
177177
- uses: chia-network/actions/activate-venv@main
178178

179179
- name: Setup Node per .nvmrc in GUI
180-
uses: actions/setup-node@v5
180+
uses: actions/setup-node@v6
181181
with:
182182
node-version-file: chia-blockchain-gui/.nvmrc
183183

@@ -242,7 +242,7 @@ jobs:
242242
fail-fast: false
243243
matrix:
244244
configuration:
245-
- python-version: ["3.10"]
245+
- python-version: ["3.12"]
246246
os:
247247
- matrix: macos
248248
file-type:

.github/workflows/build-windows-installer.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
strategy:
5252
fail-fast: false
5353
matrix:
54-
python-version: ["3.10"]
54+
python-version: ["3.12"]
5555

5656
env:
5757
CHIA_INSTALLER_VERSION: ${{ needs.version.outputs.chia-installer-version }}
@@ -96,7 +96,7 @@ jobs:
9696
python-version: ${{ matrix.python-version }}
9797

9898
- name: Setup Node per .nvmrc in GUI
99-
uses: actions/setup-node@v5
99+
uses: actions/setup-node@v6
100100
with:
101101
node-version-file: chia-blockchain-gui/.nvmrc
102102

@@ -263,7 +263,7 @@ jobs:
263263
fail-fast: false
264264
matrix:
265265
configuration:
266-
- python-version: ["3.10"]
266+
- python-version: ["3.12"]
267267
os:
268268
- matrix: windows
269269
file-type:

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
# Initializes the CodeQL tools for scanning.
4949
- name: Initialize CodeQL
50-
uses: github/codeql-action/init@v3
50+
uses: github/codeql-action/init@v4
5151
with:
5252
languages: ${{ matrix.language }}
5353
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
5858
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5959
# If this step fails, then you should remove it and run the build manually (see below)
6060
- name: Autobuild
61-
uses: github/codeql-action/autobuild@v3
61+
uses: github/codeql-action/autobuild@v4
6262

6363
# ℹ️ Command-line programs to run using the OS shell.
6464
# 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
7272
# make release
7373

7474
- name: Perform CodeQL Analysis
75-
uses: github/codeql-action/analyze@v3
75+
uses: github/codeql-action/analyze@v4

.github/workflows/test-install-scripts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
python:
35-
- major-dot-minor: "3.10"
35+
- major-dot-minor: "3.12"
3636
os:
3737
- name: Linux
3838
emoji: 🐧
@@ -89,7 +89,7 @@ jobs:
8989
python-version: ${{ matrix.python.major-dot-minor }}
9090

9191
- name: Setup Node per .nvmrc in GUI
92-
uses: actions/setup-node@v5
92+
uses: actions/setup-node@v6
9393
with:
9494
node-version-file: chia-blockchain-gui/.nvmrc
9595

.github/workflows/test-single.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ jobs:
7676
apt: "3.10"
7777
install_sh: "3.10"
7878
matrix: "3.10"
79+
exclude_from:
80+
limited: True
81+
main: True
7982
- name: "3.11"
8083
file_name: "3.11"
8184
action: "3.11"
@@ -87,15 +90,10 @@ jobs:
8790
main: True
8891
- name: "3.12"
8992
file_name: "3.12"
90-
# TODO: https://github.com/python/cpython/issues/128479
91-
# return to just `3.12` after presumably 3.12.9 becomes available with the fix
92-
action: "3.12.7"
93+
action: "3.12"
9394
apt: "3.12"
9495
install_sh: "3.12"
9596
matrix: "3.12"
96-
exclude_from:
97-
limited: True
98-
main: True
9997
- name: "3.13"
10098
file_name: "3.13"
10199
action: "3.13"

.github/workflows/test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
- name: Setup Python environment
9090
uses: Chia-Network/actions/setup-python@main
9191
with:
92-
python-version: "3.10"
92+
python-version: "3.12"
9393

9494
- name: Generate matrix configuration
9595
id: configure
@@ -213,11 +213,11 @@ jobs:
213213
name: Ubuntu
214214
runs-on: ubuntu-latest
215215
python:
216-
- name: "3.10"
217-
action: "3.10"
218-
apt: "3.10"
219-
install_sh: "3.10"
220-
matrix: "3.10"
216+
- name: "3.12"
217+
action: "3.12"
218+
apt: "3.12"
219+
install_sh: "3.12"
220+
matrix: "3.12"
221221

222222
steps:
223223
- uses: re-actors/alls-green@release/v1.2

.github/workflows/upload-pypi-source.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
- name: Intel
126126
matrix: intel
127127
python:
128-
- major_dot_minor: "3.10"
128+
- major_dot_minor: "3.12"
129129
check:
130130
- name: ruff
131131
command: ruff format --check --diff .
@@ -183,7 +183,7 @@ jobs:
183183
strategy:
184184
matrix:
185185
python:
186-
- major_dot_minor: "3.10"
186+
- major_dot_minor: "3.12"
187187
os: [ubuntu-latest]
188188

189189
steps:

0 commit comments

Comments
 (0)