Skip to content

Commit 5f0bcae

Browse files
ejfineejfine
authored
Add support for SSM Port forwarding (#60)
## Why is this change necessary? Some libraries need it ## How does this change address the issue? Flip the flag in the template to allow using it ## What side effects does this change have? Another question in the template ## How is this change tested? Downstream repo ## Other Pulled in some other misc upstream template changes
1 parent a312c58 commit 5f0bcae

13 files changed

Lines changed: 220 additions & 211 deletions

File tree

‎.copier-answers.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier
2-
_commit: v0.0.63
2+
_commit: v0.0.64
33
_src_path: gh:LabAutomationAndScreening/copier-base-template.git
44
description: Copier template for creating Python libraries and executables
55
python_ci_versions:
@@ -9,7 +9,7 @@ python_version: 3.12.7
99
repo_name: copier-python-package-template
1010
repo_org_name: LabAutomationAndScreening
1111
ssh_port_number: 55874
12-
template_might_want_to_install_aws_ssm_port_forwarding_plugin: false
12+
template_might_want_to_install_aws_ssm_port_forwarding_plugin: true
1313
template_uses_javascript: false
1414
template_uses_pulumi: false
1515
template_uses_python: true

‎.devcontainer/devcontainer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"ms-python.python@2025.7.2025051401",
3131
"ms-python.vscode-pylance@2025.4.104",
3232
"ms-vscode-remote.remote-containers@0.414.0",
33-
"charliermarsh.ruff@2025.22.0",
33+
"charliermarsh.ruff@2025.24.0",
3434

3535
// Misc file formats
3636
"bierner.markdown-mermaid@1.28.0",
@@ -50,7 +50,7 @@
5050
},
5151
"ruff.nativeServer": "on",
5252
// TODO: see if there's a way to specify different configurations for different folders
53-
"ruff.configuration": "${workspaceFolder}/ruff-test.toml", // use the test configuration since it's less restrictive and won't show false positives and underline things
53+
"ruff.configuration": "/workspaces/copier-python-package-template/ruff-test.toml", // use the test configuration since it's less restrictive and won't show false positives and underline things
5454
"[jsonc][json][javascript][typescript][graphql][css][scss][html][vue]": {
5555
"editor.defaultFormatter": "esbenp.prettier-vscode",
5656
"editor.formatOnSave": true
@@ -61,5 +61,5 @@
6161
"initializeCommand": "sh .devcontainer/initialize-command.sh",
6262
"onCreateCommand": "sh .devcontainer/on-create-command.sh",
6363
"postStartCommand": "sh .devcontainer/post-start-command.sh"
64-
// Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): 68bd5592 # spellchecker:disable-line
64+
// Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): d72f90f7 # spellchecker:disable-line
6565
}

‎.devcontainer/install-ci-tooling.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
UV_VERSION = "0.8.4"
1111
PNPM_VERSION = "10.14.0"
12-
COPIER_VERSION = "9.8.0"
12+
COPIER_VERSION = "9.9.1"
1313
COPIER_TEMPLATE_EXTENSIONS_VERSION = "0.3.2"
14-
PRE_COMMIT_VERSION = "4.2.0"
14+
PRE_COMMIT_VERSION = "4.3.0"
1515
GITHUB_WINDOWS_RUNNER_BIN_PATH = r"C:\Users\runneradmin\.local\bin"
1616
INSTALL_SSM_PLUGIN_BY_DEFAULT = False
1717
parser = argparse.ArgumentParser(description="Install CI tooling for the repo")

‎.pre-commit-config.yaml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
minimum_pre_commit_version: 4.0.1
1+
minimum_pre_commit_version: 4.2.0
22
# run `pre-commit autoupdate --freeze` to update all hooks
33
default_install_hook_types: [pre-commit, post-checkout]
44
repos:
@@ -42,7 +42,7 @@ repos:
4242

4343
# Reformatting (should generally come before any file format or other checks, because reformatting can change things)
4444
- repo: https://github.com/crate-ci/typos
45-
rev: 392b78fe18a52790c53f42456e46124f77346842 # frozen: v1.34.0
45+
rev: 7fb6e0951ad91e4772a2470012fc1ae621016b80 # frozen: v1
4646
hooks:
4747
- id: typos
4848
exclude:
@@ -53,13 +53,14 @@ repos:
5353
.*\.umd.js|
5454
)$
5555
- repo: https://github.com/pre-commit/pre-commit-hooks
56-
rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # frozen: v5.0.0
56+
rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # frozen: v6.0.0
5757
hooks:
5858
- id: trailing-whitespace
5959
exclude:
6060
|
6161
(?x)^(
6262
.*/vendor_files/.*|
63+
.*tests/.*/__snapshots__/.*|
6364
)$
6465
- id: end-of-file-fixer
6566
# the XML formatter hook doesn't leave a blank line at the end, so excluding XML files from this hook to avoid conflicts
@@ -72,6 +73,7 @@ repos:
7273
template/template/.copier-answers.yml.jinja|
7374
template/.copier-answers.yml.jinja|
7475
.*generated/graphql.ts|
76+
.*tests/.*/__snapshots__/.*|
7577
.devcontainer/devcontainer-lock.json|
7678
.copier-answers.yml|
7779
.*\.xml|
@@ -86,6 +88,7 @@ repos:
8688
.*pyrightconfig.json|
8789
.*tsconfig.json|
8890
.*biome.jsonc|
91+
.*tests/.*/__snapshots__/.*|
8992
.*/vendor_files/.*|
9093
)$
9194
args: [--autofix, --no-sort-keys]
@@ -151,7 +154,7 @@ repos:
151154
152155
# Invalid File Checks
153156
- repo: https://github.com/pre-commit/pre-commit-hooks
154-
rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # frozen: v5.0.0
157+
rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # frozen: v6.0.0
155158
hooks:
156159
- id: check-added-large-files
157160
args: ["--maxkb=123"]
@@ -201,7 +204,7 @@ repos:
201204

