Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-sybil for openSUSE:Factory
checked in at 2023-07-27 16:50:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-sybil (Old)
and /work/SRC/openSUSE:Factory/.python-sybil.new.32662 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-sybil"
Thu Jul 27 16:50:37 2023 rev:16 rq:1100743 version:3.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-sybil/python-sybil.changes
2023-06-14 16:29:03.742366057 +0200
+++ /work/SRC/openSUSE:Factory/.python-sybil.new.32662/python-sybil.changes
2023-07-27 16:51:01.357886857 +0200
@@ -1,0 +2,10 @@
+Tue Jul 25 12:42:51 UTC 2023 - Markéta Machová <mmach...@suse.com>
+
+- Update to 3.0.1
+ * Continue with the ever shifting sands of pytest APIs, this time
+ appeasing warnings from pytest 7 that when fixed break compatibility
+ with pytest 6.
+- Drop python-sybil-fix-ordering.diff
+- Add pytest74.patch to support pytest 7.4
+
+-------------------------------------------------------------------
Old:
----
python-sybil-fix-ordering.diff
sybil-3.0.0.tar.gz
New:
----
pytest74.patch
sybil-3.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-sybil.spec ++++++
--- /var/tmp/diff_new_pack.tsEDom/_old 2023-07-27 16:51:01.973890338 +0200
+++ /var/tmp/diff_new_pack.tsEDom/_new 2023-07-27 16:51:01.977890361 +0200
@@ -18,13 +18,14 @@
%{?sle15_python_module_pythons}
Name: python-sybil
-Version: 3.0.0
+Version: 3.0.1
Release: 0
Summary: Automated testing of examples in documentation
License: MIT
URL: https://github.com/cjw296/sybil
Source:
https://files.pythonhosted.org/packages/source/s/sybil/sybil-%{version}.tar.gz
-Patch0: python-sybil-fix-ordering.diff
+#PATCH-FIX-UPSTREAM
https://github.com/simplistix/sybil/commit/df0d221c1d9da1454a5ef7fd72675d8d43b96eb0
Deal with more pytest internals changing
+Patch: pytest74.patch
BuildRequires: %{python_module pip}
BuildRequires: %{python_module pytest >= 6.2}
BuildRequires: %{python_module setuptools-git}
++++++ pytest74.patch ++++++
>From df0d221c1d9da1454a5ef7fd72675d8d43b96eb0 Mon Sep 17 00:00:00 2001
From: Chris Withers <ch...@simplistix.co.uk>
Date: Tue, 4 Jul 2023 18:54:22 +0100
Subject: [PATCH] Deal with more pytest internals changing
---
.circleci/config.yml | 3 ++-
sybil/integration/pytest.py | 22 +++++++++++++++++-----
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/sybil/integration/pytest.py b/sybil/integration/pytest.py
index b32062d..8529771 100644
--- a/sybil/integration/pytest.py
+++ b/sybil/integration/pytest.py
@@ -78,11 +78,23 @@ def setup(self):
def runtest(self):
self.example.evaluate()
- def _prunetraceback(self, excinfo):
- tb = excinfo.traceback.cut(path=example_module_path)
- tb = tb[1]
- if getattr(tb, '_rawentry', None) is not None:
- excinfo.traceback = Traceback(tb._rawentry, excinfo)
+ if PYTEST_VERSION >= (7, 4, 0):
+
+ def _traceback_filter(self, excinfo: ExceptionInfo[BaseException]) ->
Traceback:
+ traceback = excinfo.traceback
+ tb = traceback.cut(path=example_module_path)
+ tb = tb[1]
+ if getattr(tb, '_rawentry', None) is not None:
+ traceback = Traceback(tb._rawentry)
+ return traceback
+
+ else:
+
+ def _prunetraceback(self, excinfo):
+ tb = excinfo.traceback.cut(path=example_module_path)
+ tb = tb[1]
+ if getattr(tb, '_rawentry', None) is not None:
+ excinfo.traceback = Traceback(tb._rawentry, excinfo)
def repr_failure(
self,
++++++ sybil-3.0.0.tar.gz -> sybil-3.0.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sybil-3.0.0/.circleci/config.yml
new/sybil-3.0.1/.circleci/config.yml
--- old/sybil-3.0.0/.circleci/config.yml 2021-10-26 20:57:21.000000000
+0200
+++ new/sybil-3.0.1/.circleci/config.yml 2022-02-25 10:44:37.000000000
+0100
@@ -13,6 +13,12 @@
- cimg/python:3.6
- cimg/python:3.9
- cimg/python:3.10
+ extra_packages:
+ - "'pytest>=6.2,<7'"
+ - "'pytest>=7'"
+ exclude:
+ - {"image": "cimg/python:3.6", "extra_packages": "'pytest>=7'"}
+ - {"image": "cimg/python:3.9", "extra_packages":
"'pytest>=6.2,<7'"}
- python/coverage:
name: coverage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sybil-3.0.0/PKG-INFO new/sybil-3.0.1/PKG-INFO
--- old/sybil-3.0.0/PKG-INFO 2021-10-26 20:57:31.857726000 +0200
+++ new/sybil-3.0.1/PKG-INFO 2022-02-25 10:44:47.717322300 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: sybil
-Version: 3.0.0
+Version: 3.0.1
Summary: Automated testing for the examples in your code and documentation.
Home-page: https://github.com/simplistix/sybil
Author: Chris Withers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sybil-3.0.0/docs/changes.rst
new/sybil-3.0.1/docs/changes.rst
--- old/sybil-3.0.0/docs/changes.rst 2021-10-26 20:57:21.000000000 +0200
+++ new/sybil-3.0.1/docs/changes.rst 2022-02-25 10:44:37.000000000 +0100
@@ -1,6 +1,12 @@
Changes
=======
+3.0.1 (25 Feb 2022)
+-------------------
+
+- Continue with the ever shifting sands of pytest APIs, this time appeasing
+ warnings from pytest 7 that when fixed break compatibility with pytest 6.
+
3.0.0 (26 Oct 2021)
-------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sybil-3.0.0/setup.py new/sybil-3.0.1/setup.py
--- old/sybil-3.0.0/setup.py 2021-10-26 20:57:21.000000000 +0200
+++ new/sybil-3.0.1/setup.py 2022-02-25 10:44:37.000000000 +0100
@@ -9,7 +9,7 @@
setup(
name='sybil',
- version='3.0.0',
+ version='3.0.1',
author='Chris Withers',
author_email='ch...@withers.org',
license='MIT',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sybil-3.0.0/sybil/integration/pytest.py
new/sybil-3.0.1/sybil/integration/pytest.py
--- old/sybil-3.0.0/sybil/integration/pytest.py 2021-10-26 20:57:21.000000000
+0200
+++ new/sybil-3.0.1/sybil/integration/pytest.py 2022-02-25 10:44:37.000000000
+0100
@@ -20,6 +20,7 @@
if TYPE_CHECKING:
from ..sybil import Sybil
+PYTEST_VERSION = tuple(int(i) for i in pytest.__version__.split('.'))
example_module_path = abspath(getsourcefile(example))
@@ -95,8 +96,8 @@
class SybilFile(pytest.File):
- def __init__(self, fspath, parent, sybil: 'Sybil'):
- super(SybilFile, self).__init__(fspath, parent)
+ def __init__(self, *, sybil: 'Sybil', **kwargs):
+ super(SybilFile, self).__init__(**kwargs)
self.sybil: 'Sybil' = sybil
def collect(self):
@@ -116,7 +117,13 @@
def pytest_integration(sybil: 'Sybil'):
def pytest_collect_file(path: py.path.local, parent: Collector):
- if sybil.should_parse(Path(path.strpath)):
- return SybilFile.from_parent(parent, fspath=path, sybil=sybil)
+ fspath = path
+ path = Path(fspath.strpath)
+ if sybil.should_parse(path):
+ if PYTEST_VERSION[0] >= 7:
+ return SybilFile.from_parent(parent, path=path, sybil=sybil)
+ else:
+ return SybilFile.from_parent(parent, fspath=fspath,
sybil=sybil)
+
return pytest_collect_file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sybil-3.0.0/sybil/integration/unittest.py
new/sybil-3.0.1/sybil/integration/unittest.py
--- old/sybil-3.0.0/sybil/integration/unittest.py 2021-10-26
20:57:21.000000000 +0200
+++ new/sybil-3.0.1/sybil/integration/unittest.py 2022-02-25
10:44:37.000000000 +0100
@@ -38,7 +38,7 @@
def load_tests(loader=None, tests=None, pattern=None):
suite = TestSuite()
- for path in sybil.path.glob('**/*'):
+ for path in sorted(sybil.path.glob('**/*')):
if path.is_file() and sybil.should_parse(path):
document = sybil.parse(path)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sybil-3.0.0/sybil.egg-info/PKG-INFO
new/sybil-3.0.1/sybil.egg-info/PKG-INFO
--- old/sybil-3.0.0/sybil.egg-info/PKG-INFO 2021-10-26 20:57:31.000000000
+0200
+++ new/sybil-3.0.1/sybil.egg-info/PKG-INFO 2022-02-25 10:44:47.000000000
+0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: sybil
-Version: 3.0.0
+Version: 3.0.1
Summary: Automated testing for the examples in your code and documentation.
Home-page: https://github.com/simplistix/sybil
Author: Chris Withers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sybil-3.0.0/tests/test_sybil.py
new/sybil-3.0.1/tests/test_sybil.py
--- old/sybil-3.0.0/tests/test_sybil.py 2021-10-26 20:57:21.000000000 +0200
+++ new/sybil-3.0.1/tests/test_sybil.py 2022-02-25 10:44:37.000000000 +0100
@@ -243,7 +243,7 @@
def test_namespace(capsys):
sybil = Sybil([parse], path='./samples')
- documents = [sybil.parse(p) for p in sybil.path.glob('sample*.txt')]
+ documents = [sybil.parse(p) for p in
sorted(sybil.path.glob('sample*.txt'))]
actual = []
for document in documents:
for example in document:
