From 56c60626284b1396117124eab445febc76f281f2 Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Thu, 14 Aug 2025 18:49:34 +0000 Subject: [PATCH 1/2] pull in upstream copier changes --- .copier-answers.yml | 2 +- .devcontainer/devcontainer.json | 4 ++-- .devcontainer/docker-compose.yml | 2 ++ .gitignore | 5 +++++ .pre-commit-config.yaml | 1 + 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index fde8f53..27e2cac 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v0.0.44 +_commit: v0.0.45-1-g2271ac3 _src_path: gh:LabAutomationAndScreening/copier-python-package-template create_docs: true description: Agent to upload files to cloud diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c35e653..572b25e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -51,7 +51,7 @@ }, "ruff.nativeServer": "on", // TODO: see if there's a way to specify different configurations for different folders - "ruff.configuration": "/workspaces/cloud-courier/ruff-test.toml", // use the test configuration since it's less restrictive and won't show false positives and underline things + "ruff.configuration": "${workspaceFolder}/ruff-test.toml", // use the test configuration since it's less restrictive and won't show false positives and underline things "[jsonc][json][javascript][typescript][graphql][css][scss][html][vue]": { "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true @@ -62,5 +62,5 @@ "initializeCommand": "sh .devcontainer/initialize-command.sh", "onCreateCommand": "sh .devcontainer/on-create-command.sh", "postStartCommand": "sh .devcontainer/post-start-command.sh" - // Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): 97460cab # spellchecker:disable-line + // Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): d3c847e5 # spellchecker:disable-line } diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 91c235f..965f34a 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -1,5 +1,7 @@ services: devcontainer: + # added the platform flag to override any local settings since this image is only compatible with linux/amd64. + platform: linux/amd64 build: context: . args: diff --git a/.gitignore b/.gitignore index f7300be..aa35964 100644 --- a/.gitignore +++ b/.gitignore @@ -76,5 +76,10 @@ dist # Logs *.log **/logs/log*.txt +**/logs/*.log.* + +# macOS dev cleanliness +*.DS_Store +.DS_Store # Ignores specific to this repository diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b3568c9..155673d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -71,6 +71,7 @@ repos: template/.copier-answers.yml.jinja-base| template/template/.copier-answers.yml.jinja| template/.copier-answers.yml.jinja| + .*generated/graphql.ts| .devcontainer/devcontainer-lock.json| .copier-answers.yml| .*\.xml| From 1a52c96409c54b300530cfc78492766631101ada Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Thu, 14 Aug 2025 18:55:48 +0000 Subject: [PATCH 2/2] Copier tag --- .copier-answers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 27e2cac..2b4e4d7 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v0.0.45-1-g2271ac3 +_commit: v0.0.46 _src_path: gh:LabAutomationAndScreening/copier-python-package-template create_docs: true description: Agent to upload files to cloud