Sync from SUSE:SLFO:Main obs-service-replace_using_package_version revision ec422405f2c9a0885700ea990cbaa175

This commit is contained in:
Adrian Schröter 2024-10-03 17:41:24 +02:00
parent a060236ca2
commit 9425fbc7af
5 changed files with 35 additions and 7 deletions

View File

@ -1,5 +1,5 @@
<services> <services>
<service name="obs_scm" mode="disabled"> <service name="obs_scm" mode="manual">
<param name="url">https://github.com/openSUSE/obs-service-replace_using_package_version.git</param> <param name="url">https://github.com/openSUSE/obs-service-replace_using_package_version.git</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="filename">replace_using_package_version</param> <param name="filename">replace_using_package_version</param>
@ -11,6 +11,6 @@
<param name="version">_none_</param> <param name="version">_none_</param>
<param name="changesgenerate">enable</param> <param name="changesgenerate">enable</param>
<param name="changesauthor">containers@suse.com</param> <param name="changesauthor">containers@suse.com</param>
<param name="revision">master</param> <param name="revision">@PARENT_TAG@</param>
</service> </service>
</services> </services>

View File

@ -1,4 +1,4 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">https://github.com/openSUSE/obs-service-replace_using_package_version.git</param> <param name="url">https://github.com/openSUSE/obs-service-replace_using_package_version.git</param>
<param name="changesrevision">eb96e8582f54b9e2c5c5259e379ced1e79cd642d</param></service></servicedata> <param name="changesrevision">72fe58b8a7d29342985f4304dcf1c0c4d0b1c18c</param></service></servicedata>

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Fri Jun 14 18:33:15 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
- Fix shebang of the script to use the explicit version of Python
(bsc#1212476).
-------------------------------------------------------------------
Wed Dec 13 20:47:44 UTC 2023 - containers@suse.com
- Update to version 1702495728.72fe58b:
* Bump version: 0.0.8 → 0.0.9
* Bump actions/setup-python from 4.8.0 to 5.0.0
* Bump actions/setup-python from 4.7.1 to 4.8.0
* Workaround integration test failures due to PEP 668 marker
* Bump actions/setup-python from 4.6.1 to 4.7.1
* Bump actions/checkout from 3 to 4
* Report the package name that is missing (#56)
* Bump pytest-container from 0.1.1 to 0.2.0
* Drop mock dependency, stdlib has it
* Bump actions/setup-python from 4.6.0 to 4.6.1
* Bump actions/setup-python from 4.5.0 to 4.6.0
* Bump version: 0.0.7 → 0.0.8
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 11 10:19:11 UTC 2023 - containers@suse.com Tue Apr 11 10:19:11 UTC 2023 - containers@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file # spec file for package obs-service-replace_using_package_version
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,7 +19,7 @@
%define service replace_using_package_version %define service replace_using_package_version
Name: obs-service-%{service} Name: obs-service-%{service}
Version: 0.0.7 Version: 0.0.9
Release: 0 Release: 0
Summary: An OBS service: Replaces a regex with the version value of a package Summary: An OBS service: Replaces a regex with the version value of a package
License: GPL-3.0-or-later License: GPL-3.0-or-later
@ -29,6 +29,8 @@ Source0: %{service}.py
Source1: %{service}.service Source1: %{service}.service
Source2: LICENSE Source2: LICENSE
BuildRequires: sed BuildRequires: sed
# for the __python3 macro
BuildRequires: python-rpm-macros
Requires: python3-docopt Requires: python3-docopt
Requires: python3-rpm Requires: python3-rpm
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -51,6 +53,9 @@ sed -i "s|#!/usr/bin/env python3|#!/usr/bin/python3|g" %{service}.py
install -D -m 755 %{service}.py %{buildroot}%{_prefix}/lib/obs/service/%{service} install -D -m 755 %{service}.py %{buildroot}%{_prefix}/lib/obs/service/%{service}
install -D -m 644 %{service}.service %{buildroot}%{_prefix}/lib/obs/service/%{service}.service install -D -m 644 %{service}.service %{buildroot}%{_prefix}/lib/obs/service/%{service}.service
# Doing %%python3_fix_shebang_path old fashioned way for the backward compatibility
sed -i "1s@#\\!.*python\S*@#\\!$(realpath %__python3)@" \
%{buildroot}%{_prefix}/lib/obs/service/%{service}
%files %files
%defattr(-,root,root) %defattr(-,root,root)

View File

@ -171,7 +171,7 @@ def find_package_version(package, rpm_dir):
version = find_package_version_in_obsinfo('.', package) version = find_package_version_in_obsinfo('.', package)
if version is None: if version is None:
raise Exception('Package version not found') raise Exception(f'Package {package} version not found')
return str(version) return str(version)