Release 3.8.0

bz1968843.patch

@@ -1,36 +0,0 @@
-From 1883fa85673c84bad91ccc720cf8618ad26cd652 Mon Sep 17 00:00:00 2001
-From: Brendan Reilly <breilly@redhat.com>
-Date: Aug 12 2021 15:50:46 +0000
-Subject: Update handler name used by SQLAlchemy
-
-
----
-
-diff --git a/module_build_service/common/monitor.py b/module_build_service/common/monitor.py
-index 7735048..add69b9 100644
---- a/module_build_service/common/monitor.py
-+++ b/module_build_service/common/monitor.py
-@@ -15,6 +15,7 @@ from prometheus_client import (  # noqa: F401
-     Histogram,
-     start_http_server,
- )
-+import sqlalchemy
- from sqlalchemy import event
- 
- 
-@@ -85,9 +86,11 @@ def db_hook_event_listeners(target=None):
-     if not target:
-         target = db.engine
- 
--    @event.listens_for(target, "dbapi_error", named=True)
--    def receive_dbapi_error(**kw):
--        db_dbapi_error_counter.inc()
-+    if sqlalchemy.__version__[0] == "0":
-+        # Deprecated since 0.9
-+        @event.listens_for(target, "dbapi_error", named=True)
-+        def receive_dbapi_error(**kw):
-+            db_dbapi_error_counter.inc()
- 
-     @event.listens_for(target, "engine_connect")
-     def receive_engine_connect(conn, branch):
-

mbs_fedora_click.patch

@@ -2,27 +2,21 @@ diff --git a/module_build_service/manage.py b/module_build_service/manage.py
 index 925b5031..1215bdba 100755
 --- a/module_build_service/manage.py
 +++ b/module_build_service/manage.py
-@@ -1,14 +1,13 @@
- # -*- coding: utf-8 -*-
- # SPDX-License-Identifier: MIT
- from __future__ import absolute_import, print_function
+@@ -5,10 +5,9 @@
 -from functools import wraps
 +import click
  import getpass
  import logging
  import os
+ import sys
 -import textwrap
  
  import flask_migrate
 -from flask_script import Manager, prompt_bool
 +from flask.cli import FlaskGroup
  from werkzeug.datastructures import FileStorage
