From 148ef09e7032a1c1a4fd2c1f2f38df97b6a1a1bb Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Wed, 12 Jun 2024 17:03:52 +0300 Subject: [PATCH] build: use requests-unixsocket2 fork Since requests-2.32.0, the http+unix url scheme is brokek, check https://github.com/msabramo/requests-unixsocket/issues/73 for more details --- Dockerfile | 4 ++-- docs/architecture.rst | 2 +- docs/faq.rst | 2 +- package/archlinux/PKGBUILD | 2 +- pyproject.toml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0908cf01..baffd945 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,9 +34,9 @@ COPY "docker/install-aur-package.sh" "/usr/local/bin/install-aur-package" ## darcs is not installed by reasons, because it requires a lot haskell packages which dramatically increase image size RUN pacman -Sy --noconfirm --asdeps devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo && \ pacman -Sy --noconfirm --asdeps base-devel python-build python-flit python-installer python-wheel && \ - pacman -Sy --noconfirm --asdeps breezy git mercurial python-aiohttp python-boto3 python-cryptography python-jinja python-requests-unixsocket python-systemd rsync subversion && \ + pacman -Sy --noconfirm --asdeps breezy git mercurial python-aiohttp python-boto3 python-cryptography python-jinja python-systemd rsync subversion && \ runuser -u build -- install-aur-package python-aioauth-client python-webargs python-aiohttp-apispec-git python-aiohttp-cors \ - python-aiohttp-jinja2 python-aiohttp-session python-aiohttp-security + python-aiohttp-jinja2 python-aiohttp-session python-aiohttp-security python-requests-unixsocket2 ## FIXME since 1.0.4 devtools requires dbus to be run, which doesn't work now in container COPY "docker/systemd-nspawn.sh" "/usr/local/bin/systemd-nspawn" diff --git a/docs/architecture.rst b/docs/architecture.rst index a7161825..be6caeed 100644 --- a/docs/architecture.rst +++ b/docs/architecture.rst @@ -366,7 +366,7 @@ Web application requires the following python packages to be installed: * Additional web features also require ``aiohttp-apispec`` (autogenerated documentation), ``aiohttp_cors`` (CORS support, required by documentation). * In addition, authorization feature requires ``aiohttp_security``, ``aiohttp_session`` and ``cryptography``. * In addition to base authorization dependencies, OAuth2 also requires ``aioauth-client`` library. -* In addition if you would like to disable authorization for local access (recommended way in order to run the application itself with reporting support), the ``requests-unixsocket`` library is required. +* In addition if you would like to disable authorization for local access (recommended way in order to run the application itself with reporting support), the ``requests-unixsocket2`` library is required. Middlewares ^^^^^^^^^^^ diff --git a/docs/faq.rst b/docs/faq.rst index e97a5405..c17ce015 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -1313,7 +1313,7 @@ How to enable basic authorization The ``salt`` parameter is optional, but recommended, and can be set to any (random) string. #. - In order to provide access for reporting from application instances you can (the recommended way) use unix sockets by the following configuration (note, that it requires ``python-requests-unixsocket`` package to be installed): + In order to provide access for reporting from application instances you can (the recommended way) use unix sockets by the following configuration (note, that it requires ``python-requests-unixsocket2`` package to be installed): .. code-block:: ini diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 4302e8ac..8564fbcb 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -21,7 +21,7 @@ optdepends=('breezy: -bzr packages support' 'python-aiohttp-session: web server with authorization' 'python-boto3: sync to s3' 'python-cryptography: web server with authorization' - 'python-requests-unixsocket: client report to web server by unix socket' + 'python-requests-unixsocket2: client report to web server by unix socket' 'python-jinja: html report generation' 'python-systemd: journal support' 'rsync: sync by using rsync' diff --git a/pyproject.toml b/pyproject.toml index b5c13e73..47a96c7d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -80,7 +80,7 @@ web = [ "aiohttp_session", "aiohttp_security", "cryptography", - "requests-unixsocket", # required by unix socket support + "requests-unixsocket2", # required by unix socket support "setuptools", # required by aiohttp-apispec ]