From 61735642c21b982c286f5cd3a1450826cf6a3ce6 Mon Sep 17 00:00:00 2001 From: Norbert Kwizera Date: Wed, 16 Oct 2024 10:04:23 +0200 Subject: [PATCH] Update to python 3.12 --- .github/workflows/ci.yml | 2 +- poetry.lock | 4 ++-- pyproject.toml | 17 ++++++++++++----- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f64fbfe0e3..5d2116e6dfb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ jobs: name: Test runs-on: ubuntu-latest env: - python-version: '3.11.x' + python-version: '3.12.x' node-version: '20' mailroom-version: '9.3.3' diff --git a/poetry.lock b/poetry.lock index 7a230c98576..934cb20c44b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2247,5 +2247,5 @@ files = [ [metadata] lock-version = "2.0" -python-versions = "~3.11" -content-hash = "7e079a52200e541bc641f437c0bae1120fc9108ee50056b16cad0541896d07c1" +python-versions = ">=3.11, <3.13" +content-hash = "7cbdf61a3d3787f07e07005b9110a7e8a2806b54f1b764d1f3aa702847c07c3c" diff --git a/pyproject.toml b/pyproject.toml index ea03ade8449..294df9126f2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ authors = ["Nyaruka "] repository = "http://github.com/rapidpro/rapidpro" [tool.poetry.dependencies] -python = "~3.11" +python = ">=3.11, <3.13" Django = "^5.1" django-compressor = "^4.3.1" django-countries = "^7.0" @@ -46,7 +46,7 @@ openpyxl = "^3.1.5" ffmpeg-python = "^0.2.0" slack-sdk = "3.17.0" django-formtools = "^2.4.1" -psycopg = {extras = ["pool"], version = "^3.2.1"} +psycopg = { extras = ["pool"], version = "^3.2.1" } pillow = "^10.1.0" django-imagekit = "^5.0.0" iso639-lang = "^2.2.3" @@ -54,7 +54,7 @@ google-auth = "^2.30.0" [tool.poetry.group.dev.dependencies] black = "^24.4.2" -coverage = {extras = ["toml"], version = "^7.5.4"} +coverage = { extras = ["toml"], version = "^7.5.4" } isort = "^5.13.2" responses = "^0.25.3" ruff = "^0.5.0" @@ -79,13 +79,20 @@ force_grid_wrap = 0 line_length = 120 include_trailing_comma = true combine_as_imports = true -sections = ["FUTURE", "STDLIB", "THIRDPARTY", "DJANGO", "FIRSTPARTY", "LOCALFOLDER"] +sections = [ + "FUTURE", + "STDLIB", + "THIRDPARTY", + "DJANGO", + "FIRSTPARTY", + "LOCALFOLDER", +] known_django = ["django"] [tool.djlint] blank_line_after_tag = "load" custom_blocks = "render" -custom_html="temba-[a-z-]+" +custom_html = "temba-[a-z-]+" format_css = true format_js = true ignore = "H021,H023"