#7 Update Python 2 dependency declarations to new packaging standards
Merged 5 years ago by ishcherb. Opened 5 years ago by ishcherb.
rpms/ ishcherb/atomic-reactor pyambiguous  into  master

file modified
+21 -17
@@ -32,7 +32,7 @@ 

  

  Name:           %{project}

  Version:        1.6.29

- Release:        2%{?dist}

+ Release:        3%{?dist}

  

  Summary:        Improved builder for Docker images

  Group:          Development/Tools
@@ -60,20 +60,20 @@ 

  %endif # with_check

  

  BuildRequires:  python2-devel

- BuildRequires:  python-setuptools

+ BuildRequires:  python2-setuptools

  %if 0%{?with_check}

- BuildRequires:  pytest

- BuildRequires:  python-pytest-capturelog

- BuildRequires:  python-dockerfile-parse >= 0.0.5

+ BuildRequires:  python2-pytest

+ BuildRequires:  python2-pytest-capturelog

+ BuildRequires:  python2-dockerfile-parse >= 0.0.5

  BuildRequires:  python2-docker

- BuildRequires:  python-flexmock >= 0.10.2

- BuildRequires:  python-six

+ BuildRequires:  python2-flexmock >= 0.10.2

+ BuildRequires:  python2-six

  BuildRequires:  python2-osbs-client >= 0.45

- BuildRequires:  python-backports-lzma

+ BuildRequires:  python2-backports-lzma

  BuildRequires:  python2-responses

- BuildRequires:  python-jsonschema

- BuildRequires:  PyYAML

- BuildRequires:  python-mock

+ BuildRequires:  python2-jsonschema

+ BuildRequires:  python2-pyyaml

+ BuildRequires:  python2-mock

  BuildRequires:  python2-docker-squash >= 1.0.0-0.3

  %endif # with_check

  
@@ -120,13 +120,13 @@ 

  Group:          Development/Tools

  License:        BSD

  Requires:       python2-docker

- Requires:       python-requests

- Requires:       python-setuptools

- Requires:       python-dockerfile-parse >= 0.0.5

+ Requires:       python2-requests

+ Requires:       python2-setuptools

+ Requires:       python2-dockerfile-parse >= 0.0.5

  Requires:       python2-docker-squash >= 1.0.0-0.3

- Requires:       python-backports-lzma

- Requires:       python-jsonschema

- Requires:       PyYAML

+ Requires:       python2-backports-lzma

+ Requires:       python2-jsonschema

+ Requires:       python2-pyyaml

  Provides:       python-dock = %{version}-%{release}

  Obsoletes:      python-dock < %{dock_obsolete_vr}

  
@@ -428,6 +428,10 @@ 

  

  

  %changelog

+ * Mon Feb 19 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.6.29-3

+ - Update Python 2 dependency declarations to new packaging standards

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

+ 

  * Thu Feb 01 2018 Clement Verna <cverna@fedoraproject.orf> - 1.6.29-2

  - Added patch to fix unit test on multi arch

  - Build Requires osbs-client version 0.45 for unit test

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 ishcherb

5 years ago