#1 Update Python 2 dependency declarations to new packaging standards
Merged 6 years ago by pnemade. Opened 6 years ago by ishcherb.
rpms/ ishcherb/python-oslo-i18n pyambiguous  into  master

file modified
+18 -14
@@ -9,7 +9,7 @@ 

  

  Name:           python-oslo-i18n

  Version:        3.17.0

- Release:        2%{?dist}

+ Release:        3%{?dist}

  Summary:        OpenStack i18n library

  License:        ASL 2.0

  URL:            https://github.com/openstack/%{pypi_name}
@@ -29,18 +29,18 @@ 

  %{?python_provide:%python_provide python2-oslo-i18n}

  

  BuildRequires:  python2-devel

- BuildRequires:  python-setuptools

- BuildRequires:  python-pbr

- BuildRequires:  python-babel

- BuildRequires:  python-six

- BuildRequires:  python-fixtures

+ BuildRequires:  python2-setuptools

+ BuildRequires:  python2-pbr

+ BuildRequires:  python2-babel

+ BuildRequires:  python2-six

+ BuildRequires:  python2-fixtures

  # Required to compile translation files

- BuildRequires:  python-babel

+ BuildRequires:  python2-babel

  

- Requires:       python-babel

- Requires:       python-six

- Requires:       python-fixtures

- Requires:       python-%{pkg_name}-lang = %{version}-%{release}

+ Requires:       python2-babel

+ Requires:       python2-six

+ Requires:       python2-fixtures

+ Requires:       python2-%{pkg_name}-lang = %{version}-%{release}

  

  %description -n python2-oslo-i18n

  The oslo.i18n library contain utilities for working with internationalization
@@ -61,7 +61,7 @@ 

  Requires:       python3-babel

  Requires:       python3-six

  Requires:       python3-fixtures

- Requires:       python-%{pkg_name}-lang = %{version}-%{release}

+ Requires:       python2-%{pkg_name}-lang = %{version}-%{release}

  

  %description -n python3-oslo-i18n

  The oslo.i18n library contain utilities for working with internationalization
@@ -77,8 +77,8 @@ 

  Obsoletes: python2-oslo-i18n-doc <= 3.9.0-1

  Obsoletes: python3-oslo-i18n-doc <= 3.9.0-1

  

- BuildRequires:  python-sphinx

- BuildRequires:  python-openstackdocstheme

+ BuildRequires:  python2-sphinx

+ BuildRequires:  python2-openstackdocstheme

  

  %description -n python-oslo-i18n-doc

  Documentation for the oslo.i18n library.
@@ -151,6 +151,10 @@ 

  %license LICENSE

  

  %changelog

+ * Fri Feb 09 2018 Iryna Shcherbina <ishcherb@redhat.com> - 3.17.0-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> - 3.17.0-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 branch(es) as some of the modified requirements are not available there

This PR was opened automatically, for source code see here

rebased onto 4de9d92

6 years ago

Looking this package as a Fedora only, PR looks good but I am not sure if this fixed package when used in other products will create any issues.

Pull-Request has been merged by pnemade

6 years ago

@pnemade thanks for taking a look, but I have noticed a wrongly converted requirement and created another PR to fix it: https://src.fedoraproject.org/rpms/python-oslo-i18n/pull-request/2

If it creates any issues, let me know.