#1 Update Python 2 dependency declarations to new packaging standards
Merged 6 years ago by jchaloup. Opened 6 years ago by ishcherb.
rpms/ ishcherb/gofed pyambiguous  into  master

file modified
+20 -16
@@ -32,7 +32,7 @@ 

  

  Name:		gofed

  Version:	1.0.0

- Release:	0.16.rc1%{?dist}

+ Release:	0.17.rc1%{?dist}

  Summary:	Tool for development of golang devel packages

  License:	GPLv2+

  URL:		https://github.com/%{project}/%{repo}
@@ -50,15 +50,15 @@ 

  # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.

  BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}

  

- BuildRequires:  python >= 2.7.5

- BuildRequires:  python-devel

- BuildRequires:  python-setuptools

+ BuildRequires:  python2 >= 2.7.5

+ BuildRequires:  python2-devel

+ BuildRequires:  python2-setuptools

  

- Requires: python >= 2.7.5, bash, wget, rpmdevtools, rpmlint

+ Requires: python2 >= 2.7.5, bash, wget, rpmdevtools, rpmlint

  Requires: coreutils, rpm-build, openssh-clients, tar

  

  Requires: %{name}-cmd-dnfs-base = %{version}-%{release}

- Requires: python-cmdsignature = %{version}-%{release}

+ Requires: python2-cmdsignature = %{version}-%{release}

  Requires: %{name}-infra = %{version}-%{release}

  Requires: %{name}-base = %{version}-%{release}

  Requires: bash-completion
@@ -105,7 +105,7 @@ 

  Summary: Set of commands for scanning golang projects

  Requires: %{name} = %{version}-%{release}

  Requires: %{name}-cmd-dnfs-scan = %{version}-%{release}

- Requires: python-cmdsignature = %{version}-%{release}

+ Requires: python2-cmdsignature = %{version}-%{release}

  Requires: graphviz

  BuildArch: noarch

  Conflicts: gofed-scan < 1.0.0
@@ -121,7 +121,7 @@ 

  Summary: Set of commands for building golang projects

  Requires: %{name} = %{version}-%{release}

  Requires: %{name}-cmd-dnfs-build = %{version}-%{release}

- Requires: python-cmdsignature = %{version}-%{release}

+ Requires: python2-cmdsignature = %{version}-%{release}

  BuildArch: noarch

  Conflicts: gofed-build < 1.0.0

  
@@ -134,8 +134,8 @@ 

  

  %package gofedlib

  Summary: Gofedlib

- BuildRequires: python-fedora python-jinja2 python-markupsafe python2-koji

- Requires: python-fedora python-jinja2 python-markupsafe python2-pygithub python2-hglib

+ BuildRequires: python2-fedora python2-jinja2 python2-markupsafe python2-koji

+ Requires: python2-fedora python2-jinja2 python2-markupsafe python2-pygithub python2-hglib

  

  %description gofedlib

  Gofedlib
@@ -152,8 +152,8 @@ 

  

  %package infra

  Summary: Gofed infra

- BuildRequires: python-jsonschema koji GitPython python-pycurl python2-hglib python-gitdb

- Requires: python-jsonschema koji GitPython python-pycurl python2-hglib python-gitdb

+ BuildRequires: python2-jsonschema koji python2-GitPython python2-pycurl python2-hglib python2-gitdb

+ Requires: python2-jsonschema koji python2-GitPython python2-pycurl python2-hglib python2-gitdb

  Requires: %{name}-gofedlib = %{version}-%{release}

  Requires: %{name}-resources = %{version}-%{release}

  BuildArch: noarch
@@ -164,7 +164,7 @@ 

  %package docker

  Summary: Run gofed commands as a container

  Requires: %{name}-cmd-dnfs-base = %{version}-%{release}

- Requires: python-cmdsignature = %{version}-%{release}

+ Requires: python2-cmdsignature = %{version}-%{release}

  Requires: docker

  BuildArch: noarch

  ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
@@ -175,9 +175,9 @@ 

  %package -n python2-cmdsignature

  Summary: Command signature python module

  BuildArch: noarch

- BuildRequires: PyYAML

- Requires: python >= 2.7.5

- Requires: PyYAML

+ BuildRequires: python2-pyyaml

+ Requires: python2 >= 2.7.5

+ Requires: python2-pyyaml

  %{?python_provide:%python_provide python2-cmdsignature}

  

  %description -n python2-cmdsignature
@@ -376,6 +376,10 @@ 

  %{_datadir}/%{name}/*.py

  

  %changelog

+ * Tue Feb 20 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.0.0-0.17.rc1

+ - Update Python 2 dependency declarations to new packaging standards

+   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)

+ 

  * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-0.16.rc1

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

  

This package uses names with ambiguous python- prefix in requirements.

According to Fedora Packaging guidelines for Python, packages must use names with either python2- or python3- prefix in requirements where available.
We are aiming to rename python-* dependencies to python2-*, so we can later switch the python-* namespace to Python 3.

This PR is part of Fedora's Switch to Python 3 effort.

Note that, although this PR was created automatically, we will respond to any comments or issues which you might find with it. We will keep the PR open for review for a week, and if there's no feedback we'll merge it. There is no need to build the package right after merge, this change can wait for the next package rebuild.
The local mock build passed, for Koji scratch build please see simple-koji-ci result.

Note: please do not backport this to f26, f27 branches, as some of the modified requirements are not available there

This PR was opened automatically, for source code see here

Pull-Request has been merged by jchaloup

6 years ago