Skip to content

Commit e6931f2

Browse files
authored
Upgrade python to 3.13 (#815)
* wip * update * update lock * update except * update windows test poetry * update windows test python
1 parent e13dec5 commit e6931f2

File tree

6 files changed

+13
-143
lines changed

6 files changed

+13
-143
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
},
3737
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
3838
"ghcr.io/devcontainers/features/python:1": {
39-
"version": "3.9"
39+
"version": "3.13"
4040
},
4141
"ghcr.io/devcontainers-extra/features/packer-asdf:2": {},
4242
"ghcr.io/devcontainers-extra/features/terraform-docs:1": {

.github/workflows/test.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
--health-retries 5
4848
strategy:
4949
matrix:
50-
python-version: ["3.10"]
50+
python-version: ["3.13"]
5151

5252
steps:
5353
- name: Configure AWS credentials
@@ -146,11 +146,14 @@ jobs:
146146
runs-on: windows-latest
147147
steps:
148148
- uses: actions/checkout@v2
149+
- uses: actions/setup-python@v4
150+
with:
151+
python-version: '3.13'
149152
- name: Install deps
150153
run: |
151154
python -m pip install --user pipx
152155
python -m pipx ensurepath
153-
python -m pipx install poetry==1.3.2
156+
python -m pipx install poetry==1.8.3
154157
- name: Install python dependencies
155158
# poetry cache clear --all pypi ref: https://stackoverflow.com/questions/72551057/poetry-gives-toomanyindirects-error-suddenly
156159
# Remove when this is resolved.

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ exclude: >
88
fail_fast: true
99
repos:
1010
- repo: https://github.com/pre-commit/pre-commit-hooks
11-
rev: v4.1.0
11+
rev: v6.0.0
1212
hooks:
1313
- id: trailing-whitespace
1414
- id: end-of-file-fixer
@@ -21,7 +21,7 @@ repos:
2121
# # GitHub only allows branch protection for teams or enterprise.
2222
# args: ['--pattern', '^(?!T\d+.*)']
2323
- repo: https://github.com/psf/black
24-
rev: 22.3.0
24+
rev: 25.11.0
2525
hooks:
2626
- id: black
2727
- repo: https://github.com/PyCQA/flake8

canarytokens/aws_infra/plan_generation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ async def save_plan(canarydrop: Canarydrop, plan: dict[str, list[dict]]) -> None
615615
raise ValueError(
616616
f"Your proposed plan is too big and will exceed an AWS character limit. You need to shave off more than {event_pattern_length - _EVENT_PATTERN_LIMIT} characters from the plan; either remove assets, or shorten your decoy names."
617617
)
618-
except ValueError:
618+
except* ValueError:
619619
canarydrop.aws_deployed_assets = json.dumps(
620620
current_deployed_assets
621621
) # restore previous state

poetry.lock

Lines changed: 3 additions & 134 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)