Skip to content

Commit 14a0cb1

Browse files
blakeNaccaratoblakeNaccarato
committed
Sync with template
1 parent 67d33b7 commit 14a0cb1

22 files changed

+192
-159
lines changed

‎.all-contributorsrc‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
{
22
"commitConvention": "angular",
3-
"commitType": "docs",
43
"contributorsPerLine": 7,
54
"files": [
6-
"CONTRIBUTORS.md",
7-
"README.md"
5+
"CONTRIBUTORS.md",
6+
"README.md"
87
],
98
"projectName": "boilercore",
10-
"projectOwner": "softboiler"
9+
"projectOwner": "softboiler",
10+
"commitType": "docs",
11+
"contributors": [
12+
{
13+
"login": "blakeNaccarato",
14+
"name": "Blake Naccarato",
15+
"avatar_url": "https://avatars.githubusercontent.com/u/20692450?v=4",
16+
"profile": "https://www.blakenaccarato.com/",
17+
"contributions": [
18+
"code"
19+
]
20+
}
21+
]
1122
}

‎.copier-answers.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: 2024.1.1-11-g3eb904d
2+
_commit: 2024.1.1-41-g4b4fb7f
33
_src_path: gh:blakeNaccarato/copier-python
44
actions_runner: ubuntu-22.04
55
active: true

‎.devcontainer/devcontainer.json‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"ghcr.io/devcontainers/features/powershell:1.4.0": {
66
"version": "7.4.1"
77
},
8-
"ghcr.io/devcontainers/features/python:1.6.1": {
8+
"ghcr.io/devcontainers/features/python:1.6.2": {
99
"version": "3.11"
1010
},
1111
"ghcr.io/devcontainers/features/desktop-lite:1.2.0": {
@@ -57,41 +57,48 @@
5757
"pythonREPLSmartSend",
5858
"pythonTestAdapter",
5959
"pythonTerminalEnvVarActivation"
60-
]
60+
],
61+
// ? Not picked up in workspace settings in Codespaces
62+
"[python]": {
63+
"editor.defaultFormatter": "charliermarsh.ruff",
64+
"editor.wordWrap": "off"
65+
},
66+
"[ipynb]": {
67+
"editor.defaultFormatter": "charliermarsh.ruff",
68+
"editor.wordWrap": "off"
69+
}
6170
},
6271
"extensions": [
6372
"aaron-bond.better-comments@3.0.2",
64-
"bierner.markdown-mermaid@1.22.0",
73+
"bierner.markdown-mermaid@1.23.1",
6574
"bierner.markdown-preview-github-styles@2.0.4",
66-
"charliermarsh.ruff@2024.16.0",
67-
"davidanson.vscode-markdownlint@0.54.0",
75+
"charliermarsh.ruff@2024.30.0",
76+
"davidanson.vscode-markdownlint@0.55.0",
6877
"donjayamanne.githistory@0.6.20",
69-
"eamodio.gitlens@14.9.0",
78+
"eamodio.gitlens@15.1.0",
7079
"esbenp.prettier-vscode@10.4.0",
7180
"executablebookproject.myst-highlight@0.11.0",
72-
"github.codespaces@1.16.17",
81+
"github.codespaces@1.16.23",
7382
"GitHub.remotehub@0.62.0",
74-
"github.vscode-github-actions@0.26.2",
75-
"github.vscode-pull-request-github@0.80.1",
76-
"iterative.dvc@1.2.11",
77-
"ms-azuretools.vscode-docker@1.29.0",
78-
"ms-python.debugpy@2024.2.0",
79-
"ms-python.python@2024.2.1",
80-
"ms-python.vscode-pylance@2024.3.2",
81-
"ms-toolsai.jupyter@2024.1.1",
82-
"ms-vscode-remote.remote-containers@0.353.0",
83+
"github.vscode-github-actions@0.26.3",
84+
"github.vscode-pull-request-github@0.88.1",
85+
"iterative.dvc@1.2.14",
86+
"ms-azuretools.vscode-docker@1.29.1",
87+
"ms-python.debugpy@2024.6.0",
88+
"ms-python.python@2024.8.1",
89+
"ms-python.vscode-pylance@2024.6.1",
90+
"ms-toolsai.jupyter@2024.4.0",
91+
"ms-vscode-remote.remote-containers@0.369.0",
8392
"ms-vscode.powershell@2024.2.2",
8493
"njpwerner.autodocstring@0.6.1",
85-
"njpwerner.autodocstring@0.6.1",
86-
"redhat.vscode-yaml@1.14.0",
87-
"rodolphebarbanneau.python-docstring-highlighter@0.2.3",
94+
"redhat.vscode-yaml@1.15.0",
8895
"rodolphebarbanneau.python-docstring-highlighter@0.2.3",
8996
"ryanluker.vscode-coverage-gutters@2.11.1",
90-
"sourcery.sourcery@1.16.0",
97+
"sourcery.sourcery@1.19.0",
9198
"stkb.rewrap@1.16.3",
9299
"TakumiI.markdowntable@0.11.0",
93100
"tamasfe.even-better-toml@0.19.2",
94-
"yy0931.mplstyle@1.14.3",
101+
"yy0931.mplstyle@1.14.4",
95102
"yzhang.markdown-all-in-one@3.6.2"
96103
]
97104
}

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,9 @@ jobs:
155155
- "macos-13"
156156
- "ubuntu-22.04"
157157
- "windows-2022"
158-
# ? https://github.com/actions/python-versions/releases
159158
python:
160-
# - "3.10" # ? Using some 3.11-specific features
161159
- "3.11"
162160
- "3.12"
163-
# - "3.13.0-beta.2" # ? https://github.com/indygreg/python-zstandard/issues/210
164-
# - "3.14.0-alpha.0" # ? https://github.com/PyO3/pyo3/issues/3555
165161
runs-on: "${{ matrix.runner }}"
166162
steps:
167163
- uses: "actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332" # v4.1.7

