Skip to content

Commit 3614096

Browse files
tleonhardttleonhardt
committed
Merge branch '3.0.0' into rich_phase_1
Tests were broken on this branch to start with, everything else looks good. Conflicts were minimal - one function in argparse_custom.py that looked like it was deleted.
2 parents db27195 + 57d08e7 commit 3614096

24 files changed

+387
-263
lines changed

‎.github/CONTRIBUTING.md‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,20 @@ The tables below list all prerequisites along with the minimum required version
6464

6565
#### Additional prerequisites for developing cmd2
6666

67-
| Prerequisite | Minimum Version | Purpose |
68-
| ------------------------------------------------------------------------------------------ | --------------- | --------------------------------- |
69-
| [codecov](http://doc.pytest.org/en/latest/) | `2.1.13` | Cover coverage reporting |
70-
| [invoke](https://www.pyinvoke.org/) | `2.2.0` | Command automation |
71-
| [griffe_typingdoc](https://github.com/mkdocstrings/griffe-typingdoc) | `0.2.7` | mkdocstrings extension for typing |
72-
| [mypy](https://mypy-lang.org/) | `1.13.0` | Static type checker |
73-
| [pytest](https://docs.pytest.org/en/stable/) | `3.0.6` | Unit and integration tests |
74-
| [pytest-cov](http://doc.pytest.org/en/latest/) | `6.0.0` | Pytest code coverage |
75-
| [pytest-mock](https://pypi.org/project/pytest-mock/) | `3.14.0` | Pytest mocker fixture |
76-
| [mkdocs-include-markdown-plugin](https://pypi.org/project/mkdocs-include-markdown-plugin/) | `7.1.2` | MkDocs Plugin include MkDn |
77-
| [mkdocs-macros-plugin](https://mkdocs-macros-plugin.readthedocs.io/) | `1.3.7` | MkDocs Plugin for macros |
78-
| [mkdocs-material](https://squidfunk.github.io/mkdocs-material/) | `9.5.49` | Documentation |
79-
| [mkdocstrings[python]](https://mkdocstrings.github.io/) | `0.27.0` | MkDocs Plugin for Python AutoDoc |
80-
| [ruff](https://github.com/astral-sh/ruff) | `0.7.3` | Fast linter and formatter |
81-
| [uv](https://github.com/astral-sh/uv) | `0.5.1` | Python package management |
67+
| Prerequisite | Minimum Version | Purpose |
68+
| ------------------------------------------------------------------------------------------ | --------------- | -------------------------------- |
69+
| [codecov](http://doc.pytest.org/en/latest/) | `2.1.13` | Cover coverage reporting |
70+
| [invoke](https://www.pyinvoke.org/) | `2.2.0` | Command automation |
71+
| [mypy](https://mypy-lang.org/) | `1.13.0` | Static type checker |
72+
| [pytest](https://docs.pytest.org/en/stable/) | `3.0.6` | Unit and integration tests |
73+
| [pytest-cov](http://doc.pytest.org/en/latest/) | `6.0.0` | Pytest code coverage |
74+
| [pytest-mock](https://pypi.org/project/pytest-mock/) | `3.14.0` | Pytest mocker fixture |
75+
| [mkdocs-include-markdown-plugin](https://pypi.org/project/mkdocs-include-markdown-plugin/) | `7.1.2` | MkDocs Plugin include MkDn |
76+
| [mkdocs-macros-plugin](https://mkdocs-macros-plugin.readthedocs.io/) | `1.3.7` | MkDocs Plugin for macros |
77+
| [mkdocs-material](https://squidfunk.github.io/mkdocs-material/) | `9.5.49` | Documentation |
78+
| [mkdocstrings[python]](https://mkdocstrings.github.io/) | `0.27.0` | MkDocs Plugin for Python AutoDoc |
79+
| [ruff](https://github.com/astral-sh/ruff) | `0.7.3` | Fast linter and formatter |
80+
| [uv](https://github.com/astral-sh/uv) | `0.5.1` | Python package management |
8281

8382
If Python is already installed in your machine, run the following commands to validate the versions:
8483

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
os: [ubuntu-latest, macos-latest, windows-latest]
13-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
13+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev"]
1414
runs-on: ${{ matrix.os }}
1515
steps:
1616
- uses: actions/checkout@v4 # https://github.com/actions/checkout
@@ -19,7 +19,7 @@ jobs:
1919
# Set fetch-depth: 0 to fetch all history for all branches and tags.
2020
fetch-depth: 0 # Needed for setuptools_scm to work correctly
2121
- name: Install uv
22-
uses: astral-sh/setup-uv@v5
22+
uses: astral-sh/setup-uv@v6
2323

2424
- name: Set up Python ${{ matrix.python-version }}
2525
uses: actions/setup-python@v5

‎.github/workflows/doc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
# Set fetch-depth: 0 to fetch all history for all branches and tags.
2323
fetch-depth: 0 # Needed for setuptools_scm to work correctly
2424
- name: Install uv and set the python version
25-
uses: astral-sh/setup-uv@v5
25+
uses: astral-sh/setup-uv@v6
2626
with:
2727
python-version: ${{ matrix.python-version }}
2828
- name: Install the project

‎.github/workflows/mypy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# Set fetch-depth: 0 to fetch all history for all branches and tags.
1818
fetch-depth: 0 # Needed for setuptools_scm to work correctly
1919
- name: Install uv and set the python version
20-
uses: astral-sh/setup-uv@v5
20+
uses: astral-sh/setup-uv@v6
2121
with:
2222
python-version: 3.13
2323
- name: Install the project

‎.pre-commit-config.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ repos:
88
- id: trailing-whitespace
99

1010
- repo: https://github.com/astral-sh/ruff-pre-commit
11-
rev: "v0.9.2"
11+
rev: "v0.11.10"
1212
hooks:
1313
- id: ruff-format
1414
args: [--config=pyproject.toml]
15+
- id: ruff-check
16+
args: [--config=pyproject.toml, --fix]
1517

1618
- repo: https://github.com/pre-commit/mirrors-prettier
1719
rev: "v3.1.0"
1820
hooks:
1921
- id: prettier
2022
additional_dependencies:
21-
- prettier@3.4.2
22-
- [email protected].1
23+
- prettier@3.5.3
24+
- [email protected].5

0 commit comments

Comments
 (0)