Skip to content

Commit 04f8293

Browse files
committed
1 parent 708b10e commit 04f8293

File tree

4 files changed

+207
-166
lines changed

4 files changed

+207
-166
lines changed

.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
2-
_commit: 5.0.0a1-4-g7659ef5
2+
_commit: 5.0.0a2-1-g23f280c
33
_src_path: https://github.com/DiamondLightSource/python-copier-template.git
44
author_email: tom.cobb@diamond.ac.uk
55
author_name: Tom Cobb

.devcontainer/devcontainer.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,21 @@
99
// Allow X11 apps to run inside the container
1010
"DISPLAY": "${localEnv:DISPLAY}",
1111
// Do the equivalent of "activate" the venv so we don't have to "uv run" everything
12+
"VIRTUAL_ENV": "/workspaces/${localWorkspaceFolderBasename}/.venv",
1213
"PATH": "/workspaces/${localWorkspaceFolderBasename}/.venv/bin:${containerEnv:PATH}"
1314
},
1415
"customizations": {
1516
"vscode": {
1617
// Set *default* container specific settings.json values on container create.
1718
"settings": {
19+
// Use the container's python by default
1820
"python.defaultInterpreterPath": "/workspaces/${localWorkspaceFolderBasename}/.venv/bin/python",
21+
// Don't activate the venv as it is already in the PATH
1922
"python.terminal.activateEnvInCurrentTerminal": false,
2023
"python.terminal.activateEnvironment": false,
21-
"remote.autoForwardPorts": false
24+
// Workaround to prevent garbled python REPL in the terminal
25+
// https://github.com/microsoft/vscode-python/issues/25505
26+
"python.terminal.shellIntegration.enabled": false
2227
},
2328
// Add the IDs of extensions you want installed when the container is created.
2429
"extensions": [
@@ -33,6 +38,8 @@
3338
}
3439
},
3540
// Create the config folder for the bash-config feature and uv cache
41+
// NOTE: The uv cache can get large, DLS users should read
42+
// https://dev-guide.diamond.ac.uk/linux-user-environment/how-tos/disk-quota-troubleshooting
3643
"initializeCommand": "mkdir -p ${localEnv:HOME}/.config/terminal-config ${localEnv:HOME}/.cache/uv",
3744
"runArgs": [
3845
// Allow the container to access the host X11 display and EPICS CA

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ It is recommended that developers use a [vscode devcontainer](https://code.visua
2424

2525
This project was created using the [Diamond Light Source Copier Template](https://github.com/DiamondLightSource/python-copier-template) for Python projects.
2626

27-
For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.0.0a1/how-to.html).
27+
For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.0.0a2/how-to.html).

0 commit comments

Comments
 (0)