Skip to content

Commit 24068f6

Browse files
authored
Merge branch 'main' into fix/update-google-notypes-template
2 parents 707332a + bffc160 commit 24068f6

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

.github/sync.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ group:
1313
dest: .vscode/settings.json
1414
- source: .vscode/extensions.json
1515
dest: .vscode/extensions.json
16-
- source: .github/pull_request_template.md
17-
dest: .github/pull_request_template.md
1816
- source: .github/workflows/add-to-project.yml
1917
dest: .github/workflows/add-to-project.yml
2018
repos: |
@@ -61,6 +59,8 @@ group:
6159
6260
# Website repositories
6361
- files:
62+
- source: .github/pull_request_template.md
63+
dest: .github/pull_request_template.md
6464
- source: common/justfile/web
6565
dest: justfile
6666
- source: common/devcontainers/web.json

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Install Python (with cache for Poetry)
1717
uses: actions/setup-python@v5
1818
with:
19-
python-version: '3.11'
19+
python-version: '3.12'
2020
cache: 'poetry'
2121

2222
- name: Install dependencies with Poetry

.vscode/launch.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,17 @@
1414
"args": [
1515
"runserver"
1616
]
17+
},
18+
{
19+
"name": "test-debugger",
20+
"type": "debugpy",
21+
"request": "launch",
22+
"program": "${file}",
23+
"purpose": [
24+
"debug-test"
25+
],
26+
"console": "integratedTerminal",
27+
"justMyCode": false
1728
}
1829
]
19-
}
30+
}

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@
3838
],
3939
"cSpell.language": "en,en-GB",
4040
"python.testing.pytestEnabled": true,
41-
"python.testing.pytestPath": "poetry run pytest",
41+
"python.testing.pytestPath": "${workspaceFolder}/.venv/bin/pytest",
4242
}

0 commit comments

Comments
 (0)