[packages/flake8] Rel 2; python3 only here. python 2 version is in python-flake8.spec. Updated pycodestyle/pyflakes de

arekm arekm at pld-linux.org
Mon Apr 7 22:43:49 CEST 2025 

commit 7ae1389cc5094f30a43503653fc231066a2c2d46
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Apr 7 22:42:31 2025 +0200

    Rel 2; python3 only here. python 2 version is in python-flake8.spec. Updated pycodestyle/pyflakes deps.

 flake8.spec | 108 ++++++------------------------------------------------------
 1 file changed, 10 insertions(+), 98 deletions(-)
---
diff --git a/flake8.spec b/flake8.spec
index 431d8a4..a692133 100644
--- a/flake8.spec
+++ b/flake8.spec
@@ -1,15 +1,12 @@
 #
 # Conditional build:
-%bcond_with	python2	# CPython 2.x module
-%bcond_without	python3	# CPython 3.x module
 %bcond_with	tests	# pytest tests
 
 Summary:	The modular source code checker: pycodestyle, pyflakes and co.
 Summary(pl.UTF-8):	Modularne narzędzie do sprawdzania kodu źródłowego: pycodestyle, pyflakes itp.
 Name:		flake8
-# before updating to 4.x fork python-flake8.spec with last 3.x version
 Version:	7.2.0
-Release:	1
+Release:	2
 License:	MIT
 Group:		Development/Tools
 #Source0Download: https://pypi.org/simple/flake8/
@@ -18,48 +15,19 @@ Source0:	https://files.pythonhosted.org/packages/source/f/flake8/%{name}-%{versi
 URL:		https://gitlab.com/pycqa/flake8
 BuildRequires:	rpmbuild(macros) >= 1.714
 BuildRequires:	rpm-pythonprov
-%if %{with python2}
-BuildRequires:	python-modules >= 1:2.7
-BuildRequires:	python-setuptools >= 1:30
-%if %{with tests}
-BuildRequires:	python-configparser
-BuildRequires:	python-enum34
-BuildRequires:	python-functools32
-BuildRequires:	python-importlib_metadata
-BuildRequires:	python-mccabe >= 0.6.0
-BuildRequires:	python-mccabe < 0.7.0
-BuildRequires:	python-mock >= 2.0.0
-BuildRequires:	python-pycodestyle >= 2.7.0
-BuildRequires:	python-pycodestyle < 2.8.0
-BuildRequires:	python-pyflakes >= 2.3.0
-BuildRequires:	python-pyflakes < 2.4.0
-BuildRequires:	python-pytest
-BuildRequires:	python-typing
-%endif
-%endif
-%if %{with python3}
 BuildRequires:	python3-modules >= 1:3.5
 BuildRequires:	python3-setuptools >= 1:30
 %if %{with tests}
-%if "%{py3_ver}" < "3.8"
-BuildRequires:	python3-importlib_metadata
-%endif
 BuildRequires:	python3-mccabe >= 0.6.0
 BuildRequires:	python3-mccabe < 0.7.0
-BuildRequires:	python3-pycodestyle >= 2.7.0
-BuildRequires:	python3-pycodestyle < 2.8.0
-BuildRequires:	python3-pyflakes >= 2.3.0
-BuildRequires:	python3-pyflakes < 2.4.0
+BuildRequires:	python3-pycodestyle >= 2.13.0
+BuildRequires:	python3-pycodestyle < 2.14.0
+BuildRequires:	python3-pyflakes >= 3.3.0
+BuildRequires:	python3-pyflakes < 3.4.0
 BuildRequires:	python3-pytest
 BuildRequires:	sed >= 4.0
 %endif
-%endif
-%if %{with python3}
 Requires:	python3-flake8 = %{version}-%{release}
-%else
-Requires:	python-flake8 = %{version}-%{release}
-%endif
-Obsoletes:	python-flake8-apidocs < 7.2.0
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -76,31 +44,6 @@ dla narzędzi:
 - pycodestyle
 - skrypt McCabe autorstwa Neda Batcheldera
 
