#7 epel7: update to 1.6.0 (do over)
Merged 5 years ago by kanarip. Opened 5 years ago by carlwgeorge.
rpms/ carlwgeorge/pyflakes epel7-1.6.0  into  epel7

file modified
+79 -25
@@ -1,22 +1,24 @@ 

- %bcond_without python3

+ %if 0%{?fedora} > 26 || 0%{?rhel} > 7

+ %global defaultpython 3

+ %else

+ %global defaultpython 2

+ %endif

  

  Name:           pyflakes

- Version:        1.3.0

- Release:        3%{?dist}

+ Version:        1.6.0

+ Release:        4%{?dist}

  Summary:        A simple program which checks Python source files for errors

  

  License:        MIT

  URL:            https://github.com/PyCQA/pyflakes

  

  Source0:        https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz

- Source1:        http://cdn.debian.net/debian/pool/main/p/pyflakes/pyflakes_1.2.3-1.debian.tar.xz

+ Source1:        http://cdn.debian.net/debian/pool/main/p/pyflakes/pyflakes_1.5.0-1.debian.tar.xz

  Patch0:         %{name}-1.1.0-python3-man.patch

  

  BuildArch:      noarch

  BuildRequires:  python2-devel >= 2.5

- BuildRequires:  python-setuptools

- Requires:       python-setuptools

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

+ BuildRequires:  python2-setuptools

  

  %global desc Pyflakes is similar to PyChecker in scope, but differs in that it does\

  not execute the modules to check them. This is both safer and faster,\
@@ -24,10 +26,21 @@ 

  checks only for logical errors in programs; it does not perform any\

  check on style.

  

- %description

+ %global _description\

  %{desc}

  

- %if %{with python3}

+ %description %_description

+ 

+ %package -n python2-pyflakes

+ Summary: %summary

+ Requires:       python2-setuptools

+ %{?python_provide:%python_provide python2-pyflakes}

+ # Remove before F30

+ Provides: pyflakes = %{version}-%{release}

+ Obsoletes: pyflakes < %{version}-%{release}

+ 

+ %description -n python2-pyflakes %_description

+ 

  %package -n python%{python3_pkgversion}-%{name}

  Summary:        %{summary}

  BuildRequires:  python%{python3_pkgversion}-devel
@@ -37,7 +50,6 @@ 

  

  %description -n python%{python3_pkgversion}-%{name}

  %{desc}

- %endif

  

  %prep

  %setup -q -a 1
@@ -45,44 +57,47 @@ 

  

  %build

  %py2_build

- %{?with_python3:%py3_build}

+ %py3_build

  

  %install

- install -Dpm 644 debian/pyflakes.1 %{buildroot}%{_mandir}/man1/pyflakes-%{python2_version}.1

- ln -s pyflakes-%{python2_version}.1 %{buildroot}%{_mandir}/man1/pyflakes-2.1

- ln -s pyflakes-2.1 %{buildroot}%{_mandir}/man1/pyflakes.1

- %if %{with python3}

+ rm -rf %{buildroot}

+ 

  %py3_install

  mv %{buildroot}%{_bindir}/pyflakes %{buildroot}%{_bindir}/pyflakes-%{python3_version}

  ln -s pyflakes-%{python3_version} %{buildroot}%{_bindir}/pyflakes-3

- install -pm 644 debian/pyflakes3.1 %{buildroot}%{_mandir}/man1/pyflakes-%{python3_version}.1

+ install -Dpm 644 debian/pyflakes3.1 %{buildroot}%{_mandir}/man1/pyflakes-%{python3_version}.1

  ln -s pyflakes-%{python3_version}.1 %{buildroot}%{_mandir}/man1/pyflakes-3.1

  # python3-pyflakes: backwards compat

  ln -s pyflakes-3 %{buildroot}%{_bindir}/python3-pyflakes

  ln -s pyflakes-3.1 %{buildroot}%{_mandir}/man1/python3-pyflakes.1

- %endif

+ 

  %py2_install

  mv %{buildroot}%{_bindir}/pyflakes %{buildroot}%{_bindir}/pyflakes-%{python2_version}

  ln -s pyflakes-%{python2_version} %{buildroot}%{_bindir}/pyflakes-2

- ln -s pyflakes-2 %{buildroot}%{_bindir}/pyflakes

+ install -Dpm 644 debian/pyflakes.1 %{buildroot}%{_mandir}/man1/pyflakes-%{python2_version}.1

+ ln -s pyflakes-%{python2_version}.1 %{buildroot}%{_mandir}/man1/pyflakes-2.1

+ 

+ ln -s pyflakes-%{defaultpython} %{buildroot}%{_bindir}/pyflakes

