#2 Update Python 2 dependency declarations to new packaging standards
Merged 2 years ago by kevin. Opened 2 years ago by ishcherb.
rpms/ ishcherb/python-cliff pyambiguous  into  master

file modified
+34 -30

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

  

  Name:             python-%{modname}

  Version:          2.9.1

- Release:          2%{?dist}

+ Release:          3%{?dist}

  Summary:          Command Line Interface Formulation Framework

  

  Group:            Development/Libraries

@@ -18,12 +18,12 @@ 

  BuildArch:        noarch

  

  BuildRequires:    python2-devel

- BuildRequires:    python-setuptools

- BuildRequires:    python-pbr

- BuildRequires:    python-prettytable

- BuildRequires:    python-cmd2 >= 0.6.7

- BuildRequires:    python-stevedore

- BuildRequires:    python-six

+ BuildRequires:    python2-setuptools

+ BuildRequires:    python2-pbr

+ BuildRequires:    python2-prettytable

+ BuildRequires:    python2-cmd2 >= 0.6.7

+ BuildRequires:    python2-stevedore

+ BuildRequires:    python2-six

  

  

  %description

@@ -39,12 +39,12 @@ 

  Summary:          Command Line Interface Formulation Framework

  %{?python_provide:%python_provide python2-%{modname}}

  

- Requires:         python-prettytable

- Requires:         python-cmd2 >= 0.6.7

- Requires:         python-stevedore >= 1.20.0

- Requires:         python-six

- Requires:         python-unicodecsv

- Requires:         PyYAML

+ Requires:         python2-prettytable

+ Requires:         python2-cmd2 >= 0.6.7

+ Requires:         python2-stevedore >= 1.20.0

+ Requires:         python2-six

+ Requires:         python2-unicodecsv

+ Requires:         python2-pyyaml

  

  %if %{?rhel}%{!?rhel:0} == 6

  BuildRequires:    python-argparse

@@ -64,27 +64,27 @@ 

  %{?python_provide:%python_provide python2-%{modname}-tests}

  

  # Required for the test suite

- BuildRequires:    python-mock

+ BuildRequires:    python2-mock

  BuildRequires:    bash

- BuildRequires:    python-unicodecsv

- BuildRequires:    PyYAML

+ BuildRequires:    python2-unicodecsv

+ BuildRequires:    python2-pyyaml

  BuildRequires:    which

- BuildRequires:    python-docutils

- BuildRequires:    python-subunit

- BuildRequires:    python-testrepository

- BuildRequires:    python-testscenarios

- BuildRequires:    python-testtools

- 

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

- Requires:         python-mock

+ BuildRequires:    python2-docutils

+ BuildRequires:    python2-subunit

+ BuildRequires:    python2-testrepository

+ BuildRequires:    python2-testscenarios

+ BuildRequires:    python2-testtools

+ 

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

+ Requires:         python2-mock

  Requires:         bash

- Requires:         python-unicodecsv

- Requires:         PyYAML

+ Requires:         python2-unicodecsv

+ Requires:         python2-pyyaml

  Requires:         which

- Requires:         python-subunit

- Requires:         python-testrepository

- Requires:         python-testscenarios

- Requires:         python-testtools

+ Requires:         python2-subunit

+ Requires:         python2-testrepository

+ Requires:         python2-testscenarios

+ Requires:         python2-testtools

  

  %description -n python2-%{modname}-tests

  This package contains tests for the python cliff library.

@@ -207,6 +207,10 @@ 

  %endif

  

  %changelog

+ * Fri Mar 09 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.9.1-3

+ - Update Python 2 dependency declarations to new packaging standards

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

+ 

  * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-2

  - 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 kevin

2 years ago