From 9474727ef6ca0b17221c2170e8d52268ef8842fae7c0c346f4c9cfec6e1487ab Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 3 Mar 2020 09:18:06 +0000 Subject: [PATCH] Accepting request 780870 from devel:languages:python:pytest - Skip tests that fail with pytest 5.x series OBS-URL: https://build.opensuse.org/request/show/780870 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pytest-twisted?expand=0&rev=2 --- LICENSE | 29 ----------------------------- pytest-twisted-1.12.zip | 3 --- python-pytest-twisted.changes | 5 +++++ python-pytest-twisted.spec | 12 ++++++------ v1.12.tar.gz | 3 +++ 5 files changed, 14 insertions(+), 38 deletions(-) delete mode 100644 LICENSE delete mode 100644 pytest-twisted-1.12.zip create mode 100644 v1.12.tar.gz diff --git a/LICENSE b/LICENSE deleted file mode 100644 index e7f372c..0000000 --- a/LICENSE +++ /dev/null @@ -1,29 +0,0 @@ -BSD 3-Clause License - -Copyright (c) 2012, Ralf Schmitt -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -* Neither the name of the copyright holder nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/pytest-twisted-1.12.zip b/pytest-twisted-1.12.zip deleted file mode 100644 index 85592b9..0000000 --- a/pytest-twisted-1.12.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb9af117c5c6063d9ef20ffdf2fa297caaf57de5a687e4d3607db7b0a6f74fea -size 15996 diff --git a/python-pytest-twisted.changes b/python-pytest-twisted.changes index 5f2e5d3..9eab43c 100644 --- a/python-pytest-twisted.changes +++ b/python-pytest-twisted.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 2 09:30:14 UTC 2020 - Tomáš Chvátal + +- Skip tests that fail with pytest 5.x series + ------------------------------------------------------------------- Thu Nov 14 14:52:41 UTC 2019 - Tomáš Chvátal diff --git a/python-pytest-twisted.spec b/python-pytest-twisted.spec index 3c9d837..1c97f2c 100644 --- a/python-pytest-twisted.spec +++ b/python-pytest-twisted.spec @@ -1,7 +1,7 @@ # # spec file for package python-pytest-twisted # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,9 +24,7 @@ Summary: Pytest Plugin for Twisted License: BSD-2-Clause Group: Development/Languages/Python URL: https://github.com/pytest-dev/pytest-twisted -Source: https://files.pythonhosted.org/packages/source/p/pytest-twisted/pytest-twisted-%{version}.zip -# https://github.com/pytest-dev/pytest-twisted/pull/72 -Source99: https://raw.githubusercontent.com/pytest-dev/pytest-twisted/master/LICENSE +Source: https://github.com/pytest-dev/pytest-twisted/archive/v%{version}.tar.gz BuildRequires: %{python_module Twisted} BuildRequires: %{python_module decorator} BuildRequires: %{python_module greenlet} @@ -49,7 +47,6 @@ objects and pytest will wait for their completion with this plugin. %prep %setup -q -n pytest-twisted-%{version} -cp %{SOURCE99} . %build %python_build @@ -59,7 +56,10 @@ cp %{SOURCE99} . %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pytest +export PYTHONDONTWRITEBYTECODE=1 +# test_inline_callbacks_in_pytest_deprecation - breaks with the new pytest 5.x series +# test_blockon_in_pytest_deprecation - breaks with the new pytest 5.x series +%pytest -k 'not test_blockon_in_pytest_deprecation and not test_inline_callbacks_in_pytest_deprecation' %files %{python_files} %license LICENSE diff --git a/v1.12.tar.gz b/v1.12.tar.gz new file mode 100644 index 0000000..303a91a --- /dev/null +++ b/v1.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab6388569c3fd4a601a94ad5f331c926775383667ba8db645de2fbaea7e9bd89 +size 10257