From f27c660678e951e4cd43e78d9b32a2c3492c95ccaba156a94624374c9205cf80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 20 Feb 2018 10:06:59 +0000 Subject: [PATCH] Accepting request 578302 from home:alarrosa:branches:devel:languages:python - pytest-asyncio was build requirement by pyee's setup.py file, but it was only used for tests. On top of that, the python-pytest-asyncio package is only available for python3, so now we only do tests on python3 and a patch was added to fix the requirements: * fix-build-requirements.patch - Since the tests require at least python 3.5, only run the tests when suse_version >= 1500 OBS-URL: https://build.opensuse.org/request/show/578302 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyee?expand=0&rev=2 --- fix-build-requirements.patch | 28 ++++++++++++++++++++++++++++ python-pyee.changes | 12 ++++++++++++ python-pyee.spec | 9 ++++++--- 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 fix-build-requirements.patch diff --git a/fix-build-requirements.patch b/fix-build-requirements.patch new file mode 100644 index 0000000..e4c3aa2 --- /dev/null +++ b/fix-build-requirements.patch @@ -0,0 +1,28 @@ +From: Antonio Larrosa +Subject: Fix build requirements which were in fact tests requirements + +pytest-asyncio was build requirement by pyee's setup.py file, but +it was only used for tests. Fix it so we can build for all python flavors +and run tests only for python3 (where pytest-asyncio is available). + +Index: pyee-5.0.0/setup.py +=================================================================== +--- pyee-5.0.0.orig/setup.py ++++ pyee-5.0.0/setup.py +@@ -14,11 +14,13 @@ setup( + + packages=find_packages(), + setup_requires=[ ++ 'vcversioner', ++ ], ++ tests_require=[ ++ 'twisted', + 'pytest-runner', + 'pytest-asyncio; python_version > "3.4"', +- 'vcversioner' +- ], +- tests_require=['twisted'], ++ ], + include_package_data=True, + + description="A port of node.js's EventEmitter to python.", diff --git a/python-pyee.changes b/python-pyee.changes index b14e498..29de573 100644 --- a/python-pyee.changes +++ b/python-pyee.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Feb 20 07:55:56 UTC 2018 - alarrosa@suse.com + +- pytest-asyncio was build requirement by pyee's setup.py file, but + it was only used for tests. On top of that, the python-pytest-asyncio + package is only available for python3, so now we only do tests on + python3 and a patch was added to fix the requirements: + * fix-build-requirements.patch + +- Since the tests require at least python 3.5, only run the tests when + suse_version >= 1500 + ------------------------------------------------------------------- Fri Jan 5 09:29:54 UTC 2018 - alarrosa@suse.com diff --git a/python-pyee.spec b/python-pyee.spec index 52e66fa..55f5ea3 100644 --- a/python-pyee.spec +++ b/python-pyee.spec @@ -26,16 +26,18 @@ Url: https://github.com/jfhbrook/pyee Group: Development/Languages/Python Source: https://files.pythonhosted.org/packages/source/p/pyee/pyee-%{version}.tar.gz Source99: https://github.com/jfhbrook/pyee/blob/master/LICENSE +# PATCH-FIX-UPSTREAM fix-build-requirements.patch +Patch0: fix-build-requirements.patch BuildRequires: python-rpm-macros BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module pytest-asyncio} -BuildRequires: %{python_module pytest-runner} BuildRequires: %{python_module vcversioner} # SECTION test requirements %if %{with test} BuildRequires: %{python_module Twisted} BuildRequires: %{python_module mock} +BuildRequires: %{python_module pytest-runner} +BuildRequires: python3-pytest-asyncio %endif # /SECTION BuildRequires: fdupes @@ -49,6 +51,7 @@ from Node.js. %prep %setup -q -n pyee-%{version} +%patch0 -p1 cp %{SOURCE99} . %build @@ -58,7 +61,7 @@ cp %{SOURCE99} . %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} -%if %{with test} +%if %{with test} && %{suse_version} >= 1500 %check # Only run tests for python3 %{python_expand #