From 081ca8785717ca3629e1f76d6d3dfab949fc84cb Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sun, 13 Nov 2022 14:31:03 +0100 Subject: [PATCH] Update dependencies. (#177) --- channels-lock.scm | 2 +- guix.scm | 55 ++++++++++------------------------------------- poetry.lock | 50 +++++++++++++++++++++--------------------- pyproject.toml | 2 +- 4 files changed, 38 insertions(+), 71 deletions(-) diff --git a/channels-lock.scm b/channels-lock.scm index 72f40b6..ac25cd9 100644 --- a/channels-lock.scm +++ b/channels-lock.scm @@ -10,7 +10,7 @@ (name 'guix) (url "https://git.savannah.gnu.org/git/guix.git") (commit - "cd0d27f30dc2274fbf8477f44275d9184521f044") + "42d1fa6fc4faabe9a4c327014c7289dda08ad8a2") (introduction (make-channel-introduction "afb9f2752315f131e4ddd44eba02eed403365085" diff --git a/guix.scm b/guix.scm index 13204e8..0d96987 100644 --- a/guix.scm +++ b/guix.scm @@ -3,12 +3,11 @@ #:use-module (guix build-system python) #:use-module (guix gexp) #:use-module (guix packages) - #:use-module (gnu packages base) ;; for tar - #:use-module (gnu packages bash) ;; for bash - #:use-module (gnu packages compression) ;; for gzip + #:use-module (guix utils) #:use-module (gnu packages databases) ;; for python-tortoise-orm + #:use-module (gnu packages markup) ;; for python-markdownify #:use-module (gnu packages python) - #:use-module (gnu packages python-web) ;; for python-tweepy + #:use-module (gnu packages python-web) ;; for python-uvicorn #:use-module (gnu packages python-xyz) ;; for dynaconf #:use-module (mobilizon-reshare package) #:use-module (mobilizon-reshare dependencies) @@ -22,35 +21,6 @@ #:recursive? #t #:select? (git-predicate %source-dir))) -(define mobilizon-reshare-git-origin-with-setup.py - (computed-file "source" - (with-imported-modules '((guix build utils) - (ice-9 string-fun)) - #~(begin - (let ((bash (string-append #$bash "/bin/bash")) - (gzip (string-append #$gzip "/bin/gzip")) - (poetry (string-append #$poetry "/bin/poetry")) - (sed (string-append #$sed "/bin/sed")) - (tar (string-append #$tar "/bin/tar")) - (tests-script "./scripts/run_pipeline_tests.sh") - (origin #$mobilizon-reshare-git-origin)) - (use-modules (guix build utils) - (ice-9 string-fun)) - (copy-recursively origin ".") - ;; This is an hack to obtain poetry's setup.py. - (setenv "POETRY_VIRTUALENVS_CREATE" "false") - (invoke poetry "build" "-f" "sdist") - (invoke bash "-c" - (string-append "cd dist && " - gzip " -cd ./*-`" poetry " version -s`.tar.gz > out.tar")) - (invoke bash "-c" - (string-append - tar " --wildcards -xvf dist/out.tar -O '*/setup.py' > setup.py")) - ;; Reduce source size. - (delete-file-recursively "dist") - (invoke sed "-i" "-E" (string-append "s/poetry/" (string-replace-substring poetry "/" "\\/") "/") tests-script) - (copy-recursively "." #$output)))))) - (define-public mobilizon-reshare.git (let ((source-version (with-input-from-file (string-append %source-dir @@ -62,25 +32,22 @@ (package (inherit mobilizon-reshare) (name "mobilizon-reshare.git") (version (git-version source-version revision commit)) - (source mobilizon-reshare-git-origin-with-setup.py) + (source mobilizon-reshare-git-origin) + (arguments + (substitute-keyword-arguments (package-arguments mobilizon-reshare) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'patch-pyproject.toml))))) (native-inputs (modify-inputs (package-native-inputs mobilizon-reshare) (prepend python-httpx python-fastapi))) (propagated-inputs (modify-inputs (package-propagated-inputs mobilizon-reshare) (prepend python-asyncpg python-uvicorn) - (replace "python-aerich" - python-aerich) - (replace "python-click" - python-click) (replace "dynaconf" dynaconf-3.1.11) - (replace "python-facebook-sdk" - python-facebook-sdk) - (replace "python-requests" - python-requests) - (replace "python-tweepy" - python-tweepy) + (replace "python-markdownify" + python-markdownify) (replace "python-tortoise-orm" python-tortoise-orm)))))) diff --git a/poetry.lock b/poetry.lock index 050ac84..197d033 100644 --- a/poetry.lock +++ b/poetry.lock @@ -38,7 +38,7 @@ python-versions = "*" [[package]] name = "anyio" -version = "3.6.1" +version = "3.6.2" description = "High level compatibility layer for multiple asynchronous event loop implementations" category = "main" optional = false @@ -51,7 +51,7 @@ sniffio = ">=1.1" [package.extras] doc = ["packaging", "sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "contextlib2", "uvloop (<0.15)", "mock (>=4)", "uvloop (>=0.15)"] -trio = ["trio (>=0.16)"] +trio = ["trio (>=0.16,<0.22)"] [[package]] name = "appdirs" @@ -85,16 +85,16 @@ tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] [[package]] name = "asyncpg" -version = "0.26.0" +version = "0.27.0" description = "An asyncio PostgreSQL driver" category = "main" optional = false -python-versions = ">=3.6.0" +python-versions = ">=3.7.0" [package.extras] -dev = ["Cython (>=0.29.24,<0.30.0)", "pytest (>=6.0)", "Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)", "pycodestyle (>=2.7.0,<2.8.0)", "flake8 (>=3.9.2,<3.10.0)", "uvloop (>=0.15.3)"] +dev = ["Cython (>=0.29.24,<0.30.0)", "pytest (>=6.0)", "Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)", "flake8 (>=5.0.4,<5.1.0)", "uvloop (>=0.15.3)"] docs = ["Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)"] -test = ["pycodestyle (>=2.7.0,<2.8.0)", "flake8 (>=3.9.2,<3.10.0)", "uvloop (>=0.15.3)"] +test = ["flake8 (>=5.0.4,<5.1.0)", "uvloop (>=0.15.3)"] [[package]] name = "asynctest" @@ -128,7 +128,7 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (> [[package]] name = "babel" -version = "2.10.3" +version = "2.11.0" description = "Internationalization utilities" category = "dev" optional = false @@ -162,11 +162,11 @@ python-versions = ">=3.6" [[package]] name = "charset-normalizer" -version = "2.0.12" +version = "2.1.1" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false -python-versions = ">=3.5.0" +python-versions = ">=3.6.0" [package.extras] unicode_backport = ["unicodedata2"] @@ -184,11 +184,11 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""} [[package]] name = "colorama" -version = "0.4.5" +version = "0.4.6" description = "Cross-platform colored terminal text." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" [[package]] name = "coverage" @@ -265,7 +265,7 @@ requests = "*" [[package]] name = "fastapi" -version = "0.85.1" +version = "0.85.2" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" category = "main" optional = false @@ -278,8 +278,8 @@ starlette = "0.20.4" [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 (>=0.4.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.971)", "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,<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)", "requests (>=2.24.0,<3.0.0)", "sqlalchemy (>=1.3.18,<1.5.0)", "types-orjson (==3.6.2)", "types-ujson (==5.4.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)"] +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)"] [[package]] name = "h11" @@ -612,7 +612,7 @@ unidecode = ["Unidecode (>=1.1.1)"] [[package]] name = "pytz" -version = "2022.4" +version = "2022.6" description = "World timezone definitions, modern and historical" category = "main" optional = false @@ -620,21 +620,21 @@ python-versions = "*" [[package]] name = "requests" -version = "2.27.1" +version = "2.28.1" description = "Python HTTP for Humans." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.7, <4" [package.dependencies] certifi = ">=2017.4.17" -charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} -idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} +charset-normalizer = ">=2,<3" +idna = ">=2.5,<4" urllib3 = ">=1.21.1,<1.27" [package.extras] -socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] -use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] +socks = ["PySocks (>=1.5.6,!=1.5.7)"] +use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "requests-oauthlib" @@ -902,11 +902,11 @@ python-versions = ">=3.7" [[package]] name = "tomlkit" -version = "0.11.5" +version = "0.11.6" description = "Style preserving TOML library" category = "main" optional = false -python-versions = ">=3.6,<4.0" +python-versions = ">=3.6" [[package]] name = "tortoise-orm" @@ -996,7 +996,7 @@ standard = ["websockets (>=10.0)", "httptools (>=0.4.0)", "watchgod (>=0.6)", "p [[package]] name = "zipp" -version = "3.9.0" +version = "3.10.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "dev" optional = false @@ -1009,7 +1009,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "flake8 [metadata] lock-version = "1.1" python-versions = "^3.9" -content-hash = "c3bb11774d4ccf55b297f20927f5fb685898ebd21cd36550f435968a311dbddf" +content-hash = "2aa23f0b2cdc0fbe76d3a7430e3a8ce65bd037dd737d64c1c22a6b6db0d8e66b" [metadata.files] aerich = [] diff --git a/pyproject.toml b/pyproject.toml index 53d1c8a..410c750 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ dynaconf = "~3.1" tortoise-orm = {extras = ["asyncpg"], version = "~0.19"} aiosqlite = "~0.17" Jinja2 = "~3.1" -requests = "~2.27" +requests = "~2.28" arrow = "~1.1" click = "~8.1" beautifulsoup4 = "~4.10"