Skip to content

Commit 2cfd668

Browse files
blakeNaccaratoblakeNaccarato
committed
Sync with template
1 parent 72117c1 commit 2cfd668

8 files changed

+105
-43
lines changed

‎.all-contributorsrc

+14-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,20 @@
22
"commitConvention": "angular",
33
"contributorsPerLine": 7,
44
"files": [
5-
"CONTRIBUTORS.md",
6-
"README.md"
5+
"CONTRIBUTORS.md",
6+
"README.md"
77
],
88
"projectName": "boilerdaq",
9-
"projectOwner": "softboiler"
9+
"projectOwner": "softboiler",
10+
"contributors": [
11+
{
12+
"login": "blakeNaccarato",
13+
"name": "Blake Naccarato",
14+
"avatar_url": "https://avatars.githubusercontent.com/u/20692450?v=4",
15+
"profile": "https://www.blakenaccarato.com/",
16+
"contributions": [
17+
"code"
18+
]
19+
}
20+
]
1021
}

‎.copier-answers.yml

+1-1
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-29-g1573619
2+
_commit: 2024.1.1-41-g4b4fb7f
33
_src_path: gh:blakeNaccarato/copier-python
44
actions_runner: ubuntu-22.04
55
active: true

‎.vscode/settings.json

+1
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

