From 5d4dbd1da8989ec6b745a53de81d6dbf42339e037b68627dff7dd8672fc31c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 17 Jan 2024 07:55:08 +0000 Subject: [PATCH 1/3] fix amazon build OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=430 --- osc.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/osc.spec b/osc.spec index 70d5a73..5389356 100644 --- a/osc.spec +++ b/osc.spec @@ -1,7 +1,7 @@ # # spec file for package osc # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %define use_python python3 %define use_python_pkg python3 @@ -41,7 +42,7 @@ %endif # whether to use fdupes to deduplicate python bytecode -%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} >= 8 +%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?amazonlinux} %bcond_without fdupes %else %bcond_with fdupes From a68fc3ef159a021c8b26649eaa02149e26305da4742ff70ec59a2e1e5e84924d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 17 Jan 2024 14:46:02 +0000 Subject: [PATCH 2/3] use other amazon macro OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=431 --- osc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osc.spec b/osc.spec index 5389356..cf7f748 100644 --- a/osc.spec +++ b/osc.spec @@ -42,7 +42,7 @@ %endif # whether to use fdupes to deduplicate python bytecode -%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?amazonlinux} +%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?amzn} %bcond_without fdupes %else %bcond_with fdupes From 09ab4b21c3cff08a5b787984de12e311ee5c20958722e33d60f1ed90ab5db2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 25 Jan 2024 09:45:02 +0000 Subject: [PATCH 3/3] Accepting request 1141459 from home:dmach:branches:openSUSE:Tools - 1.6.0 - Command-line: - The 'token --trigger' command no longer sets '--operation=runservice' by default. - Change 'token --create' command to require '--operation' - Fix 'linkdiff' command error 400: prj/pac/md5 not in repository - Update 'build' command to support building 'productcompose' build type with updateinfo.xml data - Don't show meter in terminals that are not interactive - Fix traceback when running osc from an arbitrary git repo that fails to map branch to a project (boo#1218170) - Configuration: - Implement reading credentials from environmental variables - Allow starting with an empty config if --configfile is either empty or points to /dev/null - Implement 'quiet' conf option - Password can be an empty string (commonly used with ssh auth) - Connection: - Allow -X HEAD on osc api requests as well - Library: - Fix credentials managers to consistently return Password - Fix Password.encode() on python < 3.8 - Refactor 'meter' module, use config settings to pick the right class - Convert to using f-strings - Use Field.get_callback to handle quiet/verbose and http_debug/http_full_debug options - Implement get_callback that allows modifying returned value to the Field class - Add support for List[BaseModel] type to Field class - Report class name when reporting an error during instantiating BaseModel object - Fix exporting an empty model field in BaseModel.dict() - Fix initializing a sub-model instance from a dictionary - Implement 'Enum' support in models - Fix Field.origin_type for Optional types - Drop unused 'exclude_unset' argument from BaseModel.dict() method - Store cached model defaults in self._defaults, avoid sharing references to mutable defaults OBS-URL: https://build.opensuse.org/request/show/1141459 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=432 --- PKGBUILD | 2 +- debian.changelog | 2 +- osc-1.5.1.tar.gz | 3 --- osc-1.6.0.tar.gz | 3 +++ osc.changes | 39 +++++++++++++++++++++++++++++++++++++++ osc.dsc | 2 +- osc.spec | 10 ++++++---- 7 files changed, 51 insertions(+), 10 deletions(-) delete mode 100644 osc-1.5.1.tar.gz create mode 100644 osc-1.6.0.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 1338f24..0a6c3a1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=osc -pkgver=1.5.1 +pkgver=1.6.0 pkgrel=0 pkgdesc="Command-line client for the Open Build Service" arch=('x86_64') diff --git a/debian.changelog b/debian.changelog index f1f019b..d3e8177 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -osc (1.5.1-0) unstable; urgency=low +osc (1.6.0-0) unstable; urgency=low * Placeholder diff --git a/osc-1.5.1.tar.gz b/osc-1.5.1.tar.gz deleted file mode 100644 index a2bb811..0000000 --- a/osc-1.5.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17b1268413561b3d1b8564d3d1ed8f025efa34774497df4d54205b6cf0882c28 -size 356780 diff --git a/osc-1.6.0.tar.gz b/osc-1.6.0.tar.gz new file mode 100644 index 0000000..2f378ba --- /dev/null +++ b/osc-1.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7920dedfc793590829b93ddbd9dfbdbe6e2ccf471fd4f33d03117a309738b1ae +size 360647 diff --git a/osc.changes b/osc.changes index 45d8b75..c047590 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Thu Jan 25 08:53:46 UTC 2024 - Daniel Mach + +- 1.6.0 + - Command-line: + - The 'token --trigger' command no longer sets '--operation=runservice' by default. + - Change 'token --create' command to require '--operation' + - Fix 'linkdiff' command error 400: prj/pac/md5 not in repository + - Update 'build' command to support building 'productcompose' build type with updateinfo.xml data + - Don't show meter in terminals that are not interactive + - Fix traceback when running osc from an arbitrary git repo that fails to map branch to a project (boo#1218170) + - Configuration: + - Implement reading credentials from environmental variables + - Allow starting with an empty config if --configfile is either empty or points to /dev/null + - Implement 'quiet' conf option + - Password can be an empty string (commonly used with ssh auth) + - Connection: + - Allow -X HEAD on osc api requests as well + - Library: + - Fix credentials managers to consistently return Password + - Fix Password.encode() on python < 3.8 + - Refactor 'meter' module, use config settings to pick the right class + - Convert to using f-strings + - Use Field.get_callback to handle quiet/verbose and http_debug/http_full_debug options + - Implement get_callback that allows modifying returned value to the Field class + - Add support for List[BaseModel] type to Field class + - Report class name when reporting an error during instantiating BaseModel object + - Fix exporting an empty model field in BaseModel.dict() + - Fix initializing a sub-model instance from a dictionary + - Implement 'Enum' support in models + - Fix Field.origin_type for Optional types + - Drop unused 'exclude_unset' argument from BaseModel.dict() method + - Store cached model defaults in self._defaults, avoid sharing references to mutable defaults + - Limit model attributes to predefined fields by forbidding creating new attributes on fly + - Store model values in self._values dict instead of private attributes + - Spec: + - Recommend openssh-clients for ssh-add that is required during ssh auth + - Add 0%{?amzn} macro that wasn't usptreamed + ------------------------------------------------------------------- Mon Dec 4 14:09:11 UTC 2023 - Daniel Mach diff --git a/osc.dsc b/osc.dsc index 6f668ae..c84cbc9 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 1.5.1-0 +Version: 1.6.0-0 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index cf7f748..7128ee4 100644 --- a/osc.spec +++ b/osc.spec @@ -50,18 +50,19 @@ %define argparse_manpage_pkg argparse-manpage %define obs_build_pkg obs-build -%define openssh_pkg openssh +%define ssh_add_pkg openssh-clients +%define ssh_keygen_pkg openssh %define sphinx_pkg %{use_python_pkg}-sphinx %if 0%{?suse_version} %define argparse_manpage_pkg %{use_python_pkg}-argparse-manpage %define obs_build_pkg build -%define openssh_pkg openssh-common +%define ssh_keygen_pkg openssh-common %define sphinx_pkg %{use_python_pkg}-Sphinx %endif Name: osc -Version: 1.5.1 +Version: 1.6.0 Release: 0 Summary: Command-line client for the Open Build Service License: GPL-2.0-or-later @@ -129,7 +130,8 @@ Recommends: obs-service-tar_scm Recommends: obs-service-verify_file # needed for ssh signature auth -Recommends: %{openssh_pkg} +Recommends: %{ssh_add_pkg} +Recommends: %{ssh_keygen_pkg} # needed for `osc browse` that calls xdg-open Recommends: xdg-utils