From edbae7c73854cb43f2b373e6e9f22908015d9a3c Mon Sep 17 00:00:00 2001 From: zhangy1317 Date: Fri, 11 Feb 2022 16:15:39 +0800 Subject: [PATCH 1/2] remove python2 --- python-testtools.spec | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/python-testtools.spec b/python-testtools.spec index bf724cb..c885299 100644 --- a/python-testtools.spec +++ b/python-testtools.spec @@ -1,6 +1,6 @@ Name: python-testtools Version: 2.3.0 -Release: 11 +Release: 12 Summary: Extensions to the Python unit testing framework License: MIT URL: https://launchpad.net/testtools @@ -9,8 +9,7 @@ Source0: https://pypi.io/packages/source/t/testtools/testtools-%{version} Patch0001: testtools-1.8.0-py3.patch Patch0002: testtools-2.3.0-py37.patch -BuildRequires: python2-devel python2-extras python2-mimeparse >= 0.1.4 python2-pbr python2-setuptools -BuildRequires: python2-unittest2 >= 1.0.0 python2-traceback2 python2-testscenarios python3-devel +BuildRequires: python3-devel BuildRequires: python3-extras python3-mimeparse python3-pbr python3-setuptools python3-unittest2 BuildRequires: python3-traceback2 python3-testscenarios python3-sphinx BuildArch: noarch @@ -20,16 +19,6 @@ Testtools is a set of extensions to the Python standard library's unit testing f extensions have been derived from years of experience with unit testing in Python and come from many different sources. -%package -n python2-testtools -Summary: Extensions to the Python unit testing framework -Requires: python2-extras python2-mimeparse python2-pbr python2-unittest2 >= 1.0.0 python2-traceback2 -%{?python_provide:%python_provide python2-testtools} - -%description -n python2-testtools -Testtools is a set of extensions to the Python standard library's unit testing framework. These -extensions have been derived from years of experience with unit testing in Python and come from -many different sources. - %package -n python3-testtools Summary: Extensions to the Python unit testing framework Requires: python3-extras python3-mimeparse python3-pbr python3-unittest2 >= 1.0.0 python3-traceback2 @@ -41,7 +30,6 @@ many different sources. %package help Summary: Documentation for python-testtools -Requires: python2-testtools = %{version}-%{release} Provides: bundled(jquery) %{name}-doc = %{version}-%{release} Obsoletes: %{name}-doc < %{version}-%{release} @@ -51,33 +39,20 @@ This package contains HTML documentation for python-testtools. %prep %setup -q -n testtools-%{version} %patch0002 -p1 -rm -rf %{py3dir} -cp -a . %{py3dir} -cd %{py3dir} %patch0001 -p1 find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' rm -f %{py3dir}/testtools/_compat2x.py %{_builddir}/testtools-%{version}/testtools/_compat3x.py %build -%{__python2} setup.py build PYTHONPATH=$PWD make -C doc html -cd %{py3dir} %{__python3} setup.py build %install -%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -cd %{py3dir} %{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %check -make PYTHON=%{__python2} check -cd %{py3dir} make PYTHON=%{__python3} check -%files -n python2-testtools -%doc LICENSE NEWS README.rst -%{python2_sitelib}/* - %files -n python3-testtools %doc LICENSE NEWS README.rst %{python3_sitelib}/* @@ -86,6 +61,9 @@ make PYTHON=%{__python3} check %doc doc/_build/html/* %changelog +* Wed Jan 26 2022 zhangy1317 - 2.3.0-12 +- Remove python2 + * Thu Feb 20 2020 lingsheng - 2.3.0-11 - Modify buildrequires to fix build fail -- Gitee From 80d687b8c9237873403322870ca7024016c8ce4d Mon Sep 17 00:00:00 2001 From: zhangy1317 Date: Fri, 11 Feb 2022 16:22:48 +0800 Subject: [PATCH 2/2] remove python2 --- python-testtools.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-testtools.spec b/python-testtools.spec index c885299..8f659f2 100644 --- a/python-testtools.spec +++ b/python-testtools.spec @@ -39,7 +39,6 @@ This package contains HTML documentation for python-testtools. %prep %setup -q -n testtools-%{version} %patch0002 -p1 -%patch0001 -p1 find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' rm -f %{py3dir}/testtools/_compat2x.py %{_builddir}/testtools-%{version}/testtools/_compat3x.py -- Gitee