- 
- from module_build_service import app, db
-@@ -17,76 +16,36 @@ from module_build_service.builder.MockModuleBuilder import (
- )
- from module_build_service.common import conf, models
- from module_build_service.common.errors import StreamAmbigous
+@@ -21,74 +20,34 @@ from module_build_service.builder.MockModuleBuilder import (
+ from module_build_service.common.errors import StreamAmbigous, StreamNotXyz
 -from module_build_service.common.logger import level_flags
  from module_build_service.common.utils import load_mmd_file, import_mmd
  import module_build_service.scheduler.consumer
@@ -107,7 +101,7 @@ index 925b5031..1215bdba 100755
  def cleardb():
      """ Clears the database
      """
-@@ -94,8 +53,8 @@ def cleardb():
+@@ -96,8 +53,8 @@ def cleardb():
      models.ComponentBuild.query.delete()
  
  
@@ -118,8 +112,8 @@ index 925b5031..1215bdba 100755
  def import_module(mmd_file):
      """ Imports the module from mmd_file
      """
-@@ -103,29 +62,44 @@ def import_module(mmd_file):
-     import_mmd(db.session, mmd)
+@@ -117,41 +74,56 @@ def import_module(mmd_file):
+     return collected
  
  
 -@manager.option("--stream", action="store", dest="stream")
@@ -127,6 +121,16 @@ index 925b5031..1215bdba 100755
 -@manager.option("--srpm", action="append", default=[], dest="srpms", metavar="SRPM")
 -@manager.option("--skiptests", action="store_true", dest="skiptests")
 -@manager.option("--offline", action="store_true", dest="offline")
+-@manager.option(
+-    '--buildrequires', action='append', metavar='name:stream',
+-    dest='buildrequires', default=[],
+-    help='Buildrequires to override in the form of "name:stream"'
+-)
+-@manager.option(
+-    '--requires', action='append', metavar='name:stream',
+-    dest='requires', default=[],
+-    help='Requires to override in the form of "name:stream"'
+-)
 -@manager.option("-d", "--debug", action="store_true", dest="log_debug")
 -@manager.option("-l", "--add-local-build", action="append", default=None, dest="local_build_nsvs")
 -@manager.option("-s", "--set-stream", action="append", default=[], dest="default_streams")
@@ -143,6 +147,16 @@ index 925b5031..1215bdba 100755
 +@click.option("--srpm", "srpms", metavar="SRPM", multiple=True)
 +@click.option("--skiptests", is_flag=True)
 +@click.option("--offline", is_flag=True)
++@click.option(
++    '--buildrequires', "buildrequires", multiple=True,
++    metavar='name:stream', default=[],
++    help='Buildrequires to override in the form of "name:stream"'
++)
++@click.option(
++    '--requires', "requires", multiple=True,
++    metavar='name:stream', default=[],
++    help='Requires to override in the form of "name:stream"'
++)
 +@click.option("-d", "--debug", "log_debug", is_flag=True)
 +@click.option(
 +    "-l", "--add-local-build", "local_build_nsvs",
@@ -174,12 +188,14 @@ index 925b5031..1215bdba 100755
 +    default_streams=None,
      platform_repofiles=None,
      platform_id=None,
+     requires=None,
+     buildrequires=None,
 -    log_debug=False,
  ):
      """ Performs local module build using Mock
      """
-@@ -205,14 +179,11 @@ def build_module_locally(
-         raise RuntimeError("Module build failed")
+@@ -233,14 +193,11 @@ def build_module_locally(
+         sys.exit(1)
  
  
 -@manager.option(
@@ -197,7 +213,7 @@ index 925b5031..1215bdba 100755
      default=False,
      help="Perform retire operation without prompting",
  )
-@@ -245,7 +216,8 @@ def retire(identifier, confirm=False):
+@@ -273,7 +244,8 @@ def retire(identifier, confirm=False):
          logging.info("\t%s", ":".join((build.name, build.stream, build.version, build.context)))
  
      # Prompt for confirmation
@@ -207,7 +223,7 @@ index 925b5031..1215bdba 100755
      if not is_confirmed:
          logging.info("Module builds were NOT retired.")
          return
-@@ -260,8 +232,10 @@ def retire(identifier, confirm=False):
+@@ -288,8 +260,10 @@ def retire(identifier, confirm=False):
      logging.info("Module builds retired.")
  
  
@@ -218,9 +234,9 @@ index 925b5031..1215bdba 100755
 +@click.option("-p", "--port", metavar="PORT", help="Bind to this port along with --host.")
 +@click.option("-d", "--debug", is_flag=True, default=False, help="Run frontend in debug mode.")
  def run(host=None, port=None, debug=None):
-     """ Runs the Flask app, locally.
+     """ Runs the Flask app, locally. Intended for dev instances, should not be used for production.
      """
-@@ -274,9 +248,5 @@ def run(host=None, port=None, debug=None):
+@@ -302,9 +276,5 @@ def run(host=None, port=None, debug=None):
      app.run(host=host, port=port, debug=debug)
  
  

module-build-service.spec

@@ -4,15 +4,14 @@
 %endif
 
 Name:           module-build-service
-Version:        3.6.1
-Release:        8%{?dist}
+Version:        3.8.0
+Release:        1%{?dist}
 Summary:        The Module Build Service for Modularity
 
 License:        MIT
 URL:            https://pagure.io/fm-orchestrator
 Source0:        https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz
-Patch0:         bz1968843.patch
-Patch1:         mbs_fedora_click.patch
+Patch0:         mbs_fedora_click.patch
 
 BuildArch:      noarch
 
@@ -207,7 +206,6 @@ for a number of tasks:
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 
 # Workaround because python2-koji has no egg-info file at the momement
@@ -262,7 +260,6 @@ done
 %{_bindir}/mbs-*
 %dir %{_sysconfdir}/module-build-service
 %config(noreplace) %{_sysconfdir}/module-build-service/koji.conf
-%config(noreplace) %{_sysconfdir}/module-build-service/cacert.pem
 %config(noreplace) %{_sysconfdir}/module-build-service/mock.cfg
 %config(noreplace) %{_sysconfdir}/module-build-service/yum.conf
 %config(noreplace) %{_sysconfdir}/fedmsg.d/mbs-scheduler.py
@@ -282,6 +279,9 @@ done
 %endif
 
 %changelog
+* Wed Dec 07 2022 Brendan Reilly <breilly@redhat.com> - 3.8.0-1
+- new version
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild