Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pytest-json-report for
openSUSE:Factory checked in at 2021-05-13 22:18:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-json-report (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-json-report.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-json-report"
Thu May 13 22:18:34 2021 rev:2 rq:892571 version:1.2.4
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-pytest-json-report/python-pytest-json-report.changes
2021-04-29 01:39:23.934663347 +0200
+++
/work/SRC/openSUSE:Factory/.python-pytest-json-report.new.2988/python-pytest-json-report.changes
2021-05-13 22:18:40.647559652 +0200
@@ -1,0 +2,6 @@
+Tue May 11 16:02:14 UTC 2021 - Sean Marlow <[email protected]>
+
+- Add version_compatibility.patch to enable package with older
+ versions of pytest and flaky.
+
+-------------------------------------------------------------------
New:
----
version_compatibility.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-json-report.spec ++++++
--- /var/tmp/diff_new_pack.2AJAQc/_old 2021-05-13 22:18:41.171557830 +0200
+++ /var/tmp/diff_new_pack.2AJAQc/_new 2021-05-13 22:18:41.175557815 +0200
@@ -25,13 +25,14 @@
License: MIT
URL: https://github.com/numirias/pytest-json-report
Source:
https://files.pythonhosted.org/packages/source/p/pytest-json-report/pytest-json-report-%{version}.tar.gz
-BuildRequires: python-rpm-macros
+Patch1: version_compatibility.patch
BuildRequires: %{python_module setuptools}
+BuildRequires: python-rpm-macros
# SECTION test requirements
BuildRequires: %{python_module pytest}
-BuildRequires: %{python_module pytest-xdist}
-BuildRequires: %{python_module pytest-metadata}
BuildRequires: %{python_module flaky}
+BuildRequires: %{python_module pytest-metadata}
+BuildRequires: %{python_module pytest-xdist}
# /SECTION
BuildRequires: fdupes
Requires: python-pytest
@@ -44,6 +45,7 @@
%prep
%setup -q -n pytest-json-report-%{version}
+%patch1 -p1
%build
%python_build
++++++ version_compatibility.patch ++++++
Index: pytest-json-report-1.2.4/setup.py
===================================================================
--- pytest-json-report-1.2.4.orig/setup.py
+++ pytest-json-report-1.2.4/setup.py
@@ -25,7 +25,7 @@ setup(
url='https://github.com/numirias/pytest-json-report',
license='MIT',
install_requires=[
- 'pytest>=4.2.0',
+ 'pytest',
'pytest-metadata',
],
entry_points={
Index: pytest-json-report-1.2.4/tests/test_jsonreport.py
===================================================================
--- pytest-json-report-1.2.4.orig/tests/test_jsonreport.py
+++ pytest-json-report-1.2.4/tests/test_jsonreport.py
@@ -358,7 +358,10 @@ def test_warnings(make_json, num_process
assert set(warnings[0]) == {
'category', 'filename', 'lineno', 'message', 'when'
}
- assert warnings[0]['category'] == 'PytestCollectionWarning'
+ assert warnings[0]['category'] in (
+ 'PytestCollectionWarning',
+ 'PytestWarning'
+ )
assert warnings[0]['filename'].endswith('.py')
assert warnings[0]['lineno'] == 1
assert warnings[0]['when'] == 'collect'
@@ -488,15 +491,15 @@ def test_xdist(make_json, match_reports)
def test_bug_31(make_json):
data = make_json('''
- import pytest
+ from flaky import flaky
FLAKY_RUNS = 0
- @pytest.mark.flaky
+ @flaky
def test_flaky_pass():
assert 1 + 1 == 2
- @pytest.mark.flaky
+ @flaky
def test_flaky_fail():
global FLAKY_RUNS
FLAKY_RUNS += 1
