Skip to content

Commit 31cc7c9

Browse files
committed
Merge branch '3.0.0' into rich_phase_1
2 parents 7ba58d9 + 5c71df0 commit 31cc7c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1660
-1399
lines changed

.github/CODE_OF_CONDUCT.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ orientation.
1414
Examples of behavior that contributes to creating a positive environment
1515
include:
1616

17-
* Using welcoming and inclusive language
18-
* Being respectful of differing viewpoints and experiences
19-
* Gracefully accepting constructive criticism
20-
* Focusing on what is best for the community
21-
* Showing empathy towards other community members
17+
- Using welcoming and inclusive language
18+
- Being respectful of differing viewpoints and experiences
19+
- Gracefully accepting constructive criticism
20+
- Focusing on what is best for the community
21+
- Showing empathy towards other community members
2222

2323
Examples of unacceptable behavior by participants include:
2424

25-
* The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
27-
* Trolling, insulting/derogatory comments, and personal or political attacks
28-
* Public or private harassment
29-
* Publishing others' private information, such as a physical or electronic
25+
- The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
- Trolling, insulting/derogatory comments, and personal or political attacks
28+
- Public or private harassment
29+
- Publishing others' private information, such as a physical or electronic
3030
address, without explicit permission
31-
* Other conduct which could reasonably be considered inappropriate in a
31+
- Other conduct which could reasonably be considered inappropriate in a
3232
professional setting
3333

3434
## Our Responsibilities

.github/CONTRIBUTING.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The tables below list all prerequisites along with the minimum required version
4747
#### Prerequisites to run cmd2 applications
4848

