Merge branch 'release-29' into python-3

Author: StykMartin

.github/workflows/publish-pypi.yml

@@ -0,0 +1,57 @@
+name: Publish
+
+on:
+  push:
+    tags:
+      - 'beaker-*'
+
+jobs:
+  build-python-package:
+    strategy:
+      matrix:
+        component:
+          - "Common"
+          - "Client"
+    name: Build python package
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout source code
+      uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.x"
+    - name: Install python dependencies
+      run: pip install --upgrade pip && pip install build
+    - name: Build python package
+      run: cd ${{ matrix.component }} && python -m build
+    - name: Upload python artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        path: ${{ matrix.component }}/dist
+        name: artifact-${{ matrix.component }}
+
+  publish-python-package:
+    needs:
+      - "build-python-package"
+    environment: production
+    permissions:
+      id-token: write
+    strategy:
+      matrix:
+        component:
+          - "Common"
+          - "Client"
+    name: Publish package to PyPI
+    runs-on: ubuntu-latest
+    steps:
+    - name: Download artifacts
+      uses: actions/download-artifact@v4
+      with:
+        name: artifact-${{ matrix.component }}
+    - name: Display structure of downloaded files
+      run: ls -R
+    - name: Publish package distributions to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        print-hash: true

.github/workflows/publish.yml

@@ -1,3 +1,4 @@
+.idea/
 *.pyc
 *.swp
 *.tmp

.gitignore

@@ -22,7 +22,7 @@ def bash_completion_dir():
 
 setup(
     name='beaker-client',
-    version='29.0rc1',
+    version='29.0rc2',
     description='Command-line client for interacting with Beaker',
     author='Red Hat, Inc.',
     author_email='[email protected]',

Client/setup.py

@@ -87,14 +87,14 @@
 
 from __future__ import print_function
 
-import cgi
 import sys
 from xml.dom.minidom import parseString
 
 from requests.exceptions import HTTPError
 
 from bkr.client import BeakerCommand
 from bkr.client.task_watcher import watch_tasks
+from bkr.common.helpers_six import parse_content_type
 
 
 class Update_Inventory(BeakerCommand):
@@ -152,7 +152,7 @@ def run(self, *args, **kwargs):
                 res.raise_for_status()
             except HTTPError as e:
                 sys.stderr.write('HTTP error: %s, %s\n' % (fqdn, e))
-                content_type, _ = cgi.parse_header(e.response.headers.get(
+                content_type = parse_content_type(e.response.headers.get(
                     'Content-Type', ''))
                 if content_type == 'text/plain':
                     sys.stderr.write('\t' +

Client/src/bkr/client/commands/cmd_update_inventory.py

@@ -5,7 +5,6 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 
-import cgi
 import errno
 import logging
 import signal
@@ -22,6 +21,7 @@
 from bkr.client.command import ClientCommandContainer
 from bkr.client.command import CommandOptionParser
 from bkr.common import __version__
+from bkr.common.helpers_six import parse_content_type
 from bkr.log import log_to_stream
 
 __all__ = (
@@ -129,7 +129,7 @@ def main():
     except maybe_http_error as e:
         warn_on_version_mismatch(e.response)
         sys.stderr.write('HTTP error: %s\n' % e)
-        content_type, _ = cgi.parse_header(e.response.headers.get('Content-Type', ''))
+        content_type = parse_content_type(e.response.headers.get('Content-Type', ''))
         if content_type == 'text/plain':
             sys.stderr.write(e.response.content.decode('utf-8').rstrip('\n') + '\n')
         return 1

Client/src/bkr/client/main.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.0rc1'
+__version__ = '29.0rc2'

Common/bkr/common/__init__.py

@@ -277,4 +277,3 @@ def total_seconds(td):
     represented by the given timedelta.
     """
     return (float(td.microseconds) + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
-

Common/bkr/common/helpers.py

@@ -0,0 +1,12 @@
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+def parse_content_type(value):
+    """
+    Return just content type, without options
+    """
+    groups = value.split(';', 1)
+    return groups[0]

Common/bkr/common/helpers_six.py

@@ -0,0 +1,18 @@
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+import unittest
+
+from bkr.common.helpers_six import parse_content_type
+
+
+class ParsingContentType(unittest.TestCase):
+
+    def test_ok(self):
+        self.assertEqual(parse_content_type('type/subtype; charset=utf-8'), 'type/subtype')
+        self.assertEqual(parse_content_type('type/subtype'), 'type/subtype')
+
+    def test_empty(self):
+        self.assertEqual(parse_content_type(''), '')