Skip to content

backport: v0.26 bitcoin#28194 - #85

Open
DCG-Claude wants to merge 1 commit into
developfrom
backport-0.26-b065-test-functional
Open

DCG-Claude wants to merge 1 commit into
developfrom
backport-0.26-b065-test-functional

Conversation

@DCG-Claude

@DCG-Claude DCG-Claude commented Sep 26, 2026 •

Copy link
Copy Markdown
Collaborator

Automated Bitcoin Core v0.26 backports, batch backport-0.26-b065-test-functional.

upstream commit gates notes
bitcoin#28194 36db52b630 pick:pass build:pass tests:warn mech:warn tree:pass verify:pass Backports bitcoin#28194: bumps flake8 to 6.1.0 (in ci/lint/04_install.sh and Dash's ci-slim Dockerfile), fixes E721 type
Provenance

Each commit passed: cherry-pick (adapted by an Opus lane only where conflicts existed), build, touched tests, a mechanical diff-of-diffs check (every upstream hunk landed; no added line without an upstream counterpart), and an independent Opus verification lane where anything was adapted. Gate rows and lane artifacts are in the backportsys DB.

bee2d57 script: update flake8 to 6.1.0 (Jon Atack)
38c3fd8 test: python E721 updates (Jon Atack)

Pull request description:

  Update our functional tests per [E721](https://www.flake8rules.com/rules/E721.html) enforced by [flake8 6.1.0](https://flake8.pycqa.org/en/latest/release-notes/6.1.0.html), and update our CI lint task to use that release.  This makes the following linter output on current master with flake8 6.1.0 green.

  ```
  $ ./test/lint/lint-python.py ; ./test/lint/lint-spelling.py
  test/functional/p2p_invalid_locator.py:35:16: E721 do not compare types, for exact checks use `is` / `is not`, for instance checks use `isinstance()`
  test/functional/test_framework/siphash.py:34:12: E721 do not compare types, for exact checks use `is` / `is not`, for instance checks use `isinstance()`
  test/functional/test_framework/siphash.py:64:12: E721 do not compare types, for exact checks use `is` / `is not`, for instance checks use `isinstance()`
  src/test/fuzz/descriptor_parse.cpp:88: occurences ==> occurrences
  ^ Warning: codespell identified likely spelling errors. Any false positives? Add them to the list of ignored words in test/lint/spelling.ignore-words.txt
  ```

ACKs for top commit:
  MarcoFalke:
    lgtm ACK bee2d57

Tree-SHA512: f3788a543ca98e44eeeba1d06c32f1b11eec95d4aef068aa1b6b5c401261adfa3fb6c6d6c769f3fe6839d78e74a310d5c926867e7c367d6513a53d580fd376f3

Dash adaptations:
- ci/lint/04_install.sh: only the flake8 pin is bumped (5.0.4 -> 6.1.0); the surrounding lines keep Dash's codespell==2.2.1, mypy==0.981 and pyzmq==24.0.1 instead of upstream's context (codespell 2.2.5, mypy 1.4.1, pyzmq 25.1.0 from bitcoin#28009, not backported), because upstream changes only the flake8 line
- contrib/containers/ci/ci-slim.Dockerfile: flake8 also bumped 5.0.4 -> 6.1.0; Dash pins the lint Python deps in its CI image too, and 04_install.sh says 'BUMP ALSO contrib/containers/ci/ci-slim.Dockerfile' (and the Dockerfile says the reverse), so the two stay in sync
- test/functional/test_framework/crypto/siphash.py: upstream's test_framework/siphash.py changes land at Dash's path test_framework/crypto/siphash.py; content is identical to upstream (git applied them there on its own)
@DCG-Claude
DCG-Claude force-pushed the backport-0.26-b065-test-functional branch from 96d3536 to 36db52b Compare October 1, 2026 14:50
@DCG-Claude

Copy link
Copy Markdown
Collaborator Author

CI failed at 96d3536 on thepastaclaw/dash: Lint / Run linters

The lint job failed only in lint-python.py, on F401 for MasternodeInfo in five Dash-only tests. This backport moved flake8 to 6.1.0, which (via pyflakes 3) no longer reads # type: comments, so an import used only inside those comments now looks unused. I removed the unused import and the # type: MasternodeInfo comments in those five files; they still compile, but I could not run flake8 6.1.0 locally because pypi is blocked here (the codespell lines in the log are warnings only, in files this branch didn't touch). (folded into the bitcoin#28194 commit)


🤖 backportsys, on behalf of the Dash backport pipeline.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant