Merge branch 'main' into pin_in_lock

Chia-Network · Nov 26, 2024 · bd639ec · bd639ec
2 parents 972884d + 7fe2373
commit bd639ec
Show file tree

Hide file tree

Showing 670 changed files with 15,636 additions and 12,624 deletions.
diff --git a/.flake8 b/.flake8
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,5 +1,4 @@
 *	@Chia-Network/required-reviewers
 /.github/**/* @Chia-Network/actions-reviewers
 /PRETTY_GOOD_PRACTICES.md	@altendky @Chia-Network/required-reviewers
-/pylintrc	@altendky @Chia-Network/required-reviewers
 /tests/ether.py @altendky @Chia-Network/required-reviewers
diff --git a/.github/workflows/check_wheel_availability.yaml b/.github/workflows/check_wheel_availability.yaml
@@ -43,13 +43,8 @@ jobs:
             matrix: arm
           - name: Intel
             matrix: intel
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
         exclude:
-          - os:
-              matrix: macos
-            arch:
-              matrix: arm
-            python-version: "3.8"
           - os:
               matrix: windows
             arch:

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -21,5 +21,5 @@ jobs:
       - name: "Dependency Review"
         uses: actions/[email protected]
         with:
-          allow-dependencies-licenses: pkg:pypi/pylint, pkg:pypi/pyinstaller
+          allow-dependencies-licenses: pkg:pypi/pyinstaller
           deny-licenses: AGPL-1.0-only, AGPL-1.0-or-later, AGPL-1.0-or-later, AGPL-3.0-or-later, GPL-1.0-only, GPL-1.0-or-later, GPL-2.0-only, GPL-2.0-or-later, GPL-3.0-only, GPL-3.0-or-later
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -41,7 +41,6 @@ jobs:
           - name: Intel
             matrix: intel
         python:
-          - major_dot_minor: "3.8"
           - major_dot_minor: "3.9"
           - major_dot_minor: "3.10"
           - major_dot_minor: "3.11"

diff --git a/.github/workflows/test-install-scripts.yml b/.github/workflows/test-install-scripts.yml
@@ -22,34 +22,55 @@ concurrency:
 
 jobs:
   test_scripts:
-    name: Test Install Scripts - ${{ matrix.development.name }} - ${{ matrix.editable.name }}
-    runs-on: ${{ matrix.os.runs-on }}
+    name: Native ${{ matrix.os.emoji }} ${{ matrix.arch.emoji }} ${{ matrix.development.name }} - ${{ matrix.editable.name }}
+    runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
     strategy:
       fail-fast: false
       matrix:
         python:
           - major-dot-minor: "3.10"
         os:
-          - runs-on: macos-latest
-            matrix: macos-arm
-          - runs-on: macos-13
-            matrix: macos-intel
-          - runs-on: ubuntu-latest
+          - name: Linux
+            emoji: 🐧
+            runs-on:
+              arm: [Linux, ARM64]
+              intel: ubuntu-latest
             matrix: linux
-          - runs-on: windows-latest
+          - name: macOS
+            emoji: 🍎
+            runs-on:
+              arm: macos-latest
+              intel: macos-13
+            matrix: macos
+          - name: Windows
+            emoji: 🪟
+            runs-on:
+              intel: windows-latest
             matrix: windows
+        arch:
+          - name: ARM
+            emoji: 💪
+            matrix: arm
+          - name: Intel
+            emoji: 🌀
+            matrix: intel
         development:
-          - name: Non-development
+          - name: Non-dev
             value: false
-          - name: Development
+          - name: Dev
             value: true
         editable:
-          - name: Non-editable
+          - name: Non-edit
             value: false
             matrix: non-editable
-          - name: Editable
+          - name: Edit
             value: true
             matrix: editable
+        exclude:
+          - os:
+              matrix: windows
+            arch:
+              matrix: arm
 
     steps:
       - name: Checkout Code