+ ln -s pyflakes-%{defaultpython}.1 %{buildroot}%{_mandir}/man1/pyflakes.1

  

  %check

- %{__python2} setup.py test

- %{?with_python3:%{__python3} setup.py test}

+ %{__python2} -Wall setup.py test

+ %{__python3} -Wall setup.py test

  

- %files

+ %files -n python2-pyflakes

  %license LICENSE

  %doc AUTHORS NEWS.txt README.rst

  %{_bindir}/pyflakes-%{python2_version}

  %{_bindir}/pyflakes-2

- %{_bindir}/pyflakes

  %{python_sitelib}/pyflakes*

  %exclude %{python_sitelib}/pyflakes/test/

  %{_mandir}/man1/pyflakes-%{python2_version}.1*

  %{_mandir}/man1/pyflakes-2.1*

+ %if %{defaultpython} == 2

+ %{_bindir}/pyflakes

  %{_mandir}/man1/pyflakes.1*

+ %endif

  

- %if %{with python3}

  %files -n python%{python3_pkgversion}-%{name}

  %license LICENSE

  %doc AUTHORS NEWS.txt README.rst
@@ -94,11 +109,50 @@ 

  %{_mandir}/man1/pyflakes-%{python3_version}.1*

  %{_mandir}/man1/pyflakes-3.1*

  %{_mandir}/man1/python3-pyflakes.1*

+ %if %{defaultpython} == 3

+ %{_bindir}/pyflakes

+ %{_mandir}/man1/pyflakes.1*

  %endif

  

  %changelog

- * Thu Mar 07 2019 Troy Dawson <tdawson@redhat.com> - 1.3.0-3

- - Rebuilt to change main python from 3.4 to 3.6

+ * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-4

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

+ 

+ * Wed Feb 07 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.6.0-3

+ - Update Python 2 dependency declarations to new packaging standards

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

+ 

+ * Sun Dec 17 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.6.0-2

+ - Python 2 binary package renamed to python2-pyflakes

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

+ 

+ * Thu Aug  3 2017 Ville Skyttä <ville.skytta@iki.fi> - 1.6.0-1

+ - Update to 1.6.0

+ 

+ * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-5

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

+ 

+ * Fri Jun 30 2017 Ville Skyttä <ville.skytta@iki.fi> - 1.5.0-4

+ - Point unversioned pyflakes executable to Python 3 in F27+ and EL8+

+ - Provide python2-pyflakes

+ 

+ * Fri May 26 2017 Ville Skyttä <ville.skytta@iki.fi> - 1.5.0-3

+ - Run tests with -Wall

+ 

+ * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

+ 

+ * Wed Jan 11 2017 Ville Skyttä <ville.skytta@iki.fi> - 1.5.0-1

+ - Update to 1.5.0

+ 

+ * Sun Jan  1 2017 Ville Skyttä <ville.skytta@iki.fi> - 1.4.0-1

+ - Update to 1.4.0

+ 

+ * Fri Dec 09 2016 Charalampos Stratakis <cstratak@redhat.com> - 1.3.0-4

+ - Rebuild for Python 3.6

+ 

+ * Thu Dec  8 2016 Ville Skyttä <ville.skytta@iki.fi> - 1.3.0-3

+ - Unconditionalize python3 build

  

  * Wed Sep 14 2016 Ville Skyttä <ville.skytta@iki.fi> - 1.3.0-2

  - Add standard versioned names for executables and man pages (#1374381)

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

- 1486cb6b617f94acd3e36712cb1e9785  pyflakes_1.2.3-1.debian.tar.xz

- d66478aaff1d003ddc7fc1759a74e1e2  pyflakes-1.3.0.tar.gz

+ SHA512 (pyflakes_1.5.0-1.debian.tar.xz) = c24d01d1149b7eb796c20f9ebd540d92a8be58c98194371682c5f654474b335484a0eb756b576dfe28e5a1c867c5fa224a56fc163db7d5537a22b59c3f5e26b2

+ SHA512 (pyflakes-1.6.0.tar.gz) = 7e9c2aad6ebed638a1354cef51c7e1f68b25e59f8caf4694997a9afecd7cd8baa629a9363297ac0d961430f007fd22dcae7dae1bcbd7838a3b5d4285063bc7c5

The current 1.3.0 in epel7 fails to rebuild with python36. Upstream didn't start testing with Python 3.6 until 1.6.0.

https://github.com/PyCQA/pyflakes/commit/c94e50759839b781cdbb029ae68f8069234ada3b

The f28 branch is 1.6.0 (same major version, unlike master) and builds successfully on el7. This change merges the f28 branch back to epel7.

Pull-Request has been merged by kanarip

5 years ago
Metadata