From 6470b135115dce3661484eba22d4e31afa442d83 Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Thu, 1 Apr 2021 02:38:59 +0300 Subject: [PATCH] Release 0.20.0 --- package/archlinux/PKGBUILD | 4 ++-- src/ahriman/core/repository/properties.py | 2 ++ src/ahriman/core/repository/update_handler.py | 4 +--- src/ahriman/version.py | 2 +- tests/ahriman/core/repository/test_update_handler.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index b37dd1ba..499559c7 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Evgeniy Alekseev pkgname='ahriman' -pkgver=0.19.0 +pkgver=0.20.0 pkgrel=1 pkgdesc="ArcHlinux ReposItory MANager" arch=('any') @@ -23,7 +23,7 @@ optdepends=('aws-cli: sync to s3' source=("https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz" 'ahriman.sysusers' 'ahriman.tmpfiles') -sha512sums=('af644c52c990268f1190632ccd514f351283d5578b161aebd2819d02e9d6a041571d50fe54ca03568bdabecca2e0492222b1a88bffef6bc0eab4e7460193df61' +sha512sums=('22d2d2ae5af4a5854eb08b3b97a5fe4faa85246a85ffa78fa350080cf40a42b77152a83e0184ba848a8d06a0cce8a02a6fd94e24982ebbcc80bb88901d229f25' '13718afec2c6786a18f0b223ef8e58dccf0688bca4cdbe203f14071f5031ed20120eb0ce38b52c76cfd6e8b6581a9c9eaa2743eb11abbaca637451a84c33f075' '55b20f6da3d66e7bbf2add5d95a3b60632df121717d25a993e56e737d14f51fe063eb6f1b38bd81cc32e05db01c0c1d80aaa720c45cde87f238d8b46cdb8cbc4') backup=('etc/ahriman.ini' diff --git a/src/ahriman/core/repository/properties.py b/src/ahriman/core/repository/properties.py index 80c6cd55..e2b040b2 100644 --- a/src/ahriman/core/repository/properties.py +++ b/src/ahriman/core/repository/properties.py @@ -33,6 +33,7 @@ class Properties: :ivar architecture: repository architecture :ivar aur_url: base AUR url :ivar configuration: configuration instance + :ivar ignore_list: package bases which will be ignored during auto updates :ivar logger: class logger :ivar name: repository name :ivar pacman: alpm wrapper instance @@ -53,6 +54,7 @@ class Properties: self.paths = RepositoryPaths(configuration.getpath("repository", "root"), architecture) self.paths.create_tree() + self.ignore_list = configuration.getlist("build", "ignore_packages") self.pacman = Pacman(configuration) self.sign = GPG(architecture, configuration) self.repo = Repo(self.name, self.paths, self.sign.repository_sign_args) diff --git a/src/ahriman/core/repository/update_handler.py b/src/ahriman/core/repository/update_handler.py index 1332c7df..789ef547 100644 --- a/src/ahriman/core/repository/update_handler.py +++ b/src/ahriman/core/repository/update_handler.py @@ -44,10 +44,8 @@ class UpdateHandler(Cleaner): """ result: List[Package] = [] - ignore_list = self.configuration.getlist("build", "ignore_packages") - for local in self.packages(): - if local.base in ignore_list: + if local.base in self.ignore_list: continue if local.is_vcs and no_vcs: continue diff --git a/src/ahriman/version.py b/src/ahriman/version.py index 200baf24..b3e0ebf1 100644 --- a/src/ahriman/version.py +++ b/src/ahriman/version.py @@ -17,4 +17,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -__version__ = "0.19.0" +__version__ = "0.20.0" diff --git a/tests/ahriman/core/repository/test_update_handler.py b/tests/ahriman/core/repository/test_update_handler.py index f896a6a0..125abfa1 100644 --- a/tests/ahriman/core/repository/test_update_handler.py +++ b/tests/ahriman/core/repository/test_update_handler.py @@ -50,7 +50,7 @@ def test_updates_aur_ignore(update_handler: UpdateHandler, package_ahriman: Pack """ must skip ignore packages """ - mocker.patch("ahriman.core.configuration.Configuration.getlist", return_value=[package_ahriman.base]) + update_handler.ignore_list = [package_ahriman.base] mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.packages", return_value=[package_ahriman]) package_load_mock = mocker.patch("ahriman.models.package.Package.load")