diff --git a/Client/setup.py b/Client/setup.py index 17e553166..b8a828717 100644 --- a/Client/setup.py +++ b/Client/setup.py @@ -23,7 +23,7 @@ def bash_completion_dir(): setup( name='beaker-client', - version='29.0', + version='29.1', description=DESCRIPTION, # XXX: Create proper README for this package and use it for long description long_description=DESCRIPTION, diff --git a/Common/bkr/common/__init__.py b/Common/bkr/common/__init__.py index edac96545..cdf54a2fb 100644 --- a/Common/bkr/common/__init__.py +++ b/Common/bkr/common/__init__.py @@ -2,4 +2,4 @@ # code in bkr.__init__), the version details are retrieved from here in # order to correctly handle module shadowing on sys.path -__version__ = '29.0' +__version__ = '29.1' diff --git a/Common/bkr/common/hub.py b/Common/bkr/common/hub.py index 0b31da996..4a34296b9 100644 --- a/Common/bkr/common/hub.py +++ b/Common/bkr/common/hub.py @@ -200,8 +200,9 @@ def get_server_principal(service=None, realm=None): ) except gssapi.raw.GSSError as ex: if ex.min_code == krb5kdc_err_s_principal_unknown: # pylint: disable=no-member - ex.message += ". Make sure you correctly set KRB_REALM (current value: %s)." % realm - ex.args = (ex.message, ) + message = str(ex) + message += ". Make sure you correctly set KRB_REALM (current value: %s)." % realm + ex.args = (message,) raise ex if six.PY2: req_enc = base64.encodestring(res.token) diff --git a/Common/setup.py b/Common/setup.py index 734e49317..816cfd15b 100644 --- a/Common/setup.py +++ b/Common/setup.py @@ -14,7 +14,7 @@ setup( name='beaker-common', - version='29.0', + version='29.1', description=DESCRIPTION, # XXX: Create proper README for this package and use it for long description long_description=DESCRIPTION, diff --git a/IntegrationTests/setup.py b/IntegrationTests/setup.py index dbbb3a1c9..4bb54eb59 100644 --- a/IntegrationTests/setup.py +++ b/IntegrationTests/setup.py @@ -12,7 +12,7 @@ def get_compose_layout(): setup( name='beaker-integration-tests', - version='29.0', + version='29.1', description='Integration tests for Beaker', author='Red Hat, Inc.', author_email='beaker-devel@lists.fedorahosted.org', diff --git a/LabController/setup.py b/LabController/setup.py index a4dca4c08..cd7337f84 100644 --- a/LabController/setup.py +++ b/LabController/setup.py @@ -49,7 +49,7 @@ def systemd_tmpfiles_dir(): setup( name='beaker-lab-controller', - version='29.0', + version='29.1', description='Daemons for controlling a Beaker lab', author='Red Hat, Inc.', author_email='beaker-devel@lists.fedorahosted.org', diff --git a/Server/setup.py b/Server/setup.py index 80a7399d2..e63492643 100644 --- a/Server/setup.py +++ b/Server/setup.py @@ -186,7 +186,7 @@ def find_data_recursive(dest_dir, src_dir, exclude=frozenset()): setup( name='beaker-server', namespace_packages = ['bkr'], - version='29.0', + version='29.1', description='Beaker scheduler and web interface', long_description= 'Beaker is a system for full stack software integration testing ' diff --git a/beaker.spec b/beaker.spec index 0027c7d46..f5150ece7 100644 --- a/beaker.spec +++ b/beaker.spec @@ -15,10 +15,10 @@ # not representable in RPM. For example, a release candidate might be 0.15.0rc1 # but that is not usable for the RPM Version because it sorts higher than # 0.15.0, so the RPM will have Version 0.15.0 and Release 0.rc1 in that case. -%global upstream_version 29.0 +%global upstream_version 29.1 Name: beaker -Version: 29.0 +Version: 29.1 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet diff --git a/documentation/whats-new/release-29.rst b/documentation/whats-new/release-29.rst index fa41be922..630aeffca 100644 --- a/documentation/whats-new/release-29.rst +++ b/documentation/whats-new/release-29.rst @@ -37,3 +37,13 @@ A number of bug fixes are also included in this release: * | `GH#177 `_: Fixed issue where JUnit result wasn't properly decoded in Beaker client. | (Contributed by `Bill Peck `_) + +Beaker 29.1 +~~~~~~~~~~~ +* | `GH#210 `_: + Refactored error message handling when dealing with Kerberos realm settings. + | (Contributed by `Martin Styk `_) +* | `GH#211 `_: + Fixed invalid escape sequences in Python 3.12 across various client code. + | (Contributed by `Michael Hofmann `_) +