From 3ce04a9bcff529e11350c3e14d656abeb68501f06eacf2e032a6e54dec2e12eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Wed, 7 Jul 2021 08:43:45 +0000 Subject: [PATCH] Accepting request 904227 from home:alarrosa:branches:devel:languages:python - Add a _multibuild file to separate the tests in another build in order to break a cycle between: python-Django, python-aiohttp, python-eventlet, python-geoip2, python-gunicorn, python-paramiko, python-pyzmq and python-semantic_version. OBS-URL: https://build.opensuse.org/request/show/904227 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gunicorn?expand=0&rev=50 --- _multibuild | 3 +++ python-gunicorn.changes | 8 ++++++++ python-gunicorn.spec | 33 ++++++++++++++++++++++++--------- 3 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/python-gunicorn.changes b/python-gunicorn.changes index 4920a54..458c7f0 100644 --- a/python-gunicorn.changes +++ b/python-gunicorn.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 5 15:12:53 UTC 2021 - Antonio Larrosa + +- Add a _multibuild file to separate the tests in another build + in order to break a cycle between: python-Django, python-aiohttp, + python-eventlet, python-geoip2, python-gunicorn, python-paramiko, + python-pyzmq and python-semantic_version. + ------------------------------------------------------------------- Tue Jun 29 08:52:40 UTC 2021 - Ondřej Súkup diff --git a/python-gunicorn.spec b/python-gunicorn.spec index 57f082f..2cee756 100644 --- a/python-gunicorn.spec +++ b/python-gunicorn.spec @@ -1,5 +1,5 @@ # -# spec file for package python-gunicorn +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -16,9 +16,17 @@ # +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif %define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} -Name: python-gunicorn +Name: python-gunicorn%{psuffix} Version: 20.1.0 Release: 0 Summary: WSGI HTTP Server for UNIX @@ -26,16 +34,19 @@ License: MIT Group: Development/Languages/Python URL: https://gunicorn.org Source: https://files.pythonhosted.org/packages/source/g/gunicorn/gunicorn-%{version}.tar.gz -BuildRequires: %{python_module eventlet} -BuildRequires: %{python_module gevent} -BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools >= 3.0} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-Sphinx +%if %{with test} +BuildRequires: %{python_module eventlet} +BuildRequires: %{python_module gevent >= 1.4} +BuildRequires: %{python_module gunicorn} +BuildRequires: %{python_module pytest} +%endif Requires: python-setuptools >= 3.0 Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Suggests: python-evenlet Suggests: python-gevent Suggests: python-gthread @@ -69,6 +80,12 @@ sed -i -e '/cover/d' requirements_test.txt # do not check coverage sed -i -e 's/--cov[^ ]*//' -e 's/--cov-report[^ ]*//' setup.cfg +%if %{with test} +%check +%pytest + +%else # without test + %build %python_build sphinx-build -b html -d docs/build/doctrees docs/source docs/build/html @@ -78,9 +95,6 @@ sphinx-build -b html -d docs/build/doctrees docs/source docs/build/html %python_clone -a %{buildroot}%{_bindir}/gunicorn %python_expand %fdupes %{buildroot}%{$python_sitelib} -%check -%pytest - %post %python_install_alternative gunicorn @@ -95,5 +109,6 @@ sphinx-build -b html -d docs/build/doctrees docs/source docs/build/html %files -n python-gunicorn-doc %license LICENSE %doc README.rst NOTICE THANKS docs/build/html +%endif %changelog