From e3d10c15d177f4e66e05915fae77f6f31c116d2f Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Thu, 6 Aug 2026 14:14:42 +0800 Subject: [PATCH 1/4] chore: delete tests/plugin/web/sw_threading/requirements.txt this file was likely committed by mistake, it contributes nothing but fail the license checker --- tests/plugin/web/sw_threading/requirements.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 tests/plugin/web/sw_threading/requirements.txt diff --git a/tests/plugin/web/sw_threading/requirements.txt b/tests/plugin/web/sw_threading/requirements.txt deleted file mode 100644 index 8b137891..00000000 --- a/tests/plugin/web/sw_threading/requirements.txt +++ /dev/null @@ -1 +0,0 @@ - From 7c3f5c4275d365cc88f2e0dbd82c18d0d73b22e3 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Thu, 6 Aug 2026 14:28:18 +0800 Subject: [PATCH 2/4] chore: add linter installation to make env --- .github/workflows/CI.yaml | 6 +----- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 1364acc4..37fce061 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -47,11 +47,7 @@ jobs: with: python-version: "3.11" - name: Lint codes - run: | - make poetry - poetry install --all-extras --with lint - make gen - make lint + run: make env lint # Check if the plugin doc is generated correctly plugin-doc-check: diff --git a/Makefile b/Makefile index 29be0869..24172eda 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ endif .PHONY: env env: poetry gen - poetry install --all-extras + poetry install --all-extras --with lint poetry run pip install --upgrade pip .PHONY: poetry poetry-fallback @@ -69,7 +69,7 @@ install: gen-basic .PHONY: lint # flake8 configurations should go to the file setup.cfg -lint: clean +lint: clean gen poetry run flake8 . poetry run pylint --disable=all --enable=E0602,E0603,E1101 skywalking tests From 0908464e03325253938a2416b2c7635d989634ce Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Thu, 6 Aug 2026 18:35:00 +0800 Subject: [PATCH 3/4] chore: restore sw_threading requirements.txt and ignore *.txt in license check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The plugin compose file installs /app/requirements.txt, so deleting it broke the sw_threading test. Bring it back and exclude *.txt from the license header check instead — per-plugin requirements.txt files are generated by tests/plugin/conftest.py and can never carry a header. --- .licenserc.yaml | 1 + tests/plugin/web/sw_threading/requirements.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 tests/plugin/web/sw_threading/requirements.txt diff --git a/.licenserc.yaml b/.licenserc.yaml index 736e4edc..4c2d3747 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -32,5 +32,6 @@ header: - '**/*.json' - '.venv' - 'poetry.lock' + - '**/*.txt' comment: on-failure diff --git a/tests/plugin/web/sw_threading/requirements.txt b/tests/plugin/web/sw_threading/requirements.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/tests/plugin/web/sw_threading/requirements.txt @@ -0,0 +1 @@ + From f555227ab78f38d02797b816f1e297823137d76d Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Thu, 6 Aug 2026 20:53:29 +0800 Subject: [PATCH 4/4] chore: keep the lint group out of `make env` `unify` and its `untokenize` dependency are unmaintained; their sdists use `ast.Str.s`, removed in Python 3.12, and neither publishes a wheel. Installing the lint group from `make env` therefore broke the Check Plugin Doc job, which runs on Python 3.14. Move the group into its own `env-lint` target that `lint` and `fix` depend on, so `make env` works on every supported interpreter and only the lint targets need one that can build `unify`. --- Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 24172eda..3fae3a57 100644 --- a/Makefile +++ b/Makefile @@ -27,9 +27,16 @@ endif .PHONY: env env: poetry gen - poetry install --all-extras --with lint + poetry install --all-extras poetry run pip install --upgrade pip +# The lint group is kept out of `env` on purpose: `unify` (and its `untokenize` +# dependency) are unmaintained and their sdists fail to build on Python >= 3.12, +# so installing them would break `make env` on the newer interpreters. +.PHONY: env-lint +env-lint: + poetry install --only lint + .PHONY: poetry poetry-fallback # poetry installer may not work on macOS's default python # falls back to pipx installer @@ -69,13 +76,13 @@ install: gen-basic .PHONY: lint # flake8 configurations should go to the file setup.cfg -lint: clean gen +lint: env-lint clean gen poetry run flake8 . poetry run pylint --disable=all --enable=E0602,E0603,E1101 skywalking tests .PHONY: fix # fix problems described in CodingStyle.md - verify outcome with extra care -fix: +fix: env-lint poetry run unify -r --in-place . poetry run flynt -tc -v .