From 904aa066292f64496f59f7733142e80f12cf6cb6 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sat, 2 Mar 2024 00:12:05 +0100 Subject: [PATCH] Fix docker image. --- guix.scm | 28 +++++++++++++++++++--------- poetry.lock | 41 +++++++++++++---------------------------- pyproject.toml | 4 ++-- 3 files changed, 34 insertions(+), 39 deletions(-) diff --git a/guix.scm b/guix.scm index ecdd932..2ea623a 100644 --- a/guix.scm +++ b/guix.scm @@ -5,7 +5,7 @@ #:use-module (guix packages) #:use-module (guix utils) #:use-module (gnu packages markup) ;; for python-markdownify - #:use-module (gnu packages python-web) ;; for python-fastapi-pagination-minimal + #:use-module (gnu packages python-web) ;; for python-fastapi-pagination-minimal and uvicorn #:use-module (gnu packages python-xyz) ;; for python-apscheduler #:use-module (mobilizon-reshare package) #:use-module (mobilizon-reshare dependencies) @@ -27,14 +27,24 @@ (revision "0") (commit (read-line (open-input-pipe "git show HEAD | head -1 | cut -d ' ' -f 2")))) - (package (inherit mobilizon-reshare) - (name "mobilizon-reshare.git") - (version (git-version source-version revision commit)) - (source mobilizon-reshare-git-origin) - (propagated-inputs - (modify-inputs (package-propagated-inputs mobilizon-reshare) - (replace "python-fastapi-pagination-minimal" python-fastapi-pagination-minimal) - (replace "python-markdownify" python-markdownify)))))) + ((package-input-rewriting/spec `(("python-fastapi" . ,(const python-fastapi)) + ("python-dotenv" . ,(const python-dotenv-0.13.0)) + ("python-uvicorn" . ,(const python-uvicorn)))) + (package (inherit mobilizon-reshare) + (name "mobilizon-reshare.git") + (version (git-version source-version revision commit)) + (source mobilizon-reshare-git-origin) + (propagated-inputs + (modify-inputs (package-propagated-inputs mobilizon-reshare) + (replace "python-uvicorn" python-uvicorn) + (replace "python-fastapi" python-fastapi) + (replace "python-fastapi-pagination-minimal" + (package + (inherit python-fastapi-pagination-minimal) + (propagated-inputs + (modify-inputs (package-propagated-inputs python-fastapi-pagination-minimal) + (replace "python-fastapi" python-fastapi))))) + (replace "python-markdownify" python-markdownify))))))) (define-public mobilizon-reshare-scheduler (package (inherit mobilizon-reshare.git) diff --git a/poetry.lock b/poetry.lock index c6b7598..c961915 100644 --- a/poetry.lock +++ b/poetry.lock @@ -74,20 +74,6 @@ python-versions = ">=3.6" [package.dependencies] python-dateutil = ">=2.7.0" -[[package]] -name = "asgiref" -version = "3.7.2" -description = "ASGI specs, helper code, and adapters" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.dependencies] -typing-extensions = {version = ">=4", markers = "python_version < \"3.11\""} - -[package.extras] -tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] - [[package]] name = "async-timeout" version = "4.0.3" @@ -290,7 +276,7 @@ requests = "*" [[package]] name = "fastapi" -version = "0.85.2" +version = "0.92.0" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" category = "main" optional = false @@ -298,13 +284,13 @@ python-versions = ">=3.7" [package.dependencies] pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0" -starlette = "0.20.4" +starlette = ">=0.25.0,<0.26.0" [package.extras] -all = ["email-validator (>=1.1.1,<2.0.0)", "itsdangerous (>=1.1.0,<3.0.0)", "jinja2 (>=2.11.2,<4.0.0)", "orjson (>=3.2.1,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "pyyaml (>=5.3.1,<7.0.0)", "requests (>=2.24.0,<3.0.0)", "ujson (>=4.0.1,!=4.0.2,!=4.1.0,!=4.2.0,!=4.3.0,!=5.0.0,!=5.1.0,<6.0.0)", "uvicorn[standard] (>=0.12.0,<0.19.0)"] -dev = ["autoflake (>=1.4.0,<2.0.0)", "flake8 (>=3.8.3,<6.0.0)", "pre-commit (>=2.17.0,<3.0.0)", "uvicorn[standard] (>=0.12.0,<0.19.0)"] -doc = ["mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "mkdocs-material (>=8.1.4,<9.0.0)", "mkdocs (>=1.1.2,<2.0.0)", "pyyaml (>=5.3.1,<7.0.0)", "typer[all] (>=0.6.1,<0.7.0)"] -test = ["anyio[trio] (>=3.2.1,<4.0.0)", "black (==22.8.0)", "databases[sqlite] (>=0.3.2,<0.7.0)", "email-validator (>=1.1.1,<2.0.0)", "flake8 (>=3.8.3,<6.0.0)", "flask (>=1.1.2,<3.0.0)", "httpx (>=0.23.0,<0.24.0)", "isort (>=5.0.6,<6.0.0)", "mypy (==0.982)", "orjson (>=3.2.1,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "peewee (>=3.13.3,<4.0.0)", "pytest-cov (>=2.12.0,<5.0.0)", "pytest (>=7.1.3,<8.0.0)", "python-jose[cryptography] (>=3.3.0,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "pyyaml (>=5.3.1,<7.0.0)", "requests (>=2.24.0,<3.0.0)", "sqlalchemy (>=1.3.18,<=1.4.41)", "types-orjson (==3.6.2)", "types-ujson (==5.5.0)", "ujson (>=4.0.1,!=4.0.2,!=4.1.0,!=4.2.0,!=4.3.0,!=5.0.0,!=5.1.0,<6.0.0)"] +all = ["email-validator (>=1.1.1)", "httpx (>=0.23.0)", "itsdangerous (>=1.1.0)", "jinja2 (>=2.11.2)", "orjson (>=3.2.1)", "python-multipart (>=0.0.5)", "pyyaml (>=5.3.1)", "ujson (>=4.0.1,!=4.0.2,!=4.1.0,!=4.2.0,!=4.3.0,!=5.0.0,!=5.1.0)", "uvicorn[standard] (>=0.12.0)"] +dev = ["pre-commit (>=2.17.0,<3.0.0)", "ruff (==0.0.138)", "uvicorn[standard] (>=0.12.0,<0.21.0)"] +doc = ["mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "mkdocs-material (>=8.1.4,<9.0.0)", "mkdocs (>=1.1.2,<2.0.0)", "pyyaml (>=5.3.1,<7.0.0)", "typer[all] (>=0.6.1,<0.8.0)"] +test = ["anyio[trio] (>=3.2.1,<4.0.0)", "black (==22.10.0)", "coverage[toml] (>=6.5.0,<8.0)", "databases[sqlite] (>=0.3.2,<0.7.0)", "email-validator (>=1.1.1,<2.0.0)", "flask (>=1.1.2,<3.0.0)", "httpx (>=0.23.0,<0.24.0)", "isort (>=5.0.6,<6.0.0)", "mypy (==0.982)", "orjson (>=3.2.1,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "peewee (>=3.13.3,<4.0.0)", "pytest (>=7.1.3,<8.0.0)", "python-jose[cryptography] (>=3.3.0,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "pyyaml (>=5.3.1,<7.0.0)", "ruff (==0.0.138)", "sqlalchemy (>=1.3.18,<1.4.43)", "types-orjson (==3.6.2)", "types-ujson (==5.6.0.0)", "ujson (>=4.0.1,!=4.0.2,!=4.1.0,!=4.2.0,!=4.3.0,!=5.0.0,!=5.1.0,<6.0.0)"] [[package]] name = "fastapi-pagination" @@ -879,7 +865,7 @@ test = ["pytest"] [[package]] name = "starlette" -version = "0.20.4" +version = "0.25.0" description = "The little ASGI library that shines." category = "main" optional = false @@ -889,7 +875,7 @@ python-versions = ">=3.7" anyio = ">=3.4.0,<5" [package.extras] -full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests"] +full = ["httpx (>=0.22.0)", "itsdangerous", "jinja2", "python-multipart", "pyyaml"] [[package]] name = "text-unidecode" @@ -1005,24 +991,24 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "uvicorn" -version = "0.17.6" +version = "0.23.2" description = "The lightning-fast ASGI server." category = "main" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" [package.dependencies] -asgiref = ">=3.4.0" click = ">=7.0" h11 = ">=0.8" +typing-extensions = {version = ">=4.0", markers = "python_version < \"3.11\""} [package.extras] -standard = ["websockets (>=10.0)", "httptools (>=0.4.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"] +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)"] [metadata] lock-version = "1.1" python-versions = "^3.10" -content-hash = "89e84928564653435f7e8b547f4d5fc68edf0c25c09a05e51d08d234b4b17e52" +content-hash = "a81b518a3185eb0b2c42e6c927dab3f46dd91eb749cb52a1fbd0a462d51b685c" [metadata.files] aerich = [] @@ -1031,7 +1017,6 @@ alabaster = [] anyio = [] appdirs = [] arrow = [] -asgiref = [] async-timeout = [] asyncpg = [] asynctest = [] diff --git a/pyproject.toml b/pyproject.toml index 0b7a1d4..feeba8c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,8 +23,8 @@ appdirs = "~1.4" tweepy = "~4.13" facebook-sdk = "~3.1" aerich = "~0.6" -fastapi = "~0.85" -uvicorn = "~0.17" +fastapi = "~0.92" +uvicorn = "~0.23" fastapi-pagination = "~0.12" [tool.poetry.dev-dependencies]