From 008b072d227a767278b98f2f95acb2faad73f24cbbe00646b3d0f10c53eb482e Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 6 Jan 2022 20:00:25 +0000 Subject: [PATCH] Accepting request 944509 from home:bnavigator:branches:devel:languages:python - Update to 1.13.4 * no release notes - Add pytest-twisted-ignorepy310DeprecationWarnings.patch gh#pytest-dev/pytest-twisted/146 OBS-URL: https://build.opensuse.org/request/show/944509 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-twisted?expand=0&rev=8 --- pytest-twisted-1.13.4-gh.tar.gz | 3 ++ ...isted-ignorepy310DeprecationWarnings.patch | 39 +++++++++++++++++++ python-pytest-twisted.changes | 8 ++++ python-pytest-twisted.spec | 19 ++++----- v1.13.2.tar.gz | 3 -- 5 files changed, 60 insertions(+), 12 deletions(-) create mode 100644 pytest-twisted-1.13.4-gh.tar.gz create mode 100644 pytest-twisted-ignorepy310DeprecationWarnings.patch delete mode 100644 v1.13.2.tar.gz diff --git a/pytest-twisted-1.13.4-gh.tar.gz b/pytest-twisted-1.13.4-gh.tar.gz new file mode 100644 index 0000000..399a9e6 --- /dev/null +++ b/pytest-twisted-1.13.4-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e767e9a648b8068524de02d79bbcb9c5dcc6f4ede046b88ca6aeba723af5ab81 +size 15687 diff --git a/pytest-twisted-ignorepy310DeprecationWarnings.patch b/pytest-twisted-ignorepy310DeprecationWarnings.patch new file mode 100644 index 0000000..278c973 --- /dev/null +++ b/pytest-twisted-ignorepy310DeprecationWarnings.patch @@ -0,0 +1,39 @@ +Index: pytest-twisted-1.13.4/pytest.ini +=================================================================== +--- pytest-twisted-1.13.4.orig/pytest.ini ++++ pytest-twisted-1.13.4/pytest.ini +@@ -1,3 +1,5 @@ + [pytest] + addopts = --verbose +-filterwarnings = error ++filterwarnings = ++ error ++ ignore:currentThread:DeprecationWarning +Index: pytest-twisted-1.13.4/testing/test_basic.py +=================================================================== +--- pytest-twisted-1.13.4.orig/testing/test_basic.py ++++ pytest-twisted-1.13.4/testing/test_basic.py +@@ -94,8 +94,13 @@ def skip_if_no_async_generators(): + + + @pytest.fixture +-def cmd_opts(request): ++def cmd_opts(request, testdir): + reactor = request.config.getoption("reactor", "default") ++ pytest_ini_file = """ ++ [pytest] ++ filterwarnings = ignore:currentThread:DeprecationWarning ++ """ ++ testdir.makefile(".ini", pytest=pytest_ini_file) + return ( + sys.executable, + "-m", +@@ -370,6 +375,8 @@ def test_async_fixture(testdir, cmd_opts + [pytest] + markers = + redgreenblue ++ filterwarnings = ++ ignore:currentThread:DeprecationWarning + """ + testdir.makefile('.ini', pytest=pytest_ini_file) + test_file = """ diff --git a/python-pytest-twisted.changes b/python-pytest-twisted.changes index e29fbad..36237f1 100644 --- a/python-pytest-twisted.changes +++ b/python-pytest-twisted.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jan 6 17:21:12 UTC 2022 - Ben Greiner + +- Update to 1.13.4 + * no release notes +- Add pytest-twisted-ignorepy310DeprecationWarnings.patch + gh#pytest-dev/pytest-twisted/146 + ------------------------------------------------------------------- Thu Nov 5 13:51:00 UTC 2020 - Marketa Machova diff --git a/python-pytest-twisted.spec b/python-pytest-twisted.spec index d8b47d6..9b6608c 100644 --- a/python-pytest-twisted.spec +++ b/python-pytest-twisted.spec @@ -1,7 +1,7 @@ # # spec file for package python-pytest-twisted # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,15 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pytest-twisted -Version: 1.13.2 +Version: 1.13.4 Release: 0 Summary: Pytest Plugin for Twisted License: BSD-2-Clause Group: Development/Languages/Python URL: https://github.com/pytest-dev/pytest-twisted -Source: https://github.com/pytest-dev/pytest-twisted/archive/v%{version}.tar.gz +Source: https://github.com/pytest-dev/pytest-twisted/archive/v%{version}.tar.gz#/pytest-twisted-%{version}-gh.tar.gz +# PATCH-FIX-OPENSUSE pytest-twisted-ignorepy310DeprecationWarnings.patch -- upstream wants this fixed in twisted itself -- gh#pytest-dev/pytest-twisted/146 +Patch0: pytest-twisted-ignorepy310DeprecationWarnings.patch BuildRequires: %{python_module Twisted} BuildRequires: %{python_module decorator} BuildRequires: %{python_module greenlet} @@ -46,7 +48,7 @@ which uses the twisted framework. test functions can return Deferred objects and pytest will wait for their completion with this plugin. %prep -%setup -q -n pytest-twisted-%{version} +%autosetup -p1 -n pytest-twisted-%{version} %build %python_build @@ -56,14 +58,13 @@ objects and pytest will wait for their completion with this plugin. %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -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' +%pytest %files %{python_files} %license LICENSE %doc README.rst -%{python_sitelib}/* +%{python_sitelib}/pytest_twisted.py* +%pycache_only %{python_sitelib}/__pycache__/pytest_twisted.* +%{python_sitelib}/pytest_twisted-%{version}*-info %changelog diff --git a/v1.13.2.tar.gz b/v1.13.2.tar.gz deleted file mode 100644 index 301770a..0000000 --- a/v1.13.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64a75354cf81d00f1642169b786fcde3130b98ae886f6380978d18e975660102 -size 15076