#3 Correct fedmsg deps
Merged 2 years ago by ralph. Opened 2 years ago by merlinm.
Unknown source master  into  master

file modified
+8 -3

@@ -5,7 +5,7 @@

  

  Name:           module-build-service

  Version:        2.1.1

- Release:        1%{?dist}

+ Release:        2%{?dist}

  Summary:        The Module Build Service for Modularity

  

  Group:          Development/Tools

@@ -47,6 +47,7 @@

  BuildRequires:  python3-m2crypto

  BuildRequires:  python3-kobo

  BuildRequires:  python3-kobo-rpmlib

+ BuildRequires:  python3-fedmsg

  

  %else

  

@@ -65,6 +66,7 @@

  BuildRequires:  python-ldap3

  BuildRequires:  python-enum34

  BuildRequires:  python2-koji

+ BuildRequires:  python2-fedmsg

  

  %if 0%{?rhel} && 0%{?rhel} <= 7

  BuildRequires:  python-setuptools

@@ -100,7 +102,6 @@

  

  %endif

  

- BuildRequires:  fedmsg

  BuildRequires:  git-core

  BuildRequires:  help2man

  BuildRequires:  kobo

@@ -133,6 +134,7 @@

  Requires:       python3-flask

  Requires:       python3-dogpile-cache

  Requires:       python3-requests

+ Requires:       python3-fedmsg

  %else

  Requires:       python2-pdc-client

  Requires:       python-flask-script

@@ -144,6 +146,7 @@

  Requires:       python-gobject-base

  Requires:       python2-solv

  Requires:       python2-koji

+ Requires:       python2-fedmsg

  

  %if 0%{?rhel} && 0%{?rhel} <= 7

  Requires:       python-flask-sqlalchemy

@@ -176,7 +179,6 @@

  

  %endif

  

- Requires:       fedmsg

  Requires:       fedpkg

  Requires:       git-core

  Requires:       kobo

@@ -291,6 +293,9 @@

  

  

  %changelog

+ * Tue May 08 2018 Merlin Mathesius <mmathesi@redhat.com> - 2.1.1-2

+ - Correct fedmsg deps.

+ 

  * Tue May 08 2018 Ralph Bean <rbean@redhat.com> - 2.1.1-1

  - new version

  

Running fedpkg module-build-local with module-build-service-2.1.1-1.fc28 gives me an exception:

$ fedpkg module-build-local
Traceback (most recent call last):
  File "/usr/bin/mbs-manager", line 6, in <module>
    from pkg_resources import load_entry_point
  File "/usr/lib/python3.6/site-packages/pkg_resources/__init__.py", line 3088, in <module>
    @_call_aside
  File "/usr/lib/python3.6/site-packages/pkg_resources/__init__.py", line 3072, in _call_aside
    f(*args, **kwargs)
  File "/usr/lib/python3.6/site-packages/pkg_resources/__init__.py", line 3101, in _initialize_master_working_set
    working_set = WorkingSet._build_master()
  File "/usr/lib/python3.6/site-packages/pkg_resources/__init__.py", line 574, in _build_master
    ws.require(__requires__)
  File "/usr/lib/python3.6/site-packages/pkg_resources/__init__.py", line 892, in require
    needed = self.resolve(parse_requirements(requirements))
  File "/usr/lib/python3.6/site-packages/pkg_resources/__init__.py", line 778, in resolve
    raise DistributionNotFound(req, requirers)
pkg_resources.DistributionNotFound: The 'fedmsg' distribution was not found and is required by module-build-service
Could not execute module_build_local: Command '['mbs-manager', 'build_module_locally', '--file', u'/home/merlinm/fedmod/_forks/merlinm/avocado/avocado.yaml', '--stream', 'stable']' returned non-zero exit status 1
$ 

Manually installing the missing python3-fedmsg dependency works around that exception.

This PR corrects that dependency in the spec file.

Rawhide scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=26853331
F28 scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=26853335

@ralph do we also want to keep fedmsg as a dependency or is it fine to remove it?

I suppose it can be dropped, yes.

As best as I could tell, fedmsg is provided by python2-fedmsg as a result of the %python_provide in the spec file. I figured it was best to be explicit here.

Pull-Request has been merged by ralph

2 years ago
Metadata