Skip to content

Commit 60bbad9

Browse files
committed
Merge branch 'main' into consolidated_toolbar
# Conflicts: # CHANGELOG.md # cmd2/cmd2.py # cmd2/utils.py # tests/conftest.py
2 parents 2e3d2d5 + 93cfe81 commit 60bbad9

40 files changed

Lines changed: 4781 additions & 333 deletions

‎.coveragerc‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎.github/CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Linux). You can install `uv` using instructions at the link above.
117117
You can then install multiple versions of Python using `uv` like so:
118118

119119
```sh
120-
uv python install 3.11 3.12 3.13 3.14
120+
uv python install 3.11 3.12 3.13 3.14 3.15
121121
```
122122

123123
### Forking the project

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
# Initializes the CodeQL tools for scanning.
4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@v4.37.9
48+
uses: github/codeql-action/init@v4.38.3
4949
with:
5050
languages: ${{ matrix.language }}
5151
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
5656
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below)
5858
- name: Autobuild
59-
uses: github/codeql-action/autobuild@v4.37.9
59+
uses: github/codeql-action/autobuild@v4.38.3
6060

6161
# ℹ️ Command-line programs to run using the OS shell.
6262
# 📚 https://git.io/JvXDl
@@ -70,4 +70,4 @@ jobs:
7070
# make release
7171

7272
- name: Perform CodeQL Analysis
73-
uses: github/codeql-action/analyze@v4.37.9
73+
uses: github/codeql-action/analyze@v4.38.3

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Install uv and set the python version
2525
uses: astral-sh/setup-uv@v7
2626
with:
27-
python-version: "3.14"
27+
python-version: "3.15"
2828
- name: Install the project
2929
run: uv sync --no-default-groups --group docs
3030
- name: Check if the Zensical documentation can be built

‎.github/workflows/quality.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Install uv and set the python version
2727
uses: astral-sh/setup-uv@v7
2828
with:
29-
python-version: "3.14"
29+
python-version: "3.15"
3030
- name: Install the project
3131
run: uv sync --no-default-groups --group quality
3232
- name: Run prek

‎.github/workflows/tests.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [ubuntu-latest, macos-latest, windows-latest]
15-
python-version: ["3.11", "3.12", "3.13", "3.14", "3.14t", "3.15-dev"]
15+
python-version: ["3.11", "3.12", "3.13", "3.14", "3.15", "3.15t"]
1616
fail-fast: false
1717

1818
runs-on: ${{ matrix.os }}
@@ -36,9 +36,7 @@ jobs:
3636
run: uv sync --no-default-groups --group test
3737

3838
- name: Run tests
39-
run:
40-
uv run --no-default-groups --group test python -Xutf8 -m pytest --cov
41-
--cov-config=pyproject.toml --cov-report=xml tests
39+
run: uv run --no-default-groups --group test python -Xutf8 -m pytest tests
4240

4341
- name: Upload test results to Codecov
4442
if: ${{ !cancelled() }}

‎.github/workflows/typecheck.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
python-version: ["3.11", "3.12", "3.13", "3.14"]
18+
python-version: ["3.11", "3.12", "3.13", "3.14", "3.15"]
1919
fail-fast: false
2020
defaults:
2121
run:

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repos:
1515
- id: trailing-whitespace
1616

1717
- repo: https://github.com/astral-sh/ruff-pre-commit
18-
rev: "v0.16.6"
18+
rev: "v0.17.0"
1919
hooks:
2020
- id: ruff-format
2121
args: [--config=ruff.toml]
@@ -31,7 +31,7 @@ repos:
3131
- prettier-plugin-toml@2.0.6
3232

3333
- repo: https://github.com/crate-ci/typos
34-
rev: v1.50.0
34+
rev: v1.51.1
3535
hooks:
3636
- id: typos
3737
exclude: |

‎.prettierrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"endOfLine": "lf",
23
"printWidth": 100,
34
"proseWrap": "always",
45
"overrides": [

‎AGENTS.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ project, which utilizes `uv` for environment and package management.
1515
- **New Dependencies:** If a new dependency is required, please state the reason for its inclusion.
1616
- Do not commit spec, plan, or markdown documents to git without asking first.
1717
- Save plans to `~/.superpowers/plans/` instead of the project directory.
18+
- This project uses a 127 character maximum line length for all Python code, including for comments.
19+
- This project uses a 100 character maximum line length for Markdown files.
1820

1921
## Python Code Standards
2022

0 commit comments

Comments
 (0)