Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/make-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
check:
runs-on: ubuntu-24.04
strategy:
fail-fast: false
fail-fast: true
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -36,9 +36,15 @@ jobs:
python -m pip install uv
sudo apt-get install npm
npm install --global prettier
- name: Set python version file for uv
run: |
echo "${{ matrix.python-version }}" > .python-version
- name: Run make check
run: |
make check
- name: Reset python version file
run: |
git restore .python-version
- name: See if there are changes
run: |
git diff --exit-code
Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.13
3.14
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ venv:
uv sync

format: venv
uv tool run black .
uv tool run black . --target-version py310
prettier . --write

lint: venv
uv tool run black --check .
uv tool run black --check . --fast
uv tool run flake8 src/ --ignore=E203,W503,E722,E731 --max-complexity=100 --max-line-length=160
uv tool run pyflakes src/
uv tool run pyright src/
Expand Down
2 changes: 1 addition & 1 deletion src/cfengine_cli/lint.py
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ def _lint_node(node: Node, policy_file: PolicyFile, state: State) -> int:
):
_highlight_range(node, lines)
print(
f"Error: {"Bundle" if "bundle" in node.type else "Body"} '{_text(node)}' conflicts with built-in function with the same name {location}"
f"Error: {'Bundle' if 'bundle' in node.type else 'Body'} '{_text(node)}' conflicts with built-in function with the same name {location}"
)
return 1
if node.type == "calling_identifier":
Expand Down
Loading