Skip to content

Commit efaca22

Browse files
Sync with template
1 parent 869c1cf commit efaca22

File tree

10 files changed

+67
-17
lines changed

10 files changed

+67
-17
lines changed

.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: 2acfd3d
2+
_commit: 86fa907
33
_src_path: gh:blakeNaccarato/copier-python
44
actions_runner: ubuntu-22.04
55
active: true

.devcontainer/devcontainer.json

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
8080
8181
82+
8283
8384
8485
File renamed without changes.

.github/issue_template.md

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<!--
2+
🐞 Bug report
3+
Report a bug. Please don't request features or ask usage questions here.
4+
Please apply the `bug` label
5+
#} -->
6+
7+
### Please check that this bug hasn't been reported before
8+
9+
- [ ] I searched [here](https://github.com/softboiler/boilerdaq/issues?q=label%3Abug+sort%3Acomments-desc) or [here](https://github.com/search?q=repo%3Asoftboiler/boilerdaq+label%3Abug&type=issues) and couldn't find a similar issue.
10+
11+
### Please confirm that this bug affects the latest version
12+
13+
<!-- Please verify the issue is present in the latest version by installing it with `pip install boilerdaq==0.4.0` and checking that the bug is still there #} -->
14+
15+
- [ ] This bug affects version `0.4.0` of `boilerdaq`.
16+
17+
### Please indicate which operating system(s) you are using
18+
19+
<!-- Please select the most appropriate choice(s) if your exact OS is not listed #} -->
20+
21+
- [ ] Linux
22+
- [ ] macOS
23+
- [ ] Windows
24+
25+
### Expected behavior
26+
27+
<!-- Please explain what **should** happen #} -->
28+
29+
### Current behaviour
30+
31+
<!-- Please explain what happens instead of the expected behavior #} -->
32+
33+
### Steps to reproduce
34+
35+
<!-- Please provide steps that would allow someone to reproduce the issue #} -->
36+
37+
### Possible solution
38+
39+
<!-- Please suggest a possible fix or any ideas you may have about the root cause #} -->

.github/workflows/high.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
with:
4949
python-version: "${{ matrix.python }}"
5050
- run: "scripts/Sync-Py.ps1"
51-
- run: "sphinx-build -EaT docs _site"
51+
- run: ". scripts/Initialize-Shell.ps1; sphinx-build -EaT docs _site"
5252
- uses: "actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa" # v3.0.1
5353
ruff:
5454
needs: "sync"

.vscode/extensions.json

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"ms-python.python",
1818
"ms-python.vscode-pylance",
1919
"ms-toolsai.jupyter",
20+
"ms-vscode.powershell",
2021
"ms-vscode-remote.remote-containers",
2122
"njpwerner.autodocstring",
2223
"njpwerner.autodocstring",

.vscode/settings.json

+14-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@
1616
"**/*pylance-notebook-cell*": true
1717
},
1818
"search.exclude": {
19-
//? Template clutters quick-open
20-
"submodules/template": true,
21-
//? Type stubs clutter quick-open
22-
"submodules/typings": true,
23-
//? Locks clutter searches
24-
"tools/lock.json": true
19+
//? Don't search in submodules or locks by default
20+
"submodules": true,
21+
"lock*.json": true
2522
},
2623
//! File nesting
2724
"explorer.sortOrder": "foldersNestsFiles",
@@ -106,6 +103,17 @@
106103
"python.analysis.inlayHints.functionReturnTypes": true,
107104
"python.analysis.inlayHints.pytestParameters": true,
108105
"python.analysis.inlayHints.variableTypes": true,
106+
//* PowerShell
107+
"powershell.startAutomatically": false,
108+
"powershell.promptToUpdatePowerShell": false,
109+
"powershell.integratedConsole.showOnStartup": false,
110+
"powershell.codeFormatting.autoCorrectAliases": true,
111+
"powershell.codeFormatting.avoidSemicolonsAsLineTerminators": true,
112+
"powershell.codeFormatting.trimWhitespaceAroundPipe": true,
113+
"powershell.codeFormatting.useConstantStrings": true,
114+
"powershell.codeFormatting.useCorrectCasing": true,
115+
"powershell.codeFormatting.whitespaceBetweenParameters": true,
116+
"powershell.codeFormatting.pipelineIndentationStyle": "IncreaseIndentationForFirstPipeline",
109117
//* Rewrap
110118
"rewrap.wrappingColumn": 88,
111119
"rewrap.wholeComment": false,

pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ exclude = [
8686
"**/node_modules",
8787
"**/__pycache__",
8888
"**/.*",
89+
"**/.*/**",
8990
"**/.venv",
9091
"**/.vscode/extensions",
9192
"**/AppData",

scripts/Common.ps1

+8-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,14 @@ function Get-PySystem {
3636

3737
# ? Look for suitable global Python interpreter, return if correct Python version
3838
'Looking for suitable global Python interpreter' | Write-Progress -Info
39-
if ($py -eq 'py') { $SysPy = & $py -$Version -c $getExe }
39+
if ($py -eq 'py') {
40+
try {
41+
$SysPy = & $py -$Version -c $getExe
42+
}
43+
catch [System.Management.Automation.NativeCommandExitException] {
44+
$SysPy = & $py -c $getExe
45+
}
46+
}
4047
else { $SysPy = & $py -c $getExe }
4148
if (Select-PyVersion $py $Version) { return $SysPy }
4249

@@ -62,8 +69,6 @@ function Start-PyVenv {
6269
else {
6370
$bin = "$Path/bin"
6471
& "$bin/activate.ps1"
65-
# ? uv-sourced, virtualenv-based `activate.ps1` incorrectly uses `;` sep
66-
$Env:PATH = $Env:PATH -Replace ';', ':'
6772
$Py = "$bin/python"
6873
}
6974
# ? Prepend local `bin` to PATH

scripts/Initialize-Shell.ps1

+1-6
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,7 @@ function Set-Env {
3232
Load `.env`, activate a virtual environment found here or in parent directories.#>
3333
# ? Activate virtual environment if one exists
3434
if (Test-Path '.venv') {
35-
if ($IsWindows) { .venv/scripts/activate.ps1 }
36-
else {
37-
.venv/bin/activate.ps1
38-
# ? uv-sourced, virtualenv-based `activate.ps1` incorrectly uses `;` sep
39-
$Env:PATH = $Env:PATH -Replace ';', ':'
40-
}
35+
if ($IsWindows) { .venv/scripts/activate.ps1 } else { .venv/bin/activate.ps1 }
4136
}
4237
# ? Prepend local `bin` to PATH
4338
$sep = $IsWindows ? ';' : ':'

0 commit comments

Comments
 (0)