From 0390929d50ddfa0050538cc2a34d393da93bc62d Mon Sep 17 00:00:00 2001 From: Stig Ofstad Date: Tue, 5 Dec 2023 10:41:25 +0100 Subject: [PATCH] chore: upgrade to python 3.12 --- .github/workflows/main.yaml | 2 +- .pre-commit-config.yaml | 2 +- api/Dockerfile | 2 +- api/poetry.lock | 34 +++------------------------------- api/pyproject.toml | 2 +- 5 files changed, 7 insertions(+), 35 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index f7135f0..7effee1 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -29,7 +29,7 @@ jobs: - name: Set up python uses: actions/setup-python@v2 with: - python-version: '3.10' + python-version: '3.12' - name: Install pre-commit run: pip install pre-commit diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 63714f3..885c1fc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ repos: rev: v4.3.0 hooks: - id: check-ast - language_version: python3.10 + language_version: python3.12 - id: check-merge-conflict - id: check-json - id: check-yaml diff --git a/api/Dockerfile b/api/Dockerfile index d965264..2774ad7 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.12-slim ENV PYTHONUNBUFFERED=1 ENV FLASK_APP=/app/src/app.py diff --git a/api/poetry.lock b/api/poetry.lock index 95e5c52..05a6b59 100644 --- a/api/poetry.lock +++ b/api/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.0 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "azure-common" @@ -143,7 +143,6 @@ click = ">=8.0.0" mypy-extensions = ">=0.4.3" pathspec = ">=0.9.0" platformdirs = ">=2" -tomli = {version = ">=1.1.0", markers = "python_full_version < \"3.11.0a7\""} [package.extras] colorama = ["colorama (>=0.4.3)"] @@ -559,20 +558,6 @@ files = [ docs = ["ipython", "matplotlib", "numpydoc", "sphinx"] tests = ["pytest", "pytest-cov", "pytest-xdist"] -[[package]] -name = "exceptiongroup" -version = "1.2.0" -description = "Backport of PEP 654 (exception groups)" -optional = false -python-versions = ">=3.7" -files = [ - {file = "exceptiongroup-1.2.0-py3-none-any.whl", hash = "sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14"}, - {file = "exceptiongroup-1.2.0.tar.gz", hash = "sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68"}, -] - -[package.extras] -test = ["pytest (>=6)"] - [[package]] name = "flask" version = "3.0.0" @@ -1379,11 +1364,9 @@ files = [ [package.dependencies] colorama = {version = "*", markers = "sys_platform == \"win32\""} -exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} iniconfig = "*" packaging = "*" pluggy = ">=0.12,<2.0" -tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} [package.extras] testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] @@ -1562,17 +1545,6 @@ files = [ [package.dependencies] pbr = ">=2.0.0,<2.1.0 || >2.1.0" -[[package]] -name = "tomli" -version = "2.0.1" -description = "A lil' TOML parser" -optional = false -python-versions = ">=3.7" -files = [ - {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, - {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, -] - [[package]] name = "typing-extensions" version = "4.8.0" @@ -1833,5 +1805,5 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" -python-versions = "^3.10" -content-hash = "340dacf58c9753f5091a16f36e18ea089b33939edd87fa558ba0168cb910d3a2" +python-versions = "^3.12" +content-hash = "1fdc6325fbd443c937a0c0bcf93c1394c705008589380f827a957299dd098d46" diff --git a/api/pyproject.toml b/api/pyproject.toml index 1985bf7..c345adf 100644 --- a/api/pyproject.toml +++ b/api/pyproject.toml @@ -6,7 +6,7 @@ authors = ["Stig Ofstad ", "Eirik Ola Aksnes