From f3ff212b98e1b9b00f13cd30882c682ba93a2df2 Mon Sep 17 00:00:00 2001 From: Dennis Siemensma Date: Fri, 14 Jun 2024 21:02:03 +0200 Subject: [PATCH] Switch to Python 3.12 #1594 --- .github/workflows/automated-tests.yml | 3 +- provisioning/container/Containerfile-dev | 2 +- src/poetry.lock | 58 ++++-------------------- src/pyproject.toml | 2 +- 4 files changed, 11 insertions(+), 54 deletions(-) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index b320df90..3a06be5e 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -11,7 +11,6 @@ on: - 'dependabot/' jobs: - # The most verbose and complete job. main_test: name: 'Python ${{ matrix.python-version }}' runs-on: ubuntu-latest @@ -19,7 +18,7 @@ jobs: strategy: matrix: python-version: - - '3.10' # @TODO: Bump me to 3.12 later + - '3.12' env: # Do not log verbosely DSMRREADER_LOGLEVEL: ERROR diff --git a/provisioning/container/Containerfile-dev b/provisioning/container/Containerfile-dev index 97741b77..3a6250c0 100644 --- a/provisioning/container/Containerfile-dev +++ b/provisioning/container/Containerfile-dev @@ -3,7 +3,7 @@ ############################################################################ # Development app should run latest Python when possible. -ARG APP_PYTHON_VERSION="3.10" +ARG APP_PYTHON_VERSION="3.12" # Docs should use whatever Python version ReadTheDocs runs. ARG DOCS_PYTHON_VERSION="3.12" diff --git a/src/poetry.lock b/src/poetry.lock index fb372d85..5da52f8a 100644 --- a/src/poetry.lock +++ b/src/poetry.lock @@ -34,10 +34,8 @@ files = [ ] [package.dependencies] -exceptiongroup = {version = ">=1.0.2", markers = "python_version < \"3.11\""} idna = ">=2.8" sniffio = ">=1.1" -typing-extensions = {version = ">=4.1", markers = "python_version < \"3.11\""} [package.extras] doc = ["Sphinx (>=7)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"] @@ -55,9 +53,6 @@ files = [ {file = "asgiref-3.8.1.tar.gz", hash = "sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590"}, ] -[package.dependencies] -typing-extensions = {version = ">=4", markers = "python_version < \"3.11\""} - [package.extras] tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"] @@ -110,13 +105,13 @@ dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] [[package]] name = "bandit" -version = "1.7.8" +version = "1.7.9" description = "Security oriented static analyser for python code." optional = false python-versions = ">=3.8" files = [ - {file = "bandit-1.7.8-py3-none-any.whl", hash = "sha256:509f7af645bc0cd8fd4587abc1a038fc795636671ee8204d502b933aee44f381"}, - {file = "bandit-1.7.8.tar.gz", hash = "sha256:36de50f720856ab24a24dbaa5fee2c66050ed97c1477e0a1159deab1775eab6b"}, + {file = "bandit-1.7.9-py3-none-any.whl", hash = "sha256:52077cb339000f337fb25f7e045995c4ad01511e716e5daac37014b9752de8ec"}, + {file = "bandit-1.7.9.tar.gz", hash = "sha256:7c395a436743018f7be0a4cbb0a4ea9b902b6d87264ddecf8cfdc73b4f78ff61"}, ] [package.dependencies] @@ -169,8 +164,6 @@ mypy-extensions = ">=0.4.3" packaging = ">=22.0" pathspec = ">=0.9.0" platformdirs = ">=2" -tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} -typing-extensions = {version = ">=4.0.1", markers = "python_version < \"3.11\""} [package.extras] colorama = ["colorama (>=0.4.3)"] @@ -438,9 +431,6 @@ files = [ {file = "coverage-7.5.3.tar.gz", hash = "sha256:04aefca5190d1dc7a53a4c1a5a7f8568811306d7a8ee231c42fb69215571944f"}, ] -[package.dependencies] -tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.11.0a6\" and extra == \"toml\""} - [package.extras] toml = ["tomli"] @@ -659,7 +649,6 @@ files = [ [package.dependencies] packaging = "*" -tomli = {version = "*", markers = "python_version < \"3.11\""} [package.extras] all = ["dparse[conda]", "dparse[pipenv]", "dparse[poetry]"] @@ -684,20 +673,6 @@ requests = ">=2.16.2" six = ">=1.12.0" stone = ">=2" -[[package]] -name = "exceptiongroup" -version = "1.2.1" -description = "Backport of PEP 654 (exception groups)" -optional = false -python-versions = ">=3.7" -files = [ - {file = "exceptiongroup-1.2.1-py3-none-any.whl", hash = "sha256:5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad"}, - {file = "exceptiongroup-1.2.1.tar.gz", hash = "sha256:a4785e48b045528f5bfe627b6ad554ff32def154f42372786903b7abcfe1aa16"}, -] - -[package.extras] -test = ["pytest (>=6)"] - [[package]] name = "execnet" version = "2.1.1" @@ -757,7 +732,6 @@ files = [ [package.dependencies] black = ">=22.1.0" flake8 = ">=3" -tomli = {version = "*", markers = "python_version < \"3.11\""} [package.extras] develop = ["build", "twine"] @@ -1058,7 +1032,6 @@ files = [ [package.dependencies] mypy-extensions = ">=1.0.0" -tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} typing-extensions = ">=4.1.0" [package.extras] @@ -1386,13 +1359,13 @@ files = [ [[package]] name = "pydantic" -version = "2.7.3" +version = "2.7.4" description = "Data validation using Python type hints" optional = false python-versions = ">=3.8" files = [ - {file = "pydantic-2.7.3-py3-none-any.whl", hash = "sha256:ea91b002777bf643bb20dd717c028ec43216b24a6001a280f83877fd2655d0b4"}, - {file = "pydantic-2.7.3.tar.gz", hash = "sha256:c46c76a40bb1296728d7a8b99aa73dd70a48c3510111ff290034f860c99c419e"}, + {file = "pydantic-2.7.4-py3-none-any.whl", hash = "sha256:ee8538d41ccb9c0a9ad3e0e5f07bf15ed8015b481ced539a1759d8cc89ae90d0"}, + {file = "pydantic-2.7.4.tar.gz", hash = "sha256:0c84efd9548d545f63ac0060c1e4d39bb9b14db8b3c0652338aecc07b5adec52"}, ] [package.dependencies] @@ -1560,11 +1533,9 @@ files = [ [package.dependencies] colorama = {version = "*", markers = "sys_platform == \"win32\""} -exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} iniconfig = "*" packaging = "*" pluggy = ">=1.5,<2.0" -tomli = {version = ">=1", markers = "python_version < \"3.11\""} [package.extras] dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] @@ -1989,7 +1960,6 @@ sphinxcontrib-htmlhelp = ">=2.0.0" sphinxcontrib-jsmath = "*" sphinxcontrib-qthelp = "*" sphinxcontrib-serializinghtml = ">=1.1.9" -tomli = {version = ">=2", markers = "python_version < \"3.11\""} [package.extras] docs = ["sphinxcontrib-websupport"] @@ -2226,17 +2196,6 @@ files = [ ply = ">=3.4" six = ">=1.12.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 = "typer" version = "0.12.3" @@ -2386,7 +2345,6 @@ files = [ [package.dependencies] click = ">=7.0" h11 = ">=0.8" -typing-extensions = {version = ">=4.0", markers = "python_version < \"3.11\""} [package.extras] standard = ["colorama (>=0.4)", "httptools (>=0.5.0)", "python-dotenv (>=0.13)", "pyyaml (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "watchfiles (>=0.13)", "websockets (>=10.4)"] @@ -2561,5 +2519,5 @@ files = [ [metadata] lock-version = "2.0" -python-versions = "^3.10 | ^3.11 | ^3.12" -content-hash = "bb3fc8a3a875f773752f0d0832b4a430bbad654aa53b20878d6d88713ee31e2b" +python-versions = "^3.12" +content-hash = "d08cbf4c4b716d1d570df77306eb0bd51e28d4148f8d26d63e5225504de07b49" diff --git a/src/pyproject.toml b/src/pyproject.toml index 89350c81..d9b83dda 100644 --- a/src/pyproject.toml +++ b/src/pyproject.toml @@ -13,7 +13,7 @@ authors = [ [tool.poetry.dependencies] -python = "^3.10 | ^3.11 | ^3.12" +python = "^3.12" crcmod = "^1.0" django = "^4.2"