From 2271ac3bed1bd43cb0360b12b0fe5ecc0c979025 Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Thu, 14 Aug 2025 18:41:52 +0000 Subject: [PATCH 1/2] upstream copier --- .copier-answers.yml | 2 +- .devcontainer/devcontainer.json | 2 +- .devcontainer/docker-compose.yml | 2 ++ .gitignore | 5 +++++ extensions/context.py | 8 ++++---- template/.devcontainer/docker-compose.yml.jinja | 2 ++ template/.gitignore | 5 +++++ 7 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 59cec508..bdb7196f 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v0.0.62 +_commit: v0.0.62-2-gfe41a1b _src_path: gh:LabAutomationAndScreening/copier-base-template.git description: Copier template for creating Python libraries and executables python_ci_versions: diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a17817a9..54061737 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -61,5 +61,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): 3cf424d8 # spellchecker:disable-line + // Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): 68bd5592 # spellchecker:disable-line } diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index ce301fcb..5f5bc615 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 f7300be2..aa359644 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/extensions/context.py b/extensions/context.py index 630e648b..f30bdea5 100644 --- a/extensions/context.py +++ b/extensions/context.py @@ -20,13 +20,13 @@ def hook(self, context: dict[Any, Any]) -> dict[Any, Any]: context["copier_version"] = "9.8.0" context["copier_template_extensions_version"] = "0.3.2" context["sphinx_version"] = "8.1.3" - context["pulumi_version"] = "3.188.0" - context["pulumi_aws_version"] = "7.3.1" - context["pulumi_aws_native_version"] = "1.31.0" + context["pulumi_version"] = "3.189.0" + context["pulumi_aws_version"] = "7.4.0" + context["pulumi_aws_native_version"] = "1.32.0" context["pulumi_command_version"] = "1.1.0" context["pulumi_github_version"] = "6.7.3" context["pulumi_okta_version"] = "4.20.0" - context["boto3_version"] = "1.40.6" + context["boto3_version"] = "1.40.9" context["ephemeral_pulumi_deploy_version"] = "0.0.4" context["pydantic_version"] = "2.11.7" context["pyinstaller_version"] = "6.13.0" diff --git a/template/.devcontainer/docker-compose.yml.jinja b/template/.devcontainer/docker-compose.yml.jinja index 33d3d89c..28dfd1af 100644 --- a/template/.devcontainer/docker-compose.yml.jinja +++ b/template/.devcontainer/docker-compose.yml.jinja @@ -1,5 +1,7 @@ {% raw %}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/template/.gitignore b/template/.gitignore index f7300be2..aa359644 100644 --- a/template/.gitignore +++ b/template/.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 From 29e2b85768716c5e4567aa86af752f88d1c742ff Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Thu, 14 Aug 2025 18:53:15 +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 bdb7196f..3301cdb8 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v0.0.62-2-gfe41a1b +_commit: v0.0.63 _src_path: gh:LabAutomationAndScreening/copier-base-template.git description: Copier template for creating Python libraries and executables python_ci_versions: