Merge remote-tracking branch 'origin/main' into fine_william___fine

Author: emlowe

.github/workflows/check_wheel_availability.yaml

@@ -43,7 +43,7 @@ jobs:
             matrix: arm
           - name: Intel
             matrix: intel
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
         exclude:
           - os:
               matrix: windows

.github/workflows/pre-commit.yml

@@ -41,7 +41,6 @@ jobs:
           - name: Intel
             matrix: intel
         python:
-          - major_dot_minor: "3.9"
           - major_dot_minor: "3.10"
           - major_dot_minor: "3.11"
           - major_dot_minor: "3.12"

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

@@ -214,7 +214,9 @@ jobs:
       - name: Prepare Amazon Linux
         if: ${{ matrix.distribution.type == 'amazon' }}
         run: |
-          yum install --assumeyes git
+          dnf update -y
+          dnf search python3.12
+          dnf install git python3.12 -y
 
       - name: Prepare Arch
         if: ${{ matrix.distribution.type == 'arch' }}
@@ -242,7 +244,9 @@ jobs:
       - name: Prepare Rocky
         if: ${{ matrix.distribution.type == 'rocky' }}
         run: |
-          yum install --assumeyes git python39
+          dnf update -y
+          dnf search python3.12
+          dnf install git python3.12 -y
 
       - name: Prepare Ubuntu
         if: ${{ matrix.distribution.type == 'ubuntu' }}
@@ -251,7 +255,7 @@ jobs:
         run: |
           apt-get --yes update
           apt-get install --yes git lsb-release
-          MINIMUM=3.9
+          MINIMUM=3.10
           if ! apt-get satisfy --yes "python3-venv (>= ${MINIMUM})"
           then
             apt-get install --yes python${MINIMUM}-venv

.github/workflows/test-single.yml

@@ -70,15 +70,6 @@ jobs:
           - matrix: ${{ inputs.arch }}
             emoji: ${{ inputs.arch-emoji }}
         python:
-          - name: "3.9"
-            file_name: "3.9"
-            action: "3.9"
-            apt: "3.9"
-            install_sh: "3.9"
-            matrix: "3.9"
-            exclude_from:
-              limited: True
-              main: True
           - name: "3.10"
             file_name: "3.10"
             action: "3.10"

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

@@ -59,7 +59,6 @@ jobs:
             emoji: 🌀
             matrix: intel
         python:
-          - major_dot_minor: "3.9"
           - major_dot_minor: "3.10"
           - major_dot_minor: "3.11"
           - major_dot_minor: "3.12"

Install.ps1

@@ -46,7 +46,7 @@ if ($null -eq (Get-Command py -ErrorAction SilentlyContinue))
     Exit 1
 }
 
-$supportedPythonVersions = "3.13", "3.12", "3.11", "3.10", "3.9"
+$supportedPythonVersions = "3.13", "3.12", "3.11", "3.10",
 if ("$env:INSTALL_PYTHON_VERSION" -ne "")
 {
     $pythonVersion = $env:INSTALL_PYTHON_VERSION

README.md

@@ -20,7 +20,7 @@ Chia is a modern cryptocurrency built from scratch, designed to be efficient, de
 
 Please check out the [Chia website][link-chia], the [Intro to Chia][link-intro], and [FAQ][link-faq] for information on this project.
 
-Python 3.9+ is required. Make sure your default python version is >=3.9 by typing `python3`.
+Python 3.10+ is required. Make sure your default python version is >=3.10 by typing `python3`.
 
 If you are behind a NAT, it can be difficult for peers outside your subnet to reach you when they start up. You can enable [UPnP][link-upnp]
 on your router or add a NAT (for IPv4 but not IPv6) and firewall rules to allow TCP port 8444 access to your peer.

chia/_tests/cmds/test_dev_gh.py

@@ -114,7 +114,7 @@ async def test_successfully_dispatches(
         assert by_name["macos-intel"]["conclusion"] == "skipped"
         assert by_name["windows"]["conclusion"] == "skipped"
 
-        versions = ["3.9", "3.10", "3.11", "3.12"]
+        versions = ["3.10", "3.11", "3.12"]
         runs_by_name: dict[str, list[str]] = {name: [] for name in ["ubuntu", "macos-arm"]}
         for name in by_name:
             platform, _, rest = name.partition(" / ")

chia/_tests/util/test_priority_mutex.py

@@ -381,7 +381,7 @@ def sane(requests: list[Request]) -> bool:
         return False
 
     ordered = sorted(requests)
-    return all(a.before(b) for a, b in zip(ordered, ordered[1:]))
+    return all(a.before(b) for a, b in itertools.pairwise(ordered))
 
 
 @dataclass

chia/cmds/cmd_classes.py

@@ -5,7 +5,6 @@
 import dataclasses
 import inspect
 import pathlib
-import sys
 from dataclasses import MISSING, dataclass, field, fields
 from typing import (
     Any,
@@ -45,20 +44,14 @@ async def run(self) -> None: ...
 
 
 def option(*param_decls: str, **kwargs: Any) -> Any:
-    if sys.version_info >= (3, 10):
-        default_default = MISSING
-    else:  # versions < 3.10 don't know about kw_only and they complain about lacks of defaults
-        # Can't get coverage on this because we only test on one version
-        default_default = None  # pragma: no cover
-
     return field(
         metadata=dict(
             option_args=dict(
                 param_decls=tuple(param_decls),
                 **kwargs,
             ),
         ),
-        default=kwargs.get("default", default_default),
+        default=kwargs.get("default", MISSING),
     )
 
 
@@ -270,16 +263,10 @@ def chia_command(
     def _chia_command(cls: type[ChiaCommand]) -> type[ChiaCommand]:
         # The type ignores here are largely due to the fact that the class information is not preserved after being
         # passed through the dataclass wrapper.  Not sure what to do about this right now.
-        if sys.version_info >= (3, 10):
-            wrapped_cls: type[ChiaCommand] = dataclass(
-                frozen=True,
-                kw_only=True,
-            )(cls)
-        else:  # pragma: no cover
-            # stuff below 3.10 doesn't know about kw_only
-            wrapped_cls: type[ChiaCommand] = dataclass(
-                frozen=True,
-            )(cls)
+        wrapped_cls: type[ChiaCommand] = dataclass(
+            frozen=True,
+            kw_only=True,
+        )(cls)
 
         metadata = Metadata(
             command=click.command(
@@ -316,9 +303,6 @@ def get_chia_command_metadata(cls: type[ChiaCommand]) -> Metadata:
 
 @dataclass_transform(frozen_default=True)
 def command_helper(cls: type[Any]) -> type[Any]:
-    if sys.version_info >= (3, 10):
-        new_cls = dataclass(frozen=True, kw_only=True)(cls)
-    else:  # stuff below 3.10 doesn't support kw_only
-        new_cls = dataclass(frozen=True)(cls)  # pragma: no cover
+    new_cls = dataclass(frozen=True, kw_only=True)(cls)
     setattr(new_cls, COMMAND_HELPER_ATTRIBUTE_NAME, True)
     return new_cls