From 64d7e62d33e5e869e24d99be0c30c3dc593ad418 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 3 Nov 2017 18:02:33 +0100 Subject: [PATCH] Remove platform-python subpackage hypothesis doesn't exist anymore in platform-python version. Signed-off-by: Igor Gnatenko --- pytest.spec | 69 ++++------------------------------------------------- 1 file changed, 5 insertions(+), 64 deletions(-) diff --git a/pytest.spec b/pytest.spec index 9c52f49..7b72f17 100644 --- a/pytest.spec +++ b/pytest.spec @@ -2,7 +2,7 @@ Name: pytest Version: 3.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple powerful testing with Python License: MIT URL: http://pytest.org @@ -16,12 +16,6 @@ Source0: https://files.pythonhosted.org/packages/source/p/%{name}/%{name} %bcond_without python2 %bcond_without python3 -%if 0%{?fedora} >= 27 -%bcond_without platform_python -%else -%bcond_with platform_python -%endif - BuildArch: noarch %description @@ -81,35 +75,17 @@ BuildRequires: python3-decorator Requires: python3-setuptools Requires: python3-py >= %{pylib_version} %{?python_provide:%python_provide python3-%{name}} +Obsoletes: platform-python-%{name} < 3.2.3-2 %description -n python3-%{name} py.test provides simple, yet powerful testing for Python. %endif -%if %{with platform_python} -%package -n platform-python-%{name} -Summary: Simple powerful testing with Python -BuildRequires: platform-python-devel -BuildRequires: platform-python-setuptools -BuildRequires: platform-python-setuptools_scm -BuildRequires: platform-python-py >= %{pylib_version} -# doc requirements are skipped -# requirements for optional tests are skipped -BuildRequires: platform-python-hypothesis -Requires: platform-python-setuptools -Requires: platform-python-py >= %{pylib_version} - -%description -n platform-python-%{name} -py.test provides simple, yet powerful testing for Python. -%endif - - %prep %setup -qc -n %{name}-%{version} mv %{name}-%{version} python2 cp -a python2 python3 -cp -a python2 platform-python %build @@ -137,12 +113,6 @@ done popd %endif -%if %{with platform_python} -pushd platform-python -%{platform_py_build} -popd -%endif - %install %if %{with python2} @@ -189,18 +159,6 @@ find %{buildroot}%{python3_sitelib} \ -exec sed -i -e '1{/^#!/d}' {} \; %endif -%if %{with platform_python} -pushd platform-python -%{platform_py_install} -rm %{buildroot}%{_bindir}/pytest -rm %{buildroot}%{_bindir}/py.test - -# remove shebangs from all scripts -find %{buildroot}%{platform_python_sitelib} \ - -name '*.py' \ - -exec sed -i -e '1{/^#!/d}' {} \; -%endif - %if %{with python2} # use 2.X per default ln -snf pytest-%{python2_version} %{buildroot}%{_bindir}/pytest @@ -233,15 +191,6 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} \ popd %endif -%if %{with platform_python} -pushd platform-python -PATH=%{buildroot}%{_bindir}:${PATH} \ -PYTHONPATH=%{buildroot}%{platform_python_sitelib} \ - %{__platform_python} -m pytest -r s testing - -popd -%endif - %if %{with python2} %files -n python2-%{name} @@ -276,18 +225,10 @@ popd %endif -%if %{with platform_python} -%files -n platform-python-%{name} -%doc platform-python/CHANGELOG.rst -%doc platform-python/README.rst -%doc platform-python/CONTRIBUTING.rst -%license platform-python/LICENSE -%{platform_python_sitelib}/* -%exclude %dir %{platform_python_sitelib}/__pycache__ -%endif - - %changelog +* Fri Nov 03 2017 Igor Gnatenko - 3.2.3-2 +- Remove platform-python subpackage + * Sat Oct 7 2017 Thomas Moschny - 3.2.3-1 - Update to 3.2.3.