From 67d05932cdada10fb9c9377bf60a37a4f4747a5b Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Fri, 13 Sep 2024 01:48:38 +0300 Subject: [PATCH] docs and recipes updatte --- .github/workflows/setup.sh | 2 -- Dockerfile | 4 ---- docs/faq/general.rst | 6 +----- package/archlinux/PKGBUILD | 8 ++------ 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/setup.sh b/.github/workflows/setup.sh index 8c3a9ab4..1a8ab7ae 100755 --- a/.github/workflows/setup.sh +++ b/.github/workflows/setup.sh @@ -15,8 +15,6 @@ pacman -S --noconfirm devtools git pyalpm python-inflection python-passlib pytho pacman -S --noconfirm --asdeps base-devel python-build python-flit python-installer python-tox python-wheel # optional dependencies if [[ -z $MINIMAL_INSTALL ]]; then - # VCS support - pacman -S --noconfirm breezy darcs mercurial subversion # web server pacman -S --noconfirm python-aioauth-client python-aiohttp python-aiohttp-apispec-git python-aiohttp-cors python-aiohttp-jinja2 python-aiohttp-security python-aiohttp-session python-cryptography python-jinja # additional features diff --git a/Dockerfile b/Dockerfile index 5a887293..18fbd7f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,6 @@ RUN useradd -m -d "/home/build" -s "/usr/bin/nologin" build && \ echo "build ALL=(ALL) NOPASSWD: ALL" > "/etc/sudoers.d/build" COPY "docker/install-aur-package.sh" "/usr/local/bin/install-aur-package" ## install package dependencies -## 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 \ @@ -50,9 +49,7 @@ RUN pacman -Sy --noconfirm --asdeps \ python-wheel \ && \ pacman -Sy --noconfirm --asdeps \ - breezy \ git \ - mercurial \ python-aiohttp \ python-boto3 \ python-cerberus \ @@ -61,7 +58,6 @@ RUN pacman -Sy --noconfirm --asdeps \ python-matplotlib \ python-systemd \ rsync \ - subversion \ && \ runuser -u build -- install-aur-package \ python-aioauth-client \ diff --git a/docs/faq/general.rst b/docs/faq/general.rst index 8ac04879..c7f00682 100644 --- a/docs/faq/general.rst +++ b/docs/faq/general.rst @@ -265,11 +265,7 @@ TL;DR How to update VCS packages ^^^^^^^^^^^^^^^^^^^^^^^^^^ -Normally the service handles VCS packages correctly, however it requires additional dependencies: - -.. code-block:: shell - - pacman -S breezy darcs mercurial subversion +Normally the service handles VCS packages correctly. The version is updated in clean chroot, no additional actions are required. How to review changes before build ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 59b4b36f..31b7ca90 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -9,10 +9,7 @@ url="https://github.com/arcan1s/ahriman" license=('GPL3') depends=('devtools>=1:1.0.0' 'git' 'pyalpm' 'python-inflection' 'python-passlib' 'python-pyelftools' 'python-requests' 'python-srcinfo') makedepends=('python-build' 'python-flit' 'python-installer' 'python-wheel') -optdepends=('breezy: -bzr packages support' - 'darcs: -darcs packages support' - 'mercurial: -hg packages support' - 'python-aioauth-client: web server with OAuth2 authorization' +optdepends=('python-aioauth-client: web server with OAuth2 authorization' 'python-aiohttp: web server' 'python-aiohttp-apispec>=3.0.0: web server' 'python-aiohttp-cors: web server' @@ -26,8 +23,7 @@ optdepends=('breezy: -bzr packages support' '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' - 'subversion: -svn packages support') + 'rsync: sync by using rsync') source=("https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" 'ahriman.sysusers' 'ahriman.tmpfiles')