‎.github/workflows/high.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ jobs:
115115
- "macos-13"
116116
- "ubuntu-22.04"
117117
- "windows-2022"
118-
python: ["3.11"]
118+
python:
119+
- "3.11"
120+
- "3.12"
119121
runs-on: "${{ matrix.runner }}"
120122
steps:
121123
- uses: "actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332" # v4.1.7

‎.github/workflows/release.yml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
# Publish release
22
name: "release"
3+
concurrency:
4+
group: "${{ github.workflow }}-${{ github.ref }}"
5+
cancel-in-progress: True
36
on:
47
release:
58
types: ["published"]
9+
defaults:
10+
run:
11+
shell: "pwsh"
612
jobs:
713
release:
814
permissions:
@@ -22,8 +28,8 @@ jobs:
2228
- uses: "actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d" # v5.1.0
2329
with:
2430
python-version: "${{ matrix.python }}"
25-
- run: "curl -LsSf https://astral.sh/uv/install.sh | sh"
26-
- run: "python -m pip install build; python -m build --installer uv"
31+
- run: "scripts/Sync-Py.ps1 -Release"
32+
- run: ". scripts/Initialize-Shell.ps1; python -m build --installer uv"
2733
- uses: actions/attest-build-provenance@bdd51370e0416ac948727f861e03c2f05d32d78e # v1.3.2
2834
with:
2935
subject-path: "dist/**"
@@ -32,4 +38,7 @@ jobs:
3238
GITHUB_TOKEN: "${{ github.token }}"
3339
- uses: "pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0" # v1.9.0
3440
changerelease:
41+
needs: "release"
42+
permissions:
43+
contents: "write"
3544
uses: "./.github/workflows/changerelease.yml"

‎.vscode/settings.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
"git.confirmNoVerifyCommit": false,
4545
"git.commandsToLog": ["commit", "push"],
4646
//! Line-width
47+
"git.inputValidation": true,
4748
"git.inputValidationSubjectLength": 88,
4849
"git.inputValidationLength": 1e100,
4950
"editor.wordWrapColumn": 88,