+46-33
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,6 @@
44
{
55
"version": "2.0.0",
66
"inputs": [
7-
{
8-
"id": "version",
9-
"type": "promptString",
10-
"description": "Version number."
11-
},
12-
{
13-
"id": "dependency",
14-
"type": "promptString",
15-
"description": "Show tree of packages requesting this dependency."
16-
},
177
{
188
"id": "templateOptions",
199
"type": "pickString",
@@ -25,6 +15,16 @@
2515
"type": "promptString",
2616
"description": "Commit SHA or other VCS reference."
2717
},
18+
{
19+
"id": "dependency",
20+
"type": "promptString",
21+
"description": "Show tree of packages requesting this dependency."
22+
},
23+
{
24+
"id": "version",
25+
"type": "promptString",
26+
"description": "Version number."
27+
},
2828
{
2929
"id": "changeType",
3030
"type": "pickString",
@@ -149,46 +149,38 @@
149149
"icon": { "id": "file-symlink-directory" },
150150
"problemMatcher": []
151151
},
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+
},
152159

153160
// * -------------------------------------------------------------------------- * //
154-
// * PRE-COMMIT * //
161+
// * OTHER TASKS * //
155162

156163
{
157-
"label": "pre-commit",
164+
"label": "task: pre-commit",
158165
"type": "shell",
159166
"command": ". scripts/Initialize-Shell.ps1; pre-commit",
160167
"icon": { "id": "git-commit" },
161168
"problemMatcher": []
162169
},
163170
{
164-
"label": "pre-commit: all",
171+
"label": "task: pre-commit (all)",
165172
"type": "shell",
166173
"command": ". scripts/Initialize-Shell.ps1; pre-commit run --all-files",
167174
"icon": { "id": "git-commit" },
168175
"problemMatcher": []
169176
},
170-
171-
// * -------------------------------------------------------------------------- * //
172-
// * GIT * //
173-
174177
{
175-
"label": "git: Rebase back to fork",
178+
"label": "task: Rebase back to fork",
176179
"type": "shell",
177180
"command": "git rebase -i --fork-point main",
178181
"icon": { "id": "git-branch" },
179182
"problemMatcher": []
180183
},
181-
182-
// * -------------------------------------------------------------------------- * //
183-
// * OTHER TASKS * //
184-
185-
{
186-
"label": "task: Generate changelog entry",
187-
"type": "shell",
188-
"command": ". scripts/Initialize-Shell.ps1; python -m boilerdaq_tools add-change ${input:changeType}",
189-
"icon": { "id": "request-changes" },
190-
"problemMatcher": []
191-
},
192184
{
193185
"label": "task: Show tree of packages requesting a dependency",
194186
"type": "shell",
@@ -218,14 +210,14 @@
218210
"problemMatcher": []
219211
},
220212
{
221-
"label": "task: profile this file",
213+
"label": "task: Profile this file",
222214
"type": "shell",
223215
"command": ". scripts/Initialize-Shell.ps1; python -m cProfile -o .prof ${file}",
224216
"icon": { "id": "graph-line" },
225217
"problemMatcher": []
226218
},
227219
{
228-
"label": "task: view profile results with snakeviz",
220+
"label": "task: View profile results with snakeviz",
229221
"type": "shell",
230222
"command": ". scripts/Initialize-Shell.ps1; snakeviz .prof",
231223
"icon": { "id": "graph-line" },
@@ -234,8 +226,29 @@
234226
{
235227
"label": "task: Bump version",
236228
"type": "shell",
237-
"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}'",
238-
"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 boilerdaq_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/boilerdaq/commit/' + $(git rev-parse HEAD) + '))\n')",
251+
"icon": { "id": "tag" },
239252
"problemMatcher": []
240253
}
241254
]

‎CONTRIBUTORS.md

+13
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

+13
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,17 @@ Data acquisition for a nucleate pool boiling experimental apparatus.
1313
## Contributors
1414

1515
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
16+
<!-- prettier-ignore-start -->
17+
<!-- markdownlint-disable -->
18+
<table>
19+
<tbody>
20+
<tr>
21+
<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>
22+
</tr>
23+
</tbody>
24+
</table>
25+
26+
<!-- markdownlint-restore -->
27+
<!-- prettier-ignore-end -->
28+
1629
<!-- ALL-CONTRIBUTORS-LIST:END -->

‎docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def dpath(path: Path, rel: Path = DOCS) -> str:
132132
"default_mode": "light"
133133
}
134134
COMMON_OPTIONS = {
135-
"repository_url": f"https://github.com/{USER}/{PACKAGE}",
135+
"repository_url": f"https://github.com/{USER}/{REPO}",
136136
"path_to_docs": dpath(DOCS),
137137
}
138138
html_theme_options = {

‎scripts/Initialize-Windows.ps1

+16-5
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,25 @@ Initialize Windows machine.#>
33

44
$origPreference = $ErrorActionPreference
55
$ErrorActionPreference = 'SilentlyContinue'
6+
# Common winget options
7+
$Install = @(
8+
'install',
9+
'--accept-package-agreements',
10+
'--accept-source-agreements',
11+
'--disable-interactivity'
12+
'--exact',
13+
'--no-upgrade',
14+
'--silent',
15+
'--source=winget'
16+
)
617
# Install Python
7-
winget install --source='winget' --id='Python.Python.3.11' --override='/quiet PrependPath=0'
18+
winget @Install --id='Python.Python.3.11' --override='/quiet PrependPath=0'
819
# Install VSCode
9-
winget install --source='winget' --id='Microsoft.VisualStudioCode'
20+
winget @Install --id='Microsoft.VisualStudioCode'
1021
# Install Windows Terminal
11-
winget install --source='winget' --id='Microsoft.WindowsTerminal'
22+
winget @Install --id='Microsoft.WindowsTerminal'
1223
# Install GitHub CLI
13-
winget install --source='winget' --id='GitHub.cli'
24+
winget @Install --id='GitHub.cli'
1425
# Install git
1526
@'
1627
[Setup]
@@ -37,5 +48,5 @@ EnableSymlinks=Disabled
3748
EnablePseudoConsoleSupport=Disabled
3849
EnableFSMonitor=Enabled
3950
'@ | Out-File ($inf = New-TemporaryFile)
40-
winget install --source='winget' --id='Git.Git' --override="/SILENT /LOADINF=$inf"
51+
winget @Install --id='Git.Git' --override="/SILENT /LOADINF=$inf"
4152
$ErrorActionPreference = $origPreference

0 commit comments

Comments
 (0)