202205
# Safety/Security Issues
203206
- repo: https://github.com/pre-commit/pre-commit-hooks
204-
rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # frozen: v5.0.0
207+
rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # frozen: v6.0.0
205208
hooks:
206209
- id: detect-private-key
207210

@@ -223,7 +226,7 @@ repos:
223226
description: Runs hadolint to lint Dockerfiles
224227

225228
- repo: https://github.com/astral-sh/ruff-pre-commit
226-
rev: 3d44372123ca5e8617fdb65d9f11facd159b9e95 # frozen: v0.12.3
229+
rev: 54a455f7ce629598b7535ff828fd5fb796f4b83f # frozen: v0.12.9
227230
hooks:
228231
- id: ruff
229232
name: ruff-src
@@ -236,7 +239,7 @@ repos:
236239
- id: ruff-format
237240

238241
- repo: https://github.com/pylint-dev/pylint
239-
rev: f798a4a3508bcbb8ad0773ae14bf32d28dcfdcbe # frozen: v3.3.7
242+
rev: 98942ba4126a6fe1657bad77027bcc11016d16da # frozen: v3.3.8
240243
hooks:
241244
- id: pylint
242245
name: pylint

‎copier.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ use_windows_in_ci:
2727
help: Should CI in the instantiated template also use Windows runners?
2828
default: no
2929

30+
install_aws_ssm_port_forwarding_plugin:
31+
type: bool
32+
help: Should the AWS SSM Port Forwarding Plugin be installed?
33+
default: no
3034

3135
python_version:
3236
type: str
@@ -53,13 +57,13 @@ python_ci_versions:
5357
aws_identity_center_id:
5458
type: str
5559
help: What's the ID of your Organization's AWS Identity center, e.g. d-9145c20053?
56-
when: "{{ python_package_registry == 'AWS CodeArtifact' }}"
60+
when: "{{ python_package_registry == 'AWS CodeArtifact' or install_aws_ssm_port_forwarding_plugin }}"
5761

5862
aws_org_home_region:
5963
type: str
6064
help: What is the home region of the AWS Organization (where all of the central infrastructure is deployed)?
6165
default: us-east-1
62-
when: "{{ python_package_registry == 'AWS CodeArtifact' }}"
66+
when: "{{ python_package_registry == 'AWS CodeArtifact' or install_aws_ssm_port_forwarding_plugin }}"
6367

6468
aws_central_infrastructure_account_id:
6569
type: str

