diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 622305d..2889bc5 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -6,8 +6,8 @@ on: branches: ['main'] workflow_dispatch: env: - PYTHON_VERSION: '3.13.1' - POETRY_VERSION: '2.1.4' + PYTHON_VERSION: '3.14.3' + POETRY_VERSION: '2.3.2' LINT_PATHS: > app tests diff --git a/.vscode/extensions.json b/.vscode/extensions.json index fc70cda..171f02f 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,8 +3,6 @@ "ms-python.black-formatter", "ms-azuretools.vscode-docker", "editorconfig.editorconfig", - "visualstudioexptteam.vscodeintellicode", - "visualstudioexptteam.intellicode-api-usage-examples", "ms-python.isort", "ms-ossdata.vscode-postgresql", "ms-python.vscode-pylance", diff --git a/poetry.lock b/poetry.lock index d352f0c..02fea98 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.2.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.3.2 and should not be changed by hand. [[package]] name = "alembic" @@ -518,14 +518,14 @@ tests = ["asttokens (>=2.1.0)", "coverage", "coverage-enable-subprocess", "ipyth [[package]] name = "fastapi" -version = "0.135.2" +version = "0.135.3" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" optional = false python-versions = ">=3.10" groups = ["main"] files = [ - {file = "fastapi-0.135.2-py3-none-any.whl", hash = "sha256:0af0447d541867e8db2a6a25c23a8c4bd80e2394ac5529bd87501bbb9e240ca5"}, - {file = "fastapi-0.135.2.tar.gz", hash = "sha256:88a832095359755527b7f63bb4c6bc9edb8329a026189eed83d6c1afcf419d56"}, + {file = "fastapi-0.135.3-py3-none-any.whl", hash = "sha256:9b0f590c813acd13d0ab43dd8494138eb58e484bfac405db1f3187cfc5810d98"}, + {file = "fastapi-0.135.3.tar.gz", hash = "sha256:bd6d7caf1a2bdd8d676843cdcd2287729572a1ef524fc4d65c17ae002a1be654"}, ] [package.dependencies] @@ -1448,14 +1448,14 @@ files = [ [[package]] name = "pygments" -version = "2.19.2" +version = "2.20.0" description = "Pygments is a syntax highlighting package written in Python." optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["dev", "test"] files = [ - {file = "pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b"}, - {file = "pygments-2.19.2.tar.gz", hash = "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887"}, + {file = "pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176"}, + {file = "pygments-2.20.0.tar.gz", hash = "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f"}, ] [package.extras] @@ -1642,14 +1642,14 @@ testing = ["filelock"] [[package]] name = "python-discovery" -version = "1.2.0" +version = "1.2.1" description = "Python interpreter discovery" optional = false python-versions = ">=3.8" groups = ["dev"] files = [ - {file = "python_discovery-1.2.0-py3-none-any.whl", hash = "sha256:1e108f1bbe2ed0ef089823d28805d5ad32be8e734b86a5f212bf89b71c266e4a"}, - {file = "python_discovery-1.2.0.tar.gz", hash = "sha256:7d33e350704818b09e3da2bd419d37e21e7c30db6e0977bb438916e06b41b5b1"}, + {file = "python_discovery-1.2.1-py3-none-any.whl", hash = "sha256:b6a957b24c1cd79252484d3566d1b49527581d46e789aaf43181005e56201502"}, + {file = "python_discovery-1.2.1.tar.gz", hash = "sha256:180c4d114bff1c32462537eac5d6a332b768242b76b69c0259c7d14b1b680c9e"}, ] [package.dependencies] @@ -2034,14 +2034,14 @@ files = [ [[package]] name = "tox" -version = "4.50.3" +version = "4.52.0" description = "tox is a generic virtualenv management and test command line tool" optional = false python-versions = ">=3.10" groups = ["dev"] files = [ - {file = "tox-4.50.3-py3-none-any.whl", hash = "sha256:5e788a512bfe6f7447e0c8d7c1b666eb2e56e5e676c65717490423bec37d1a07"}, - {file = "tox-4.50.3.tar.gz", hash = "sha256:c745641de6cc4f19d066bd9f98c1c25f7affb005b381b7f3694a1f142ea0946b"}, + {file = "tox-4.52.0-py3-none-any.whl", hash = "sha256:624d8ea4a8c6d5e8d168eedf0e318d736fb22e83ca83137d001ac65ffdec46fd"}, + {file = "tox-4.52.0.tar.gz", hash = "sha256:6054abf5c8b61d58776fbec991f9bf0d34bb883862beb93d2fe55601ef3977c9"}, ] [package.dependencies] @@ -2052,6 +2052,7 @@ packaging = ">=26" platformdirs = ">=4.9.4" pluggy = ">=1.6" pyproject-api = ">=1.10" +python-discovery = ">=1.2.1" tomli-w = ">=1.2" virtualenv = ">=21.1" @@ -2445,5 +2446,5 @@ files = [ [metadata] lock-version = "2.1" -python-versions = "^3.13.1" -content-hash = "884a61dfcb02215363a3873f275950ec2b06238aa9484f78d939f56b661c7e5c" +python-versions = "^3.14.3" +content-hash = "b3310d1096a8fc33408480e1ae0595ad6c9cc1f1209f1364e2ad07c8d50ba1e7" diff --git a/pyproject.toml b/pyproject.toml index 97abc7b..c216348 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ packages = [{ include = "python_open_restaurant_fastapi" }] package-mode = false [tool.poetry.dependencies] -python = "^3.13.1" +python = "^3.14.3" alembic = "^1.18.4" alembic-utils = "^0.8.8" asyncpg = "^0.31.0" diff --git a/setup b/setup index d76e3df..77f4bff 100755 --- a/setup +++ b/setup @@ -1,11 +1,30 @@ #!/bin/bash git submodule update --init --remote --force -rebuild_venv=$1 -rebuild_venv="${rebuild_venv:-0}" +rebuild_venv=0 +if [ $# -gt 0 ]; then + if [ "$1" = "0" ] || [ "$1" = "1" ]; then + rebuild_venv="$1" + shift + elif [[ "$1" != -* ]]; then + echo "Invalid rebuild_venv positional argument: ($1). Valid values are [0, 1]" >&2 + exit 2 + fi +fi source utility-repo-scripts/setup_python_app.sh \ --debug \ + --python_version="3.14.3" \ --package_manager="poetry" \ --rebuild_venv="$rebuild_venv" \ - --python_formatter=black \ + --include_jumanji_house \ + --include_prettier \ + --include_isort \ + --isort_profile="black" \ + --python_formatter="black" \ + --pylint_enabled \ + --flake8_enabled \ + --mypy_enabled \ + --pytest_enabled \ + --pre_commit_autoupdate \ --overwrite_vscode_launch \ - --line_length=125 + --line_length=125 \ + "$@" diff --git a/utility-repo-scripts b/utility-repo-scripts index 0ecc12a..b29c245 160000 --- a/utility-repo-scripts +++ b/utility-repo-scripts @@ -1 +1 @@ -Subproject commit 0ecc12af82cc201378b115fdd12bf99c7bc1fb29 +Subproject commit b29c24596619b0020299edc62efcb10e72fe1701