‎.vscode/tasks.json‎

Lines changed: 43 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,25 @@
55
"version": "2.0.0",
66
"inputs": [
77
{
8-
"id": "stage",
8+
"id": "templateOptions",
99
"type": "pickString",
10-
"description": "stage",
11-
"default": "",
12-
"options": ["", "modelfun"]
10+
"description": "Template options.",
11+
"options": ["", "-Prompt", "-Stay", "-Stay -Prompt", "-Recopy -Prompt"]
1312
},
1413
{
15-
"id": "version",
14+
"id": "ref",
1615
"type": "promptString",
17-
"description": "Version number."
16+
"description": "Commit SHA or other VCS reference."
1817
},
1918
{
2019
"id": "dependency",
2120
"type": "promptString",
2221
"description": "Show tree of packages requesting this dependency."
2322
},
2423
{
25-
"id": "templateOptions",
26-
"type": "pickString",
27-
"description": "Template options.",
28-
"options": ["", "-Prompt", "-Stay", "-Stay -Prompt", "-Recopy -Prompt"]
29-
},
30-
{
31-
"id": "ref",
24+
"id": "version",
3225
"type": "promptString",
33-
"description": "Commit SHA or other VCS reference.",
26+
"description": "Version number."
3427
},
3528
{
3629
"id": "changeType",
@@ -156,46 +149,38 @@
156149
"icon": { "id": "file-symlink-directory" },
157150
"problemMatcher": []
158151
},
152+
{
153+
"label": "setup: Finish initializing machine (cross-platform)",
154+
"type": "shell",
155+
"command": "scripts/Initialize-Machine.ps1",
156+
"icon": { "id": "file-symlink-directory" },
157+
"problemMatcher": []
158+
},
159159

160160
// * -------------------------------------------------------------------------- * //
161-
// * PRE-COMMIT * //
161+
// * OTHER TASKS * //
162162

163163
{
164-
"label": "pre-commit",
164+
"label": "task: pre-commit",
165165
"type": "shell",
166166
"command": ". scripts/Initialize-Shell.ps1; pre-commit",
167167
"icon": { "id": "git-commit" },
168168
"problemMatcher": []
169169
},
170170
{
171-
"label": "pre-commit: all",
171+
"label": "task: pre-commit (all)",
172172
"type": "shell",
173173
"command": ". scripts/Initialize-Shell.ps1; pre-commit run --all-files",
174174
"icon": { "id": "git-commit" },
175175
"problemMatcher": []
176176
},
177-
178-
// * -------------------------------------------------------------------------- * //
179-
// * GIT * //
180-
181177
{
182-
"label": "git: Rebase back to fork",
178+
"label": "task: Rebase back to fork",
183179
"type": "shell",
184180
"command": "git rebase -i --fork-point main",
185181
"icon": { "id": "git-branch" },
186182
"problemMatcher": []
187183
},
188-
189-
// * -------------------------------------------------------------------------- * //
190-
// * OTHER TASKS * //
191-
192-
{
193-
"label": "task: Generate changelog entry",
194-
"type": "shell",
195-
"command": ". scripts/Initialize-Shell.ps1; python -m boilercore_tools add-change ${input:changeType}",
196-
"icon": { "id": "request-changes" },
197-
"problemMatcher": []
198-
},
199184
{
200185
"label": "task: Show tree of packages requesting a dependency",
201186
"type": "shell",
@@ -225,14 +210,14 @@
225210
"problemMatcher": []
226211
},
227212
{
228-
"label": "task: profile this file",
213+
"label": "task: Profile this file",
229214
"type": "shell",
230215
"command": ". scripts/Initialize-Shell.ps1; python -m cProfile -o .prof ${file}",
231216
"icon": { "id": "graph-line" },
232217
"problemMatcher": []
233218
},
234219
{
235-
"label": "task: view profile results with snakeviz",
220+
"label": "task: View profile results with snakeviz",
236221
"type": "shell",
237222
"command": ". scripts/Initialize-Shell.ps1; snakeviz .prof",
238223
"icon": { "id": "graph-line" },
@@ -241,8 +226,29 @@
241226
{
242227
"label": "task: Bump version",
243228
"type": "shell",
244-
"command": "copier update --vcs-ref=$(git rev-parse HEAD:submodules/template) --defaults --data project_version='${input:version}'; git add .; git commit -m 'Bump version'; towncrier build --version '${input:version}'",
245-
"icon": { "id": "graph-line" },
229+
"command": ". scripts/Initialize-Shell.ps1; copier update --vcs-ref=$(git rev-parse HEAD:submodules/template) --defaults --data project_version='${input:version}'; towncrier build --yes --version '${input:version}'; git add .; git commit -m '${input:version}'",
230+
"icon": { "id": "tag" },
231+
"problemMatcher": []
232+
},
233+
{
234+
"label": "task: Release version",
235+
"type": "shell",
236+
"command": ". scripts/Initialize-Shell.ps1; $version = (Get-Content '.copier-answers.yml' | Select-String -Pattern '^project_version:\\s(.+)$').Matches.Groups[1].value; git tag --sign -m $version $version; git push; gh release create --discussion-category='announcements' --notes='' --title=$version --verify-tag $version",
237+
"icon": { "id": "tag" },
238+
"problemMatcher": []
239+
},
240+
{
241+
"label": "task: Update changelog",
242+
"type": "shell",
243+
"command": ". scripts/Initialize-Shell.ps1; python -m boilercore_tools add-change ${input:changeType}",
244+
"icon": { "id": "tag" },
245+
"problemMatcher": []
246+
},
247+
{
248+
"label": "task: Update changelog with the latest commit's message",
249+
"type": "shell",
250+
"command": ". scripts/Initialize-Shell.ps1; towncrier create +$((Get-Date).ToUniversalTime().ToString('o').Replace(':','-')).change.md --content $($(git log -1 --format='%s') + ' ([' + $(git rev-parse --short HEAD) + '](https://github.com/softboiler/boilercore/commit/' + $(git rev-parse HEAD) + '))\n')",
251+
"icon": { "id": "tag" },
246252
"problemMatcher": []
247253
}
248254
]

‎CONTRIBUTORS.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
11
# Contributors
22

33
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
4+
<!-- prettier-ignore-start -->
5+
<!-- markdownlint-disable -->
6+
<table>
7+
<tbody>
8+
<tr>
9+
<td align="center" valign="top" width="14.28%"><a href="https://www.blakenaccarato.com/"><img src="https://avatars.githubusercontent.com/u/20692450?v=4?s=100" width="100px;" alt="Blake Naccarato"/><br /><sub><b>Blake Naccarato</b></sub></a><br /><a href="#code-blakeNaccarato" title="Code">💻</a></td>
10+
</tr>
11+
</tbody>
12+
</table>
13+
14+
<!-- markdownlint-restore -->
15+
<!-- prettier-ignore-end -->
16+
417
<!-- ALL-CONTRIBUTORS-LIST:END -->

‎README.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,17 @@ pip install 'cachier @ git+https://github.com/blakeNaccarato/cachier@db7f394a553
1818
## Contributors
1919

2020
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
21+
<!-- prettier-ignore-start -->
22+
<!-- markdownlint-disable -->
23+
<table>
24+
<tbody>
25+
<tr>
26+
<td align="center" valign="top" width="14.28%"><a href="https://www.blakenaccarato.com/"><img src="https://avatars.githubusercontent.com/u/20692450?v=4?s=100" width="100px;" alt="Blake Naccarato"/><br /><sub><b>Blake Naccarato</b></sub></a><br /><a href="#code-blakeNaccarato" title="Code">💻</a></td>
27+
</tr>
28+
</tbody>
29+
</table>
30+
31+
<!-- markdownlint-restore -->
32+
<!-- prettier-ignore-end -->
33+
2134
<!-- ALL-CONTRIBUTORS-LIST:END -->

0 commit comments

Comments
 (0)