‎extensions/context.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ class ContextUpdater(ContextHook):
1212
def hook(self, context: dict[Any, Any]) -> dict[Any, Any]:
1313
context["uv_version"] = "0.8.4"
1414
context["pnpm_version"] = "10.14.0"
15-
context["pre_commit_version"] = "4.2.0"
15+
context["pre_commit_version"] = "4.3.0"
1616
context["pyright_version"] = "1.1.403"
1717
context["pytest_version"] = "8.4.1"
1818
context["pytest_randomly_version"] = "3.16.0"
1919
context["pytest_cov_version"] = "6.2.1"
20-
context["copier_version"] = "9.8.0"
20+
context["copier_version"] = "9.9.1"
2121
context["copier_template_extensions_version"] = "0.3.2"
2222
context["sphinx_version"] = "8.1.3"
23-
context["pulumi_version"] = "3.189.0"
23+
context["pulumi_version"] = "3.190.0"
2424
context["pulumi_aws_version"] = "7.4.0"
2525
context["pulumi_aws_native_version"] = "1.32.0"
2626
context["pulumi_command_version"] = "1.1.0"

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies = [
1010
"pytest-cov>=6.2.1",
1111
"pytest-randomly>=3.16.0",
1212
"pyright[nodejs]>=1.1.403",
13-
"copier>=9.8.0",
13+
"copier>=9.9.1",
1414
"copier-template-extensions>=0.3.2"
1515

1616
# Specific to this template

‎template/.devcontainer/devcontainer.json.jinja‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"ms-python.python@2025.7.2025051401",
3737
"ms-python.vscode-pylance@2025.4.104",
3838
"ms-vscode-remote.remote-containers@0.414.0",
39-
"charliermarsh.ruff@2025.22.0",
39+
"charliermarsh.ruff@2025.24.0",
4040
{% endraw %}{% if is_child_of_copier_base_template is not defined and template_uses_vuejs is defined and template_uses_vuejs is sameas(true) %}{% raw %}
4141
// VueJS
4242
"vue.volar@2.2.8",
@@ -63,7 +63,7 @@
6363
},
6464
"ruff.nativeServer": "on",
6565
// TODO: see if there's a way to specify different configurations for different folders
66-
"ruff.configuration": "${workspaceFolder}/ruff-test.toml", // use the test configuration since it's less restrictive and won't show false positives and underline things
66+
"ruff.configuration": "/workspaces/{% endraw %}{{ repo_name }}{% raw %}/ruff-test.toml", // use the test configuration since it's less restrictive and won't show false positives and underline things
6767
"[jsonc][json][javascript][typescript][graphql][css][scss][html][vue]": {
6868
"editor.defaultFormatter": "esbenp.prettier-vscode",
6969
"editor.formatOnSave": true

‎template/.pre-commit-config.yaml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
minimum_pre_commit_version: 4.0.1
1+
minimum_pre_commit_version: 4.2.0
22
# run `pre-commit autoupdate --freeze` to update all hooks
33
default_install_hook_types: [pre-commit, post-checkout]
44
repos:
@@ -42,7 +42,7 @@ repos:
4242

4343
# Reformatting (should generally come before any file format or other checks, because reformatting can change things)
4444
- repo: https://github.com/crate-ci/typos
45-
rev: 392b78fe18a52790c53f42456e46124f77346842 # frozen: v1.34.0
45+
rev: 7fb6e0951ad91e4772a2470012fc1ae621016b80 # frozen: v1
4646
hooks:
4747
- id: typos
4848
exclude:
@@ -53,13 +53,14 @@ repos:
5353
.*\.umd.js|
5454
)$
5555
- repo: https://github.com/pre-commit/pre-commit-hooks
56-
rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # frozen: v5.0.0
56+
rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # frozen: v6.0.0
5757
hooks:
5858
- id: trailing-whitespace
5959
exclude:
6060
|
6161
(?x)^(
6262
.*/vendor_files/.*|
63+
.*tests/.*/__snapshots__/.*|
6364
)$
6465
- id: end-of-file-fixer
6566
# the XML formatter hook doesn't leave a blank line at the end, so excluding XML files from this hook to avoid conflicts
@@ -72,6 +73,7 @@ repos:
7273
template/template/.copier-answers.yml.jinja|
7374
template/.copier-answers.yml.jinja|
7475
.*generated/graphql.ts|
76+
.*tests/.*/__snapshots__/.*|
7577
.devcontainer/devcontainer-lock.json|
7678
.copier-answers.yml|
7779
.*\.xml|
@@ -86,6 +88,7 @@ repos:
8688
.*pyrightconfig.json|
8789
.*tsconfig.json|
8890
.*biome.jsonc|
91+
.*tests/.*/__snapshots__/.*|
8992
.*/vendor_files/.*|
9093
)$
9194
args: [--autofix, --no-sort-keys]
@@ -151,7 +154,7 @@ repos:
151154
152155
# Invalid File Checks
153156
- repo: https://github.com/pre-commit/pre-commit-hooks
154-
rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # frozen: v5.0.0
157+
rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # frozen: v6.0.0
155158
hooks:
156159
- id: check-added-large-files
157160
args: ["--maxkb=123"]
@@ -201,7 +204,7 @@ repos:
201204

202205
# Safety/Security Issues
203206
- repo: https://github.com/pre-commit/pre-commit-hooks
204-
rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # frozen: v5.0.0
207+
rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # frozen: v6.0.0
205208
hooks:
206209
- id: detect-private-key
207210

@@ -223,7 +226,7 @@ repos:
223226
description: Runs hadolint to lint Dockerfiles
224227

225228
- repo: https://github.com/astral-sh/ruff-pre-commit
226-
rev: 3d44372123ca5e8617fdb65d9f11facd159b9e95 # frozen: v0.12.3
229+
rev: 54a455f7ce629598b7535ff828fd5fb796f4b83f # frozen: v0.12.9
227230
hooks:
228231
- id: ruff
229232
name: ruff-src
@@ -236,7 +239,7 @@ repos:
236239
- id: ruff-format
237240

238241
- repo: https://github.com/pylint-dev/pylint
239-
rev: f798a4a3508bcbb8ad0773ae14bf32d28dcfdcbe # frozen: v3.3.7
242+
rev: 98942ba4126a6fe1657bad77027bcc11016d16da # frozen: v3.3.8
240243
hooks:
241244
- id: pylint
242245
name: pylint

‎tests/copier_data/data1.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ is_open_source: true
55
description: Doing amazing things
66
ssh_port_number: 12345
77
use_windows_in_ci: false
8-
8+
install_aws_ssm_port_forwarding_plugin: true
99

1010

1111
python_package_registry: PyPI

0 commit comments

Comments
 (0)