Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-testfixtures for
openSUSE:Factory checked in at 2021-12-23 17:53:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-testfixtures (Old)
and /work/SRC/openSUSE:Factory/.python-testfixtures.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-testfixtures"
Thu Dec 23 17:53:26 2021 rev:20 rq:942014 version:6.18.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-testfixtures/python-testfixtures.changes
2021-10-20 20:23:57.725366141 +0200
+++
/work/SRC/openSUSE:Factory/.python-testfixtures.new.2520/python-testfixtures.changes
2021-12-23 17:53:29.199709343 +0100
@@ -1,0 +2,6 @@
+Tue Dec 21 18:13:58 UTC 2021 - Ben Greiner <[email protected]>
+
+- Add testfixtures-pr167-sybil3.patch
+ * gh#simplistix/testfixtures#167
+
+-------------------------------------------------------------------
New:
----
testfixtures-pr167-sybil3.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-testfixtures.spec ++++++
--- /var/tmp/diff_new_pack.zbkgM3/_old 2021-12-23 17:53:29.659709628 +0100
+++ /var/tmp/diff_new_pack.zbkgM3/_new 2021-12-23 17:53:29.663709630 +0100
@@ -25,6 +25,8 @@
License: MIT
URL: https://github.com/Simplistix/testfixtures
Source:
https://files.pythonhosted.org/packages/source/t/testfixtures/testfixtures-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM testfixtures-pr167-sybil3.patch --
gh#simplistix/testfixtures#167
+Patch0: testfixtures-pr167-sybil3.patch
BuildRequires: %{python_module Django}
BuildRequires: %{python_module Twisted}
BuildRequires: %{python_module pytest >= 3.6}
++++++ testfixtures-pr167-sybil3.patch ++++++
Index: testfixtures-6.18.3/docs/conftest.py
===================================================================
--- testfixtures-6.18.3.orig/docs/conftest.py
+++ testfixtures-6.18.3/docs/conftest.py
@@ -1,8 +1,16 @@
from doctest import REPORT_NDIFF, ELLIPSIS
from sybil import Sybil
-from sybil.parsers.doctest import DocTestParser, FIX_BYTE_UNICODE_REPR
-from sybil.parsers.codeblock import CodeBlockParser
+from sybil.parsers.doctest import DocTestParser
+try:
+ from sybil.parsers.doctest import FIX_BYTE_UNICODE_REPR
+except ImportError:
+ # sybil 3 removed the optionflag
+ FIX_BYTE_UNICODE_REPR = 0
+try:
+ from sybil.parsers.codeblock import PythonCodeBlockParser
+except ImportError:
+ from sybil.parsers.codeblock import CodeBlockParser as
PythonCodeBlockParser
from sybil.parsers.capture import parse_captures
from testfixtures.compat import PY3
@@ -13,7 +21,7 @@ if PY3:
pytest_collect_file = Sybil(
parsers=[
DocTestParser(optionflags=REPORT_NDIFF|ELLIPSIS|FIX_BYTE_UNICODE_REPR),
- CodeBlockParser(['print_function']),
+ PythonCodeBlockParser(['print_function']),
parse_captures,
FileParser('tempdir'),
],
Index: testfixtures-6.18.3/docs/django.txt
===================================================================
--- testfixtures-6.18.3.orig/docs/django.txt
+++ testfixtures-6.18.3/docs/django.txt
@@ -23,7 +23,7 @@ Traceback (most recent call last):
AssertionError: SampleModel not as expected:
<BLANKLINE>
same:
-[u'id']
+['id']
<BLANKLINE>
values differ:
'value': 1 != 2
@@ -38,7 +38,7 @@ Traceback (most recent call last):
AssertionError: SampleModel not as expected:
<BLANKLINE>
same:
-[u'id']
+['id']
<BLANKLINE>
values differ:
'value': 1 != 2
@@ -70,7 +70,7 @@ Traceback (most recent call last):
AssertionError: SampleModel not as expected:
<BLANKLINE>
same:
-['created', u'id', 'value']
+['created', 'id', 'value']
<BLANKLINE>
values differ:
'not_editable': 1 != 2
Index: testfixtures-6.18.3/testfixtures/tests/conftest.py
===================================================================
--- testfixtures-6.18.3.orig/testfixtures/tests/conftest.py
+++ testfixtures-6.18.3/testfixtures/tests/conftest.py
@@ -1,6 +1,10 @@
from sybil import Sybil
from sybil.parsers.doctest import DocTestParser
-from sybil.parsers.codeblock import CodeBlockParser
+try:
+ from sybil.parsers.codeblock import PythonCodeBlockParser
+except ImportError:
+ # sybil < 3 has it under the old name
+ from sybil.parsers.codeblock import CodeBlockParser as
PythonCodeBlockParser
from sybil.parsers.capture import parse_captures
from testfixtures import TempDirectory
@@ -18,7 +22,7 @@ def sybil_teardown(namespace):
pytest_collect_file = Sybil(
parsers=[
DocTestParser(),
- CodeBlockParser(),
+ PythonCodeBlockParser(),
parse_captures,
FileParser('tempdir'),
],
