From 89613e7b2ad8b06b1cfbf4038ad8e9dbf2a0feaf Mon Sep 17 00:00:00 2001 From: Marijn Doeve Date: Sun, 24 Sep 2023 21:20:37 +0200 Subject: [PATCH] Update deps, makefile and compose config --- .pre-commit-config.yaml | 4 ++-- Makefile | 3 +++ compose.prod.yaml | 1 + poetry.lock | 24 +++++++++++++----------- requirements.txt | 10 +++++----- 5 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 Makefile diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 76a9d58..911955d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: - id: check-yaml - id: check-added-large-files - repo: https://github.com/python-poetry/poetry - rev: 1.5.0 # add version here + rev: 1.6.0 # add version here hooks: - id: poetry-check - id: poetry-lock @@ -23,6 +23,6 @@ repos: "--without-hashes", ] - repo: https://github.com/psf/black - rev: 23.3.0 + rev: 23.9.1 hooks: - id: black diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e91dcee --- /dev/null +++ b/Makefile @@ -0,0 +1,3 @@ +.PHONY: prod +prod: + docker compose -f compose.yaml compose.prod.yaml up -d diff --git a/compose.prod.yaml b/compose.prod.yaml index daf5740..05d4916 100644 --- a/compose.prod.yaml +++ b/compose.prod.yaml @@ -1,3 +1,4 @@ services: app: image: gitea.marijndoeve.nl/marijn/projectorpi-web:${IMAGE_TAG:-latest} + restart: always diff --git a/poetry.lock b/poetry.lock index 96ef5d2..3a5d78d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -885,13 +885,13 @@ files = [ [[package]] name = "sentry-sdk" -version = "1.30.0" +version = "1.31.0" description = "Python client for Sentry (https://sentry.io)" optional = false python-versions = "*" files = [ - {file = "sentry-sdk-1.30.0.tar.gz", hash = "sha256:7dc873b87e1faf4d00614afd1058bfa1522942f33daef8a59f90de8ed75cd10c"}, - {file = "sentry_sdk-1.30.0-py2.py3-none-any.whl", hash = "sha256:2e53ad63f96bb9da6570ba2e755c267e529edcf58580a2c0d2a11ef26e1e678b"}, + {file = "sentry-sdk-1.31.0.tar.gz", hash = "sha256:6de2e88304873484207fed836388e422aeff000609b104c802749fd89d56ba5b"}, + {file = "sentry_sdk-1.31.0-py2.py3-none-any.whl", hash = "sha256:64a7141005fb775b9db298a30de93e3b83e0ddd1232dc6f36eb38aebc1553291"}, ] [package.dependencies] @@ -902,10 +902,12 @@ urllib3 = {version = ">=1.26.11", markers = "python_version >= \"3.6\""} [package.extras] aiohttp = ["aiohttp (>=3.5)"] arq = ["arq (>=0.23)"] +asyncpg = ["asyncpg (>=0.23)"] beam = ["apache-beam (>=2.12)"] bottle = ["bottle (>=0.12.13)"] celery = ["celery (>=3)"] chalice = ["chalice (>=1.16.0)"] +clickhouse-driver = ["clickhouse-driver (>=0.2.0)"] django = ["django (>=1.8)"] falcon = ["falcon (>=1.4)"] fastapi = ["fastapi (>=0.79.0)"] @@ -969,13 +971,13 @@ files = [ [[package]] name = "typing-extensions" -version = "4.7.1" -description = "Backported and Experimental Type Hints for Python 3.7+" +version = "4.8.0" +description = "Backported and Experimental Type Hints for Python 3.8+" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "typing_extensions-4.7.1-py3-none-any.whl", hash = "sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36"}, - {file = "typing_extensions-4.7.1.tar.gz", hash = "sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2"}, + {file = "typing_extensions-4.8.0-py3-none-any.whl", hash = "sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0"}, + {file = "typing_extensions-4.8.0.tar.gz", hash = "sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef"}, ] [[package]] @@ -1050,13 +1052,13 @@ files = [ [[package]] name = "urllib3" -version = "2.0.4" +version = "2.0.5" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false python-versions = ">=3.7" files = [ - {file = "urllib3-2.0.4-py3-none-any.whl", hash = "sha256:de7df1803967d2c2a98e4b11bb7d6bd9210474c46e8a0401514e3a42a75ebde4"}, - {file = "urllib3-2.0.4.tar.gz", hash = "sha256:8d22f86aae8ef5e410d4f539fde9ce6b2113a001bb4d189e0aed70642d602b11"}, + {file = "urllib3-2.0.5-py3-none-any.whl", hash = "sha256:ef16afa8ba34a1f989db38e1dbbe0c302e4289a47856990d0682e374563ce35e"}, + {file = "urllib3-2.0.5.tar.gz", hash = "sha256:13abf37382ea2ce6fb744d4dad67838eec857c9f4f57009891805e0b5e123594"}, ] [package.extras] diff --git a/requirements.txt b/requirements.txt index 111977e..1a1852f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ annotated-types==0.5.0 ; python_version >= "3.9" and python_version < "4.0" anyio==4.0.0 ; python_version >= "3.9" and python_version < "4.0" certifi==2023.7.22 ; python_version >= "3.9" and python_version < "4.0" click==8.1.7 ; python_version >= "3.9" and python_version < "4.0" -colorama==0.4.6 ; python_version >= "3.9" and python_version < "4.0" and platform_system == "Windows" +colorama==0.4.6 ; python_version >= "3.9" and python_version < "4.0" and (sys_platform == "win32" or platform_system == "Windows") dnspython==2.4.2 ; python_version >= "3.9" and python_version < "4.0" email-validator==2.0.0.post2 ; python_version >= "3.9" and python_version < "4.0" exceptiongroup==1.1.3 ; python_version >= "3.9" and python_version < "3.11" @@ -28,13 +28,13 @@ pyserial==3.5 ; python_version >= "3.9" and python_version < "4.0" python-dotenv==1.0.0 ; python_version >= "3.9" and python_version < "4.0" python-multipart==0.0.6 ; python_version >= "3.9" and python_version < "4.0" pyyaml==6.0.1 ; python_version >= "3.9" and python_version < "4.0" -sentry-sdk==1.30.0 ; python_version >= "3.9" and python_version < "4.0" -sentry-sdk[fastapi]==1.30.0 ; python_version >= "3.9" and python_version < "4.0" +sentry-sdk==1.31.0 ; python_version >= "3.9" and python_version < "4.0" +sentry-sdk[fastapi]==1.31.0 ; python_version >= "3.9" and python_version < "4.0" sniffio==1.3.0 ; python_version >= "3.9" and python_version < "4.0" starlette==0.27.0 ; python_version >= "3.9" and python_version < "4.0" -typing-extensions==4.7.1 ; python_version >= "3.9" and python_version < "4.0" +typing-extensions==4.8.0 ; python_version >= "3.9" and python_version < "4.0" ujson==5.8.0 ; python_version >= "3.9" and python_version < "4.0" -urllib3==2.0.4 ; python_version >= "3.9" and python_version < "4.0" +urllib3==2.0.5 ; python_version >= "3.9" and python_version < "4.0" uvicorn[standard]==0.23.2 ; python_version >= "3.9" and python_version < "4.0" uvloop==0.17.0 ; (sys_platform != "win32" and sys_platform != "cygwin") and platform_python_implementation != "PyPy" and python_version >= "3.9" and python_version < "4.0" watchfiles==0.20.0 ; python_version >= "3.9" and python_version < "4.0" -- 2.49.1