Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP Bump Python version to 3.13 #2261

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ updates:
# Python package update PRs
- package-ecosystem: pip # This will update 'pyproject.toml'
directory: "/"
ignore:
- dependency-name: "psycopg" # 3.1.19 is the latest version to support on older MacOS versions
groups:
production-dependencies:
dependency-type: "production"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: 3.12
python-version: 3.13

- name: Install hatch
run: pip install hatch
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: 3.12
python-version: 3.13

- name: Install hatch
run: pip install hatch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot_amend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.12"
python-version: "3.13"

- name: Install hatch
run: pip install hatch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint_code.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.12
python-version: 3.13
- name: Install hatch
run: pip install hatch
- name: Print package versions
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_code.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.12
python-version: 3.13
- name: Install hatch
run: pip install hatch
- name: Test Python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_docker_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.12'
python-version: '3.13'

- name: Install Python packages
run: |
Expand Down
2 changes: 1 addition & 1 deletion .hatch/requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by hatch-pip-compile with Python 3.12
# This file is autogenerated by hatch-pip-compile with Python 3.13
#
# - emoji==2.14.0
# - myst-parser==4.0.0
Expand Down
8 changes: 2 additions & 6 deletions .hatch/requirements-lint.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by hatch-pip-compile with Python 3.12
# This file is autogenerated by hatch-pip-compile with Python 3.13
#
# - ansible-dev-tools==24.10.0
# - ansible==10.5.0
Expand Down Expand Up @@ -89,8 +89,6 @@ distlib==0.3.9
# virtualenv
distro==1.9.0
# via bindep
docutils==0.21.2
# via python-daemon
enrich==1.2.7
# via molecule
execnet==2.1.1
Expand Down Expand Up @@ -199,7 +197,7 @@ pytest-ansible==24.9.0
# tox-ansible
pytest-xdist==3.6.1
# via tox-ansible
python-daemon==3.0.1
python-daemon==3.1.0
# via ansible-runner
python-gnupg==0.5.3
# via ansible-sign
Expand Down Expand Up @@ -233,8 +231,6 @@ rpds-py==0.20.0
# referencing
ruamel-yaml==0.18.6
# via ansible-lint
ruamel-yaml-clib==0.2.12
# via ruamel-yaml
ruff==0.7.0
# via hatch.envs.lint
subprocess-tee==0.4.2
Expand Down
11 changes: 5 additions & 6 deletions .hatch/requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# This file is autogenerated by hatch-pip-compile with Python 3.12
# This file is autogenerated by hatch-pip-compile with Python 3.13
#
# [constraints] .hatch/requirements.txt (SHA256: 7ad151976b72bb564d491ec5c0ead3b24dcd4d259b99700df8e92cc8a0cd07ed)
# [constraints] .hatch/requirements.txt (SHA256: 71bc7a0ab45dd5c0fd1d3363776d655e8331505c78a875d8850a77ca6640eb22)
#
# - appdirs==1.4.4
# - azure-core==1.31.0
Expand All @@ -23,7 +23,7 @@
# - chevron==0.14.0
# - cryptography==43.0.3
# - fqdn==1.5.1
# - psycopg[binary]==3.1.19
# - psycopg[binary]==3.2.3
# - pulumi-azure-native==2.68.0
# - pulumi-azuread==6.0.1
# - pulumi-random==4.16.7
Expand Down Expand Up @@ -287,11 +287,11 @@ protobuf==4.25.5
# via
# -c .hatch/requirements.txt
# pulumi
psycopg==3.1.19
psycopg==3.2.3
# via
# -c .hatch/requirements.txt
# hatch.envs.test
psycopg-binary==3.1.19
psycopg-binary==3.2.3
# via
# -c .hatch/requirements.txt
# psycopg
Expand Down Expand Up @@ -423,7 +423,6 @@ typing-extensions==4.12.2
# azure-storage-blob
# azure-storage-file-datalake
# azure-storage-file-share
# psycopg
# pydantic
# pydantic-core
# typer
Expand Down
9 changes: 4 additions & 5 deletions .hatch/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by hatch-pip-compile with Python 3.12
# This file is autogenerated by hatch-pip-compile with Python 3.13
#
# - appdirs==1.4.4
# - azure-core==1.31.0
Expand All @@ -21,7 +21,7 @@
# - chevron==0.14.0
# - cryptography==43.0.3
# - fqdn==1.5.1
# - psycopg[binary]==3.1.19
# - psycopg[binary]==3.2.3
# - pulumi-azure-native==2.68.0
# - pulumi-azuread==6.0.1
# - pulumi-random==4.16.7
Expand Down Expand Up @@ -188,9 +188,9 @@ portalocker==2.10.1
# via msal-extensions
protobuf==4.25.5
# via pulumi
psycopg==3.1.19
psycopg==3.2.3
# via hatch.envs.default
psycopg-binary==3.1.19
psycopg-binary==3.2.3
# via psycopg
pulumi==3.137.0
# via
Expand Down Expand Up @@ -274,7 +274,6 @@ typing-extensions==4.12.2
# azure-storage-blob
# azure-storage-file-datalake
# azure-storage-file-share
# psycopg
# pydantic
# pydantic-core
# typer
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ authors = [
{ name = "Data Safe Haven development team", email = "[email protected]" },
]
readme = "README.md"
requires-python = "==3.12.*"
requires-python = "==3.13.*"
classifiers = [
"Development Status :: 5 - Production/Stable",
"Environment :: Console",
"Intended Audience :: Science/Research",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Topic :: Security",
"Topic :: System :: Systems Administration",
]
Expand All @@ -44,7 +44,7 @@ dependencies = [
"chevron==0.14.0",
"cryptography==43.0.3",
"fqdn==1.5.1",
"psycopg[binary]==3.1.19", # needed for installation on older MacOS versions
"psycopg[binary]==3.2.3",
"pulumi-azure-native==2.68.0",
"pulumi-azuread==6.0.1",
"pulumi-random==4.16.7",
Expand Down Expand Up @@ -98,7 +98,7 @@ test = [
dsh = "data_safe_haven.commands.cli:main"

[tool.black]
target-version = ["py312"]
target-version = ["py313"]

[tool.coverage.paths]
source = ["data_safe_haven/"]
Expand Down
Loading