From 81ffc1a2bf3a757a09b9facfa2b92d78498fa2a7d50a488bdbf6568c9ee62921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 15 Aug 2020 09:16:40 +0000 Subject: [PATCH] Accepting request 826782 from home:jayvdb:py-submit - Re-activate test suite on x86_64, replacing nose with pytest OBS-URL: https://build.opensuse.org/request/show/826782 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyzmq?expand=0&rev=82 --- python-pyzmq.changes | 5 +++++ python-pyzmq.spec | 23 ++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/python-pyzmq.changes b/python-pyzmq.changes index ffab663..afbcf57 100644 --- a/python-pyzmq.changes +++ b/python-pyzmq.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Aug 15 06:33:10 UTC 2020 - John Vandenberg + +- Re-activate test suite on x86_64, replacing nose with pytest + ------------------------------------------------------------------- Tue Aug 4 16:05:21 UTC 2020 - Dirk Mueller diff --git a/python-pyzmq.spec b/python-pyzmq.spec index 47416fe..b84463d 100644 --- a/python-pyzmq.spec +++ b/python-pyzmq.spec @@ -17,8 +17,12 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -# Disable tests, they are so slow that OBS thinks the build died. -%bcond_with tests +# Disable tests, they are very slow/halt on many arch +%ifarch x86_64 +%bcond_without tests +%else +%bcond_with tests +%endif Name: python-pyzmq Version: 19.0.2 Release: 0 @@ -34,11 +38,10 @@ BuildRequires: %{python_module cffi} BuildRequires: %{python_module devel} BuildRequires: %{python_module gevent} # Test requirements -BuildRequires: %{python_module nose} BuildRequires: %{python_module numpy} BuildRequires: %{python_module paramiko} BuildRequires: %{python_module pexpect} -BuildRequires: %{python_module py} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module simplejson} BuildRequires: %{python_module tornado} @@ -77,6 +80,12 @@ Development libraries and headers needed to build software using %{name}. # Fix non-executable script rpmlint warning: find examples zmq -name "*.py" -exec sed -i "s|#\!\/usr\/bin\/env python||" {} \; +# Remove non-deterministic authentication test +# This fails to connect randomly +rm -rf zmq/tests/test_auth.py +sed -i '/from zmq.tests.test_auth/d' zmq/tests/asyncio/_test_asyncio.py +sed -i 's/TestThreadAuthentication/object/' zmq/tests/asyncio/_test_asyncio.py + %patch1 %build @@ -89,12 +98,8 @@ export CFLAGS="%{optflags}" %if %{with tests} %check -# Remove non-deterministic authentication test -# This fails to connect randomly -rm -rf zmq/tests/test_auth.py - %python_exec setup.py build_ext --inplace -%python_exec setup.py test +%pytest %endif %files %{python_files}