@@ -112,7 +133,7 @@ jobs:
           [ "$POST_VERSION" != "shooby-doowah" -a "$PRE_VERSION" = "$POST_VERSION" ]
 
   test_scripts_in_docker:
-    name: Test Install Scripts ${{ matrix.distribution.name }} ${{ matrix.arch.name }}
+    name: Docker ${{ matrix.distribution.name }} ${{ matrix.arch.name }}
     runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
     container: ${{ matrix.distribution.url }}
     strategy:
@@ -220,7 +241,12 @@ jobs:
           apt-get install --yes software-properties-common
           add-apt-repository --yes ppa:git-core/ppa
           apt-get --yes update
-          apt-get install --yes git lsb-release sudo python3-venv
+          apt-get install --yes git lsb-release sudo
+          MINIMUM=3.9
+          if ! apt satisfy --yes "python3-venv (>= ${MINIMUM})"
+          then
+            apt-get install --yes python${MINIMUM}-venv
+          fi
 
       - name: Add safe git directory
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

diff --git a/.github/workflows/test-single.yml b/.github/workflows/test-single.yml
@@ -8,7 +8,7 @@ name: test
 on:
   workflow_call:
     inputs:
-      emoji:
+      os-emoji:
         required: true
         type: string
       matrix:
@@ -35,6 +35,9 @@ on:
       arch:
         required: true
         type: string
+      arch-emoji:
+        required: true
+        type: string
       collect-junit:
         required: false
         type: boolean
@@ -50,31 +53,23 @@ defaults:
 
 jobs:
   test:
-    name: ${{ matrix.os.emoji }} ${{ matrix.configuration.name }} - ${{ matrix.python.name }}
+    name: ${{ matrix.os.emoji }} ${{ matrix.arch.emoji }} ${{ matrix.configuration.name }} - ${{ matrix.python.name }}
     runs-on: ${{ matrix.os.runs-on }}
     timeout-minutes: ${{ matrix.configuration.job_timeout }}
     strategy:
       fail-fast: false
       matrix:
         configuration: ${{ fromJson(inputs.configuration) }}
         os:
-          - emoji: ${{ inputs.emoji }}
+          - emoji: ${{ inputs.os_emoji }}
             matrix: ${{ inputs.matrix }}
             name: ${{ inputs.name }}
             file_name: ${{ inputs.file_name }}
             runs-on: ${{ inputs.runs-on }}
         arch:
           - matrix: ${{ inputs.arch }}
+            emoji: ${{ inputs.arch-emoji }}
         python:
-          - name: "3.8"
-            file_name: "3.8"
-            action: "3.8"
-            apt: "3.8"
-            install_sh: "3.8"
-            matrix: "3.8"
-            exclude_from:
-              limited: True
-              main: True
           - name: "3.9"
             file_name: "3.9"
             action: "3.9"
@@ -109,10 +104,6 @@ jobs:
               limited: True
               main: True
         exclude:
-          - os:
-              matrix: macos
-            python:
-              matrix: "3.8"
           - arch:
               matrix: arm
             configuration:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -113,7 +113,7 @@ jobs:
     uses: ./.github/workflows/test-single.yml
     needs: configure
     with:
-      emoji: 🍎
+      os-emoji: 🍎
       matrix: macos-intel
       name: macOS Intel
       file_name: macos
@@ -122,12 +122,13 @@ jobs:
       matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
       runs-on: macos-13
       arch: intel
+      arch-emoji: 🌀
   macos-arm:
     if: github.event_name != 'workflow_dispatch' || inputs.run-macos-arm
     uses: ./.github/workflows/test-single.yml
     needs: configure
     with:
-      emoji: 🍎
+      os-emoji: 🍎
       matrix: macos
       name: macOS ARM
       file_name: macos-arm
@@ -136,13 +137,14 @@ jobs:
       matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
       runs-on: macos-14
       arch: arm