4949
| Prerequisite | Minimum Version | Purpose |
50-
|----------------------------------------------------------|-----------------|----------------------------------------|
50+
| -------------------------------------------------------- | --------------- | -------------------------------------- |
5151
| [python](https://www.python.org/downloads/) | `3.9` | Python programming language |
5252
| [pyperclip](https://github.com/asweigart/pyperclip) | `1.8.2` | Cross-platform clipboard functions |
5353
| [rich-argparse](https://pypi.org/project/rich-argparse/) | `1.6.0` | Rich help formatters for argparse |
@@ -56,7 +56,7 @@ The tables below list all prerequisites along with the minimum required version
5656
#### Additional prerequisites to build and publish cmd2
5757

5858
| Prerequisite | Minimum Version | Purpose |
59-
|----------------------------------------------------------|-----------------|-------------------------------------|
59+
| -------------------------------------------------------- | --------------- | ----------------------------------- |
6060
| [build](https://pypi.org/project/build/) | `1.2.2` | Python build frontend |
6161
| [setuptools](https://pypi.org/project/setuptools/) | `72.1.0` | Python package management |
6262
| [setuptools-scm](https://github.com/pypa/setuptools-scm) | `8.0.4` | Manage your versions by scm tag s |
@@ -484,17 +484,17 @@ how to do it.
484484
4. The title (also called the subject) of your PR should be descriptive of your
485485
changes and succinctly indicate what is being fixed
486486

487-
- **Do not add the issue number in the PR title or commit message**
487+
- **Do not add the issue number in the PR title or commit message**
488488

489-
- Examples: `Add test cases for Unicode support`; `Correct typo in overview documentation`
489+
- Examples: `Add test cases for Unicode support`; `Correct typo in overview documentation`
490490

491491
5. In the body of your PR include a more detailed summary of the changes you
492492
made and why
493493

494-
- If the PR is meant to fix an existing bug/issue, then, at the end of
495-
your PR's description, append the keyword `closes` and #xxxx (where xxxx
496-
is the issue number). Example: `closes #1337`. This tells GitHub to
497-
close the existing issue if the PR is merged.
494+
- If the PR is meant to fix an existing bug/issue, then, at the end of
495+
your PR's description, append the keyword `closes` and #xxxx (where xxxx
496+
is the issue number). Example: `closes #1337`. This tells GitHub to
497+
close the existing issue if the PR is merged.
498498

499499
6. Indicate what local testing you have done (e.g. what OS and version(s) of Python did you run the
500500
unit test suite with)
@@ -635,7 +635,7 @@ mostly automated. The manual steps are all git operations. Here's the checklist:
635635
1. Make sure latest year in `LICENSE` matches current year
636636
1. Make sure `CHANGELOG.md` describes the version and has the correct release date
637637
1. Add a git tag representing the version number using `invoke tag x.y.z`
638-
- Where x, y, and z are all small non-negative integers
638+
- Where x, y, and z are all small non-negative integers
639639
1. (Optional) Run `invoke pypi-test` to clean, build, and upload a new release to [Test PyPi](https://test.pypi.org)
640640
1. Run `invoke pypi` to clean, build, and upload a new release to [PyPi](https://pypi.org/)
641641

.github/dependabot.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "github-actions"
4-
directory: "/"
5-
schedule:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
66
interval: "weekly"
77

8-
- package-ecosystem: "pip"
9-
directory: "/"
10-
schedule:
8+
- package-ecosystem: "pip"
9+
directory: "/"
10+
schedule:
1111
interval: "weekly"

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
33
name: "build"
44

5-
on: [ push, pull_request ]
5+
on: [push, pull_request]
66

77
jobs:
88
build:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
os: [ ubuntu-latest, macos-latest, windows-latest ]
13-
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
12+
os: [ubuntu-latest, macos-latest, windows-latest]
13+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
1414
runs-on: ${{ matrix.os }}
1515
steps:
1616
- uses: actions/checkout@v4 # https://github.com/actions/checkout

.github/workflows/codeql-analysis.yml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ on:
77
# The branches below must be a subset of the branches above
88
branches: [master]
99
schedule:
10-
- cron: '0 6 * * 4'
10+
- cron: "0 6 * * 4"
1111

1212
permissions:
1313
contents: read
1414

1515
jobs:
1616
analyze:
1717
permissions:
18-
actions: read # for github/codeql-action/init to get workflow details
19-
contents: read # for actions/checkout to fetch code
20-
security-events: write # for github/codeql-action/autobuild to send a status report
18+
actions: read # for github/codeql-action/init to get workflow details
19+
contents: read # for actions/checkout to fetch code
20+
security-events: write # for github/codeql-action/autobuild to send a status report
2121
name: Analyze
2222
runs-on: ubuntu-latest
2323

@@ -26,48 +26,48 @@ jobs:
2626
matrix:
2727
# Override automatic language detection by changing the below list
2828
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
29-
language: ['python']
29+
language: ["python"]
3030
# Learn more...
3131
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
3232

3333
steps:
34-
- name: Checkout repository
35-
uses: actions/checkout@v4
36-
with:
37-
# We must fetch at least the immediate parents so that if this is
38-
# a pull request then we can checkout the head.
39-
fetch-depth: 2
34+
- name: Checkout repository
35+
uses: actions/checkout@v4
36+
with:
37+
# We must fetch at least the immediate parents so that if this is
38+
# a pull request then we can checkout the head.
39+
fetch-depth: 2
4040

41-
# If this run was triggered by a pull request event, then checkout
42-
# the head of the pull request instead of the merge commit.
43-
- run: git checkout HEAD^2
44-
if: ${{ github.event_name == 'pull_request' }}
41+
# If this run was triggered by a pull request event, then checkout
42+
# the head of the pull request instead of the merge commit.
43+
- run: git checkout HEAD^2
44+
if: ${{ github.event_name == 'pull_request' }}
4545

46-
# Initializes the CodeQL tools for scanning.
47-
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@v3
49-
with:
50-
languages: ${{ matrix.language }}
51-
# If you wish to specify custom queries, you can do so here or in a config file.
52-
# By default, queries listed here will override any specified in a config file.
53-
# Prefix the list here with "+" to use these queries and those in the config file.
54-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
46+
# Initializes the CodeQL tools for scanning.
47+
- name: Initialize CodeQL
48+
uses: github/codeql-action/init@v3
49+
with:
50+
languages: ${{ matrix.language }}
51+
# If you wish to specify custom queries, you can do so here or in a config file.
52+
# By default, queries listed here will override any specified in a config file.
53+
# Prefix the list here with "+" to use these queries and those in the config file.
54+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5555

56-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
57-
# If this step fails, then you should remove it and run the build manually (see below)
58-
- name: Autobuild
59-
uses: github/codeql-action/autobuild@v3
56+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
57+
# If this step fails, then you should remove it and run the build manually (see below)
58+
- name: Autobuild
59+
uses: github/codeql-action/autobuild@v3
6060

61-
# ℹ️ Command-line programs to run using the OS shell.
62-
# 📚 https://git.io/JvXDl
61+
# ℹ️ Command-line programs to run using the OS shell.
62+
# 📚 https://git.io/JvXDl
6363

64-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
65-
# and modify them (or add more) to build your code if your project
66-
# uses a compiled language
64+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
65+
# and modify them (or add more) to build your code if your project
66+
# uses a compiled language
6767

68-
#- run: |
69-
# make bootstrap
70-
# make release
68+
#- run: |
69+
# make bootstrap
70+
# make release
7171

72-
- name: Perform CodeQL Analysis
73-
uses: github/codeql-action/analyze@v3
72+
- name: Perform CodeQL Analysis
73+
uses: github/codeql-action/analyze@v3

.github/workflows/format.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
33
name: Format
44

5-
on: [ push, pull_request ]
5+
on: [push, pull_request]
66

77
permissions:
88
contents: read
@@ -11,7 +11,7 @@ jobs:
1111
format:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4 # https://github.com/actions/checkout
14+
- uses: actions/checkout@v4 # https://github.com/actions/checkout
1515
with:
1616
# Only a single commit is fetched by default, for the ref/SHA that triggered the workflow.
1717
# Set fetch-depth: 0 to fetch all history for all branches and tags.

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
33
name: Lint
44

5-
on: [ push, pull_request ]
5+
on: [push, pull_request]
66

77
permissions:
88
contents: read
@@ -11,7 +11,7 @@ jobs:
1111
lint:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4 # https://github.com/actions/checkout
14+
- uses: actions/checkout@v4 # https://github.com/actions/checkout
1515
with:
1616
# Only a single commit is fetched by default, for the ref/SHA that triggered the workflow.
1717
# Set fetch-depth: 0 to fetch all history for all branches and tags.

.github/workflows/mypy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
33
name: MyPy
44

5-
on: [ push, pull_request ]
5+
on: [push, pull_request]
66

77
permissions:
88
contents: read

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,8 @@ Pipfile.lock
5050

5151
# uv
5252
uv.lock
53+
54+
# Node/npm used for installing Prettier locally to override the outdated version that is bundled with the VSCode extension
55+
node_modules/
56+
package-lock.json
57+
package.json

.prettierrc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"overrides": [
3-
{
4-
"files": "*.md",
5-
"options": {
6-
"tabWidth": 4
7-
}
2+
"overrides": [
3+
{
4+
"files": "*.md",
5+
"options": {
6+
"tabWidth": 4
87
}
9-
]
10-
}
8+
}
9+
]
10+
}

0 commit comments

Comments
 (0)