Skip to content

Commit 3aeb6ba

Browse files
committed
Get rid of pedantic warnings, update zizmor, misc adjustments
1 parent 8abaacc commit 3aeb6ba

10 files changed

Lines changed: 35 additions & 26 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 9d742350d330ffa9e09c5deef6cbdd3bd0e0f366
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit c64a592e2517560433039fd9a6681bb44d1e8cb6

‎.github/actions/run-appinspect/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ runs:
77
- name: Install AppInspect dependencies
88
shell: bash
99
run: sudo apt-get install -y libmagic1
10-
- name: Install the SDK and its dependencies into the mock app
10+
- name: Install the SDK and its dependencies into a mock app
1111
shell: bash
1212
run: |
1313
mkdir -p ./tests/system/test_apps/generating_app/bin/lib

‎.github/workflows/appinspect.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ env:
1616

1717
jobs:
1818
appinspect:
19+
name: Run AppInspect
1920
runs-on: ubuntu-latest
2021
steps:
2122
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd

‎.github/workflows/cd.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ env:
1717

1818
jobs:
1919
build-distributables:
20+
name: Build release distributables
2021
# Why building is separate from publishing:
2122
# https://github.com/pypa/gh-action-pypi-publish/issues/217#issuecomment-1965727093
2223
runs-on: ubuntu-latest
@@ -68,6 +69,7 @@ jobs:
6869
path: docs/_build/html
6970

7071
publish-pre-release:
72+
name: Publish pre-release to Test PyPI
7173
if: startsWith(github.ref, 'refs/tags/') == false
7274
needs: build-distributables
7375
runs-on: ubuntu-latest
@@ -88,6 +90,7 @@ jobs:
8890
repository-url: https://test.pypi.org/legacy/
8991

9092
publish-release:
93+
name: Publish release to PyPI
9194
if: startsWith(github.ref, 'refs/tags/') == true
9295
needs: build-distributables
9396
runs-on: ubuntu-latest

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ permissions: {}
1313

1414
jobs:
1515
lint:
16+
name: Run linters
1617
runs-on: ubuntu-latest
1718
steps:
1819
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ permissions: {}
1313

1414
jobs:
1515
test:
16+
name: Run test suite
1617
runs-on: ubuntu-latest
1718
strategy:
1819
matrix:
@@ -55,10 +56,8 @@ jobs:
5556
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae
5657
with:
5758
path: .pytest_cache
58-
key: pytest-cache-${{ runner.os }}-py${{ matrix.python-version }}-${{ github.ref_name }}-${{
59-
github.sha }}
60-
restore-keys: |
61-
pytest-cache-${{ runner.os }}-py${{ matrix.python-version }}-${{ github.ref_name }}-
59+
key: pytest-cache-${{ runner.os }}-py${{ matrix.python-version }}-${{ github.ref_name }}-${{ github.sha }}
60+
restore-keys: pytest-cache-${{ runner.os }}-py${{ matrix.python-version }}-${{ github.ref_name }}-
6261
- name: Run unit tests
6362
run: make test-unit
6463
- name: Run integration/system tests

‎Makefile‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22

33
## VIRTUALENV MANAGEMENT
44

5-
# https://docs.astral.sh/uv/reference/cli/#uv-run--upgrade
5+
# https://docs.astral.sh/uv/reference/cli/#uv-sync
66
# --no-config skips Splunk's internal PyPI mirror
77
UV_SYNC_CMD := uv sync --no-config
8+
# https://docs.astral.sh/uv/reference/cli/#uv-run
9+
UV_RUN_CMD := uv run
10+
# https://docs.zizmor.sh/usage
11+
ZIZMOR_CMD := $(UV_RUN_CMD) zizmor --pedantic --strict-collection
812

913
.PHONY: install
1014
install:
@@ -20,13 +24,12 @@ upgrade:
2024
ci-install:
2125
$(UV_SYNC_CMD) --frozen --group $(SDK_DEPS_GROUP)
2226

23-
UV_RUN_CMD := uv run
2427
.PHONY: lint
2528
lint: lint-python lint-gh-actions # TODO: Add mbake
2629

2730
.PHONY: lint-gh-actions
2831
lint-gh-actions:
29-
$(UV_RUN_CMD) zizmor --pedantic --collect=all --strict-collection .
32+
$(ZIZMOR_CMD) ./.github
3033

3134
.PHONY: lint-python
3235
lint-python:
@@ -39,7 +42,7 @@ ci-lint: ci-lint-python ci-lint-gh-actions # TODO: Add mbake
3942

4043
.PHONY: ci-lint-gh-actions
4144
ci-lint-gh-actions:
42-
$(UV_RUN_CMD) zizmor --pedantic --collect=all --strict-collection --fix .
45+
$(ZIZMOR_CMD) ./.github
4346

4447
.PHONY: ci-lint-python
4548
ci-lint-python:

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ lint = [
5757
"basedpyright>=1.39.4",
5858
"ruff>=0.15.12",
5959
"mbake>=1.4.6",
60-
"zizmor==1.24.1",
60+
"zizmor==1.25.2",
6161
]
6262
dev = [
6363
"rich>=15.0.0",

‎uv.lock‎

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)