+      arch-emoji: 💪
       collect-junit: false
   ubuntu:
     if: github.event_name != 'workflow_dispatch' || inputs.run-linux
     uses: ./.github/workflows/test-single.yml
     needs: configure
     with:
-      emoji: 🐧
+      os-emoji: 🐧
       matrix: ubuntu
       name: Ubuntu
       file_name: ubuntu
@@ -151,13 +153,14 @@ jobs:
       matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
       runs-on: ubuntu-latest
       arch: intel
+      arch-emoji: 🌀
       collect-junit: false
   windows:
     if: github.event_name != 'workflow_dispatch' || inputs.run-windows
     uses: ./.github/workflows/test-single.yml
     needs: configure
     with:
-      emoji: 🪟
+      os-emoji: 🪟
       matrix: windows
       name: Windows
       file_name: windows
@@ -166,6 +169,7 @@ jobs:
       matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
       runs-on: windows-latest
       arch: intel
+      arch-emoji: 🌀
       collect-junit: false
 
   coverage:
@@ -292,7 +296,7 @@ jobs:
       - name: Coverage report (diff)
         if: (github.base_ref != '' || github.event.before != '') && always()
         env:
-          compare-branch: ${{ github.base_ref == '' && steps.parent-commit.hash || format('origin/{0}', github.base_ref) }}
+          compare-branch: ${{ github.base_ref == '' && steps.parent-commit.outputs.hash || format('origin/{0}', github.base_ref) }}
         run: |
           set -o pipefail
           diff-cover --config-file=.diffcover.toml --compare-branch=${{ env.compare-branch }} --fail-under=100 --html-report=coverage-reports/diff-cover.html --markdown-report=coverage-reports/diff-cover.md coverage-reports/coverage.xml | tee coverage-reports/diff-cover-stdout

diff --git a/.github/workflows/upload-pypi-source.yml b/.github/workflows/upload-pypi-source.yml
@@ -26,7 +26,7 @@ permissions:
 
 jobs:
   mypy:
-    name: ${{ matrix.os.emoji }} ${{ matrix.check.name }} - ${{ matrix.os.name }} ${{ matrix.arch.name }} ${{ matrix.python.major_dot_minor }}
+    name: ${{ matrix.os.emoji }} ${{ matrix.arch.emoji }} ${{ matrix.check.name }} - ${{ matrix.os.name }} ${{ matrix.python.major_dot_minor }}
     runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
     timeout-minutes: 20
     strategy:
@@ -52,11 +52,12 @@ jobs:
               intel: windows-latest
         arch:
           - name: ARM64
+            emoji: 💪
             matrix: arm
           - name: Intel
+            emoji: 🌀
             matrix: intel
         python:
-          - major_dot_minor: "3.8"
           - major_dot_minor: "3.9"
           - major_dot_minor: "3.10"
           - major_dot_minor: "3.11"
@@ -68,12 +69,6 @@ jobs:
               python manage-mypy.py build-mypy-ini
               mypy
         exclude:
-          - os:
-              matrix: macos
-            arch:
-              matrix: arm
-            python:
-              major_dot_minor: "3.8"
           - os:
               matrix: windows
             arch:
@@ -125,12 +120,8 @@ jobs:
         python:
           - major_dot_minor: "3.10"
         check:
-          - name: black
-            command: black --check --diff .
-          - name: flake8
-            command: flake8 benchmarks build_scripts chia tools *.py
-          - name: pylint
-            command: pylint benchmarks build_scripts chia tools *.py
+          - name: ruff
+            command: ruff format --check --diff .
           - name: generated protocol tests
             command: |
               python3 -m chia._tests.util.build_network_protocol_files
@@ -174,7 +165,7 @@ jobs:
       - check
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.10]
         os: [ubuntu-latest]
 
     steps:

diff --git a/.isort.cfg b/.isort.cfg