-%package -n python-flake8
-Summary:	The modular source code checker: pycodestyle, pyflakes and co.
-Summary(pl.UTF-8):	Modularne narzędzie do sprawdzania kodu źródłowego: pycodestyle, pyflakes itp.
-Group:		Libraries/Python
-Requires:	python-mccabe >= 0.6.0
-Requires:	python-mccabe < 0.7.0
-Requires:	python-modules >= 1:2.7
-Requires:	python-pycodestyle >= 2.7.0
-Requires:	python-pycodestyle < 2.8.0
-Requires:	python-pyflakes >= 2.3.0
-Requires:	python-pyflakes < 2.4.0
-
-%description -n python-flake8
-The modular source code checker. It is a wrapper around these tools:
-- PyFlakes
-- pycodestyle
-- Ned Batchelder's McCabe script
-
-%description -n python-flake8 -l pl.UTF-8
-Modularne narzędzie do sprawdzania kodu źródłowego. Jest to opakowanie
-dla narzędzi:
-- PyFlakes
-- pycodestyle
-- skrypt McCabe autorstwa Neda Batcheldera
-
 %package -n python3-flake8
 Summary:	The modular source code checker: pycodestyle, pyflakes and co
 Summary(pl.UTF-8):	Modularne narzędzie do sprawdzania kodu źródłowego: pycodestyle, pyflakes itp.
@@ -108,10 +51,10 @@ Group:		Libraries/Python
 Requires:	python3-mccabe >= 0.6.0
 Requires:	python3-mccabe < 0.7.0
 Requires:	python3-modules >= 1:3.4
-Requires:	python3-pycodestyle >= 2.7.0
-Requires:	python3-pycodestyle < 2.8.0
-Requires:	python3-pyflakes >= 2.3.0
-Requires:	python3-pyflakes < 2.4.0
+Requires:	python3-pycodestyle >= 2.13.0
+Requires:	python3-pycodestyle < 2.14.0
+Requires:	python3-pyflakes >= 3.3.0
+Requires:	python3-pyflakes < 3.4.0
 
 %description -n python3-flake8
 The modular source code checker. It is a wrapper around these tools:
@@ -131,17 +74,6 @@ dla narzędzi:
 %setup -q
 
 %build
-%if %{with python2}
-%py_build
-
-%if %{with tests}
-PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
-PYTHONPATH=$(pwd)/src \
-%{__python} -m pytest -rw tests
-%endif
-%endif
-
-%if %{with python3}
 %py3_build
 
 %if %{with tests}
@@ -149,23 +81,14 @@ PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
 PYTHONPATH=$(pwd)/src \
 %{__python3} -m pytest -rw tests
 %endif
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with python2}
-%py_install
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/flake8{,-2}
-%py_postclean
-%endif
-
-%if %{with python3}
 %py3_install
 %{__mv} $RPM_BUILD_ROOT%{_bindir}/flake8{,-3}
-%endif
 
-ln -s flake-%{!?with_python3:2}%{?with_python3:3} $RPM_BUILD_ROOT%{_bindir}/flake8
+ln -s flake-3 $RPM_BUILD_ROOT%{_bindir}/flake8
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -174,20 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/flake8
 
-%if %{with python2}
-%files -n python-flake8
-%defattr(644,root,root,755)
-%doc LICENSE README.rst
-%attr(755,root,root) %{_bindir}/flake8-2
-%{py_sitescriptdir}/flake8
-%{py_sitescriptdir}/flake8-%{version}-py*.egg-info
-%endif
-
-%if %{with python3}
 %files -n python3-flake8
 %defattr(644,root,root,755)
 %doc LICENSE README.rst
 %attr(755,root,root) %{_bindir}/flake8-3
 %{py3_sitescriptdir}/flake8
 %{py3_sitescriptdir}/flake8-%{version}-py*.egg-info
-%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/flake8.git/commitdiff/7ae1389cc5094f30a43503653fc231066a2c2d46

More information about the pld-cvs-commit mailing list