#28 Disable the dist generators for Python 2
Merged 2 months ago by churchyard. Opened 2 months ago by churchyard.
rpms/ churchyard/python-rpm-generators no_py2  into  rawhide

file modified
+6 -2
@@ -1,7 +1,7 @@ 

  Name:           python-rpm-generators

  Summary:        Dependency generators for Python RPMs

- Version:        11

- Release:        13%{?dist}

+ Version:        12

+ Release:        1%{?dist}

  

  # Originally all those files were part of RPM, so license is kept here

  License:        GPLv2+
@@ -47,6 +47,10 @@ 

  %{_rpmconfigdir}/pythonbundles.py

  

  %changelog

+ * Wed Feb 03 2021 Miro Hrončok <mhroncok@redhat.com> - 12-1

+ - Disable the dist generators for Python 2

+ - https://fedoraproject.org/wiki/Changes/Disable_Python_2_Dist_RPM_Generators_and_Freeze_Python_2_Macros

+ 

  * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11-13

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

  

file modified
+1 -1
@@ -1,3 +1,3 @@ 

  %__pythondist_provides	%{_rpmconfigdir}/pythondistdeps.py --provides --normalized-names-format pep503 --package-name %{name} --normalized-names-provide-both --majorver-provides-versions 2.7,%{__default_python3_version}

  %__pythondist_requires	%{_rpmconfigdir}/pythondistdeps.py --requires --normalized-names-format pep503 --package-name %{name} %{?!_python_no_extras_requires:--require-extras-subpackages}

- %__pythondist_path		^/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$

+ %__pythondist_path		^/usr/lib(64)?/python[3-9]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$

https://fedoraproject.org/wiki/Changes/Disable_Python_2_Dist_RPM_Generators_and_Freeze_Python_2_Macros

The regex previously matched any Python version in a form of <single digit>.<at least one digit>.

Now it matches anything from 3.0 above: <single digit (3 or higher)>.<at least one digit>

It still does not match <multiple digits>.<at least one digit>, e.g. 11.0.

This is a breaking change, hence the version bump.

I'd appreciate a review with a manual test

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Zuul says:

The sources file does not contain the COPYING name and hash.
You should run
spectool -g python-rpm-generators.spec
fedpkg upload COPYING

That is not accurate. COPYING is checked into distgit.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Build succeeded.

Diff LGTM.
I've build python-six with Python 3.9 and 3.10. python2-six did not have autogenerated Provides; python3-six had the right ones.

+1

Pull-Request has been merged by churchyard

2 months ago