Skip to content

Commit

Permalink
Merge branch 'release-29' into python-3
Browse files Browse the repository at this point in the history
  • Loading branch information
StykMartin committed Feb 11, 2024
2 parents 830eda3 + 9092199 commit 51b80a0
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Client/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion Common/bkr/common/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
5 changes: 3 additions & 2 deletions Common/bkr/common/hub.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Common/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion IntegrationTests/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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='[email protected]',
Expand Down
2 changes: 1 addition & 1 deletion LabController/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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='[email protected]',
Expand Down
2 changes: 1 addition & 1 deletion Server/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 '
Expand Down
4 changes: 2 additions & 2 deletions beaker.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions documentation/whats-new/release-29.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,13 @@ A number of bug fixes are also included in this release:
* | `GH#177 <https://github.com/beaker-project/beaker/issues/177>`_:
Fixed issue where JUnit result wasn't properly decoded in Beaker client.
| (Contributed by `Bill Peck <https://github.com/p3ck>`_)
Beaker 29.1
~~~~~~~~~~~
* | `GH#210 <https://github.com/beaker-project/beaker/issues/210>`_:
Refactored error message handling when dealing with Kerberos realm settings.
| (Contributed by `Martin Styk <https://github.com/StykMartin>`_)
* | `GH#211 <https://github.com/beaker-project/beaker/issues/211>`_:
Fixed invalid escape sequences in Python 3.12 across various client code.
| (Contributed by `Michael Hofmann <https://github.com/mh21>`_)

0 comments on commit 51b80a0

Please sign in to comment.