Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into feature/file-based-…
Browse files Browse the repository at this point in the history
…plugins
  • Loading branch information
MichaelTaylor3D committed Mar 15, 2024
2 parents 263c2e7 + e7c233d commit e222a57
Show file tree
Hide file tree
Showing 468 changed files with 4,145 additions and 3,620 deletions.
3 changes: 1 addition & 2 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ disable_warnings=
relative_files=True
source_pkgs=
chia
tests
omit=
tests/**/config.py
chia/_tests/**/config.py
concurrency=multiprocessing, thread
parallel=True

Expand Down
9 changes: 5 additions & 4 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
max-line-length = 120
exclude = ./typings/**/*
ignore = E203,W503
extend-ignore = E226,E704,E701
per-file-ignores =
tests/util/build_network_protocol_files.py:F405
tests/util/test_network_protocol_files.py:F405
tests/util/test_network_protocol_json.py:F405
tests/util/protocol_messages_json.py:E501
chia/_tests/util/build_network_protocol_files.py:F405
chia/_tests/util/test_network_protocol_files.py:F405
chia/_tests/util/test_network_protocol_json.py:F405
chia/_tests/util/protocol_messages_json.py:E501
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body:
id: what-happened
attributes:
label: What happened?
description: A clear and concise description of what happened, how to reproduce it, and what you expected to happen.
description: A clear and concise description of what happened, how to reproduce it, and what you expected to happen.
validations:
required: true
- type: input
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ contact_links:
https://github.com/Chia-Network/chia-blockchain/discussions/new?category=ideas
- about: Get support in the Chia Discord chat channels.
name: Join the Discord support chat
url: 'https://discord.gg/chia'
url: "https://discord.gg/chia"
40 changes: 20 additions & 20 deletions .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
name: ⚡️ Benchmarks

on:
workflow_dispatch:
workflow_dispatch:
inputs:
repeats:
description: "The number of times to execute each benchmark"
type: int
default: 1
push:
paths-ignore:
- '**.md'
branches:
- 'long_lived/**'
- main
- 'release/**'
release:
types: [published]
pull_request:
paths-ignore:
- '**.md'
branches:
- '**'
push:
paths-ignore:
- "**.md"
branches:
- "long_lived/**"
- main
- "release/**"
release:
types: [published]
pull_request:
paths-ignore:
- "**.md"
branches:
- "**"

concurrency:
# SHA is added to the end if on `main` to let all main workflows run
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.10" ]
python-version: ["3.10"]
env:
CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
BLOCKS_AND_PLOTS_VERSION: 0.38.0
Expand Down Expand Up @@ -91,8 +91,8 @@ jobs:
- name: Checkout test blocks and plots
uses: actions/checkout@v4
with:
repository: 'Chia-Network/test-cache'
path: '.chia'
repository: "Chia-Network/test-cache"
path: ".chia"
ref: ${{ env.BLOCKS_AND_PLOTS_VERSION }}
fetch-depth: 1

Expand All @@ -106,7 +106,7 @@ jobs:

- name: pytest
run: |
pytest -n 0 --capture no -m benchmark -o 'junit_suite_name=benchmarks' --junitxml=junit-data/benchmarks.raw.xml --benchmark-repeats ${{ needs.setup.outputs.repeats }} tests
pytest -n 0 --capture no -m benchmark -o 'junit_suite_name=benchmarks' --junitxml=junit-data/benchmarks.raw.xml --benchmark-repeats ${{ needs.setup.outputs.repeats }} chia/_tests/
- name: Format JUnit data and prepare results
if: always()
Expand All @@ -124,4 +124,4 @@ jobs:
- name: Add benchmark results to workflow summary
if: always()
run: |
python -m tests.process_junit --type benchmark --xml junit-data/benchmarks.xml --markdown --link-prefix ${{ github.event.repository.html_url }}/blob/${{ github.sha }}/ --link-line-separator \#L >> "$GITHUB_STEP_SUMMARY"
python -m chia._tests.process_junit --type benchmark --xml junit-data/benchmarks.xml --markdown --link-prefix ${{ github.event.repository.html_url }}/blob/${{ github.sha }}/ --link-line-separator \#L >> "$GITHUB_STEP_SUMMARY"
Loading

0 comments on commit e222a57

Please sign in to comment.