Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2023-12-05 17:04:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osc" Tue Dec 5 17:04:04 2023 rev:190 rq:1130938 version:1.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2023-12-04 23:02:37.234072707 +0100 +++ /work/SRC/openSUSE:Factory/.osc.new.25432/osc.changes 2023-12-05 17:04:32.808090352 +0100 @@ -1,0 +2,20 @@ +Mon Dec 4 14:09:11 UTC 2023 - Daniel Mach <[email protected]> + +- 1.5.1 + - Library: + - Avoid using '/public/' API routes + - Update 'osc.util.models' to avoid including lazy defaults in the rendered man pages + - Spec: + - Simplify distro-specific macros + - Use %{?rhel} macros + +------------------------------------------------------------------- +Mon Dec 4 14:09:10 UTC 2023 - Magnus Lewis-Smith <[email protected]> + +- specfile change : use rhel version macros wherever 'fedora' macro is also used + + Build manpages on RHEL distros where argparse-manpage is available + and where python3-sphinx is available and cleanly installable without + requiring environment(modules) from EPEL + + use fdupes to deduplicate python bytecode on RHEL distros which support it + +------------------------------------------------------------------- @@ -15,9 +34,0 @@ - -------------------------------------------------------------------- -Mon Nov 6 15:19:42 UTC 2023 - Magnus Lewis-Smith <[email protected]> - -- specfile change : use rhel version macros wherever 'fedora' macro is also used - + Build manpages on RHEL distros where argparse-manpage is available - and where python3-sphinx is available and cleanly installable without - requiring environment(modules) from EPEL - + use fdupes to deduplicate python bytecode on RHEL distros which support it Old: ---- osc-1.5.0.tar.gz New: ---- osc-1.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.qKiJvu/_old 2023-12-05 17:04:34.412149478 +0100 +++ /var/tmp/diff_new_pack.qKiJvu/_new 2023-12-05 17:04:34.424149920 +0100 @@ -33,6 +33,7 @@ %define python_sitelib %(RPM_BUILD_ROOT= %{use_python} -Ic "import sysconfig; print(sysconfig.get_path('purelib'))") # generate manpages on distros where argparse-manpage >= 3 and python3-Sphinx are available +# please note that RHEL build requires packages from CRB and EPEL repositories %if 0%{?suse_version} > 1500 || 0%{?fedora} >= 37 || 0%{?rhel} >= 9 %bcond_without man %else @@ -46,21 +47,20 @@ %bcond_with fdupes %endif -%define argparse_manpage_pkg %{use_python_pkg}-argparse-manpage -%define obs_build_pkg obs-build -%define sphinx_pkg %{use_python_pkg}-Sphinx - -%if 0%{?fedora} || 0%{?rhel} >= 9 %define argparse_manpage_pkg argparse-manpage +%define obs_build_pkg obs-build +%define openssh_pkg openssh %define sphinx_pkg %{use_python_pkg}-sphinx -%endif %if 0%{?suse_version} +%define argparse_manpage_pkg %{use_python_pkg}-argparse-manpage %define obs_build_pkg build +%define openssh_pkg openssh-common +%define sphinx_pkg %{use_python_pkg}-Sphinx %endif Name: osc -Version: 1.5.0 +Version: 1.5.1 Release: 0 Summary: Command-line client for the Open Build Service License: GPL-2.0-or-later @@ -127,12 +127,8 @@ Recommends: obs-service-tar_scm Recommends: obs-service-verify_file -%if 0%{?fedora} || 0%{?rhel} -Recommends: openssh -%endif -%if 0%{?suse_version} -Recommends: openssh-common -%endif +# needed for ssh signature auth +Recommends: %{openssh_pkg} # needed for `osc browse` that calls xdg-open Recommends: xdg-utils ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.qKiJvu/_old 2023-12-05 17:04:34.632157588 +0100 +++ /var/tmp/diff_new_pack.qKiJvu/_new 2023-12-05 17:04:34.668158915 +0100 @@ -1,5 +1,5 @@ pkgname=osc -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=0 pkgdesc="Command-line client for the Open Build Service" arch=('x86_64') ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.qKiJvu/_old 2023-12-05 17:04:34.768162601 +0100 +++ /var/tmp/diff_new_pack.qKiJvu/_new 2023-12-05 17:04:34.780163043 +0100 @@ -1,4 +1,4 @@ -osc (1.5.0-0) unstable; urgency=low +osc (1.5.1-0) unstable; urgency=low * Placeholder ++++++ osc-1.5.0.tar.gz -> osc-1.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-1.5.0/NEWS new/osc-1.5.1/NEWS --- old/osc-1.5.0/NEWS 2023-11-22 08:55:15.000000000 +0100 +++ new/osc-1.5.1/NEWS 2023-12-04 15:05:14.000000000 +0100 @@ -1,3 +1,11 @@ +- 1.5.1 + - Library: + - Avoid using '/public/' API routes + - Update 'osc.util.models' to avoid including lazy defaults in the rendered man pages + - Spec: + - Simplify distro-specific macros + - Use %{?rhel} macros + - 1.5.0 - Command-line: - Change 'rdiff' command to display diff for _project if no package is specified diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-1.5.0/osc/__init__.py new/osc-1.5.1/osc/__init__.py --- old/osc-1.5.0/osc/__init__.py 2023-11-22 08:55:15.000000000 +0100 +++ new/osc-1.5.1/osc/__init__.py 2023-12-04 15:05:14.000000000 +0100 @@ -13,7 +13,7 @@ from .util import git_version -__version__ = git_version.get_version('1.5.0') +__version__ = git_version.get_version('1.5.1') # vim: sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-1.5.0/osc/commandline.py new/osc-1.5.1/osc/commandline.py --- old/osc-1.5.0/osc/commandline.py 2023-11-22 08:55:15.000000000 +0100 +++ new/osc-1.5.1/osc/commandline.py 2023-12-04 15:05:14.000000000 +0100 @@ -4860,7 +4860,7 @@ return (parent_project, parent_package) def _pdiff_get_exists_and_parent(self, apiurl, project, package): - link_url = makeurl(apiurl, ['public', 'source', project, package]) + link_url = makeurl(apiurl, ['source', project, package]) try: file = http_GET(link_url) root = ET.parse(file).getroot() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-1.5.0/osc/conf.py new/osc-1.5.1/osc/conf.py --- old/osc-1.5.0/osc/conf.py 2023-11-22 08:55:15.000000000 +0100 +++ new/osc-1.5.1/osc/conf.py 2023-12-04 15:05:14.000000000 +0100 @@ -1324,6 +1324,10 @@ if field.default is None: return None + if field.default_is_lazy: + # lazy default may return different results under different circumstances -> return nothing + return None + ini_type = field.extra.get("ini_type", None) if ini_type: return None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-1.5.0/osc/core.py new/osc-1.5.1/osc/core.py --- old/osc-1.5.0/osc/core.py 2023-11-22 08:55:15.000000000 +0100 +++ new/osc-1.5.1/osc/core.py 2023-12-04 15:05:14.000000000 +0100 @@ -3938,7 +3938,7 @@ def show_configuration(apiurl): - u = makeurl(apiurl, ['public', 'configuration']) + u = makeurl(apiurl, ['configuration']) f = http_GET(u) return f.readlines() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-1.5.0/osc/util/git_version.py new/osc-1.5.1/osc/util/git_version.py --- old/osc-1.5.0/osc/util/git_version.py 2023-11-22 08:55:15.000000000 +0100 +++ new/osc-1.5.1/osc/util/git_version.py 2023-12-04 15:05:14.000000000 +0100 @@ -9,7 +9,7 @@ """ # the `version` variable contents get substituted during `git archive` # it requires adding this to .gitattributes: <path to this file> export-subst - version = "1.5.0" + version = "1.5.1" if version.startswith(("$", "%")): # "$": version hasn't been substituted during `git archive` # "%": "Format:" and "$" characters get removed from the version string (a GitHub bug?) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-1.5.0/osc/util/models.py new/osc-1.5.1/osc/util/models.py --- old/osc-1.5.0/osc/util/models.py 2023-11-22 08:55:15.000000000 +0100 +++ new/osc-1.5.1/osc/util/models.py 2023-12-04 15:05:14.000000000 +0100 @@ -79,6 +79,9 @@ # model sets it to None if it equals to NotSet (for better usability) self.default = default + # a flag indicating, whether the default is a callable with lazy evalution + self.default_is_lazy = callable(self.default) + # whether the field was set self.is_set = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-1.5.0/tests/test_models.py new/osc-1.5.1/tests/test_models.py --- old/osc-1.5.0/tests/test_models.py 2023-11-22 08:55:15.000000000 +0100 +++ new/osc-1.5.1/tests/test_models.py 2023-12-04 15:05:14.000000000 +0100 @@ -60,6 +60,19 @@ self.assertRaises(TypeError, TestModel) + def test_lazy_default(self): + class TestModel(BaseModel): + field: List[str] = Field(default=lambda: ["string"]) + + m = TestModel() + self.assertEqual(m.field, ["string"]) + + def test_lazy_default_invalid_type(self): + class TestModel(BaseModel): + field: List[str] = Field(default=lambda: None) + + self.assertRaises(TypeError, TestModel) + def test_is_set(self): class TestModel(BaseModel): field: Optional[str] = Field() ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.qKiJvu/_old 2023-12-05 17:04:35.328183244 +0100 +++ /var/tmp/diff_new_pack.qKiJvu/_new 2023-12-05 17:04:35.352184128 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 1.5.0-0 +Version: 1.5.1-0 Binary: osc Maintainer: Adrian Schroeter <[email protected]> Architecture: any
