From 0022bd3744cdf7cbacf93b2aec60e541e1de75d6 Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Tue, 25 Feb 2025 20:53:05 +0100 Subject: [PATCH 1/2] chore(deps): drop zanata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Originally has been installed as a dependency of: • python3-simpleline • anaconda Both of these projects have dropped it already and it's no longer packaged in the Fedora. Signed-off-by: Matej Focko --- files/install-rpm-packages.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/files/install-rpm-packages.yaml b/files/install-rpm-packages.yaml index 872e37c..e6760b6 100644 --- a/files/install-rpm-packages.yaml +++ b/files/install-rpm-packages.yaml @@ -28,7 +28,6 @@ - systemd-devel # https://github.com/Scribery/tlog/pull/274 - libcurl-devel # / - python3-setuptools_scm # ansible-lint - - python3-zanata-client # for those who use zanata for localization - rubygems # https://github.com/packit/packit-service/issues/771 # needed for rust-based projects - rust From 0189498372be5f8b1bff23f0eb5e6b0f9f965247 Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Tue, 25 Feb 2025 21:06:41 +0100 Subject: [PATCH 2/2] =?UTF-8?q?fix(deps):=20install=20=E2=80=B9rust2rpm?= =?UTF-8?q?=E2=80=BA=20from=20Fedora?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And also install required ‹pip› and ‹rust2rpm› via ‹pip› for the CentOS. Signed-off-by: Matej Focko --- files/install-rpm-packages.yaml | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/files/install-rpm-packages.yaml b/files/install-rpm-packages.yaml index e6760b6..df3ef27 100644 --- a/files/install-rpm-packages.yaml +++ b/files/install-rpm-packages.yaml @@ -55,8 +55,6 @@ # for python projects using hatch-vcs - hatch - python3-hatch-vcs - # for rust2rpm - - python3.11-pip # for go-vendor-tools - trivy - askalono-cli @@ -70,13 +68,32 @@ name: build tags: - basic-image - - name: Install rust2rpm that is not packaged for EL9. - ansible.builtin.pip: - name: git+https://pagure.io/fedora-rust/rust2rpm.git - # cargo2rpm is built for Python 3.11 - executable: pip3.11 + + - name: Install ‹rust2rpm› on CentOS Stream 9 + block: + - name: Install ‹pip› of Python 3.11 + ansible.builtin.dnf: + name: python3.11-pip + state: present + install_weak_deps: False + - name: Install rust2rpm that is not packaged for EL9. + ansible.builtin.pip: + name: git+https://pagure.io/fedora-rust/rust2rpm.git + # cargo2rpm is built for Python 3.11 (CentOS Stream 9) + executable: pip3.11 + tags: + - basic-image + when: ansible_distribution == "CentOS" + + - name: Install ‹rust2rpm› on Fedora + ansible.builtin.dnf: + name: rust2rpm + state: present + install_weak_deps: False tags: - basic-image + when: ansible_distribution == "Fedora" + - name: Install go-vendor-tools that is not packaged for EL9. ansible.builtin.pip: name: go-vendor-tools