forked from pool/python-pytest-doctestplus
- Update to 0.4.0:
* Avoid SyntaxWarning regarding invalid escape sequence in Python 3.9. [#62] * Compatibility with pytest 5.1 to avoid AttributeError caused by FixtureRequest. [#63] - Drop merged patch: * merged_pr_63.patch - Rebase patch: * pr_37.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-doctestplus?expand=0&rev=11
This commit is contained in:
parent
86f329e46b
commit
a7ab4bc288
@ -1,22 +0,0 @@
|
||||
From 0a7176531d8395a381bf76ce8ae2e59eef1a60ea Mon Sep 17 00:00:00 2001
|
||||
From: Pey Lian Lim <2090236+pllim@users.noreply.github.com>
|
||||
Date: Fri, 16 Aug 2019 14:55:38 -0400
|
||||
Subject: [PATCH] Compatibility with pytest 5.1
|
||||
|
||||
---
|
||||
pytest_doctestplus/plugin.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pytest_doctestplus/plugin.py b/pytest_doctestplus/plugin.py
|
||||
index 8a830f9..20114b8 100644
|
||||
--- a/pytest_doctestplus/plugin.py
|
||||
+++ b/pytest_doctestplus/plugin.py
|
||||
@@ -160,7 +160,7 @@ def runtest(self):
|
||||
failed, tot = doctest.testfile(
|
||||
str(self.fspath), module_relative=False,
|
||||
optionflags=options, parser=DocTestParserPlus(),
|
||||
- extraglobs=dict(getfixture=fixture_request.getfuncargvalue),
|
||||
+ extraglobs=dict(getfixture=fixture_request.getfixturevalue),
|
||||
raise_on_error=True, verbose=False, encoding='utf-8')
|
||||
|
||||
def reportinfo(self):
|
28
pr_37.patch
28
pr_37.patch
@ -4,11 +4,11 @@ Date: Thu Jan 3 17:15:04 2019 +0000
|
||||
|
||||
Inline np.allclose to remove dependency on numpy
|
||||
|
||||
diff --git a/pytest_doctestplus/output_checker.py b/pytest_doctestplus/output_checker.py
|
||||
index e77e2ec..b889b1c 100644
|
||||
--- a/pytest_doctestplus/output_checker.py
|
||||
+++ b/pytest_doctestplus/output_checker.py
|
||||
@@ -6,8 +6,7 @@ normalizations of Python expression output. See the docstring on
|
||||
Index: pytest-doctestplus-0.4.0/pytest_doctestplus/output_checker.py
|
||||
===================================================================
|
||||
--- pytest-doctestplus-0.4.0.orig/pytest_doctestplus/output_checker.py
|
||||
+++ pytest-doctestplus-0.4.0/pytest_doctestplus/output_checker.py
|
||||
@@ -6,8 +6,7 @@ normalizations of Python expression outp
|
||||
|
||||
import doctest
|
||||
import re
|
||||
@ -18,7 +18,7 @@ index e77e2ec..b889b1c 100644
|
||||
|
||||
import six
|
||||
from six.moves import zip
|
||||
@@ -125,8 +124,10 @@ class OutputChecker(doctest.OutputChecker):
|
||||
@@ -125,8 +124,10 @@ class OutputChecker(doctest.OutputChecke
|
||||
else:
|
||||
nw_.append(nw)
|
||||
|
||||
@ -31,16 +31,16 @@ index e77e2ec..b889b1c 100644
|
||||
return False
|
||||
|
||||
# replace all floats in the "got" string by those from "wanted".
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 6513c57..463f382 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -48,7 +48,7 @@ setup(
|
||||
Index: pytest-doctestplus-0.4.0/setup.py
|
||||
===================================================================
|
||||
--- pytest-doctestplus-0.4.0.orig/setup.py
|
||||
+++ pytest-doctestplus-0.4.0/setup.py
|
||||
@@ -40,7 +40,7 @@ setup(
|
||||
'Topic :: Utilities',
|
||||
],
|
||||
keywords=[ 'doctest', 'rst', 'pytest', 'py.test' ],
|
||||
- install_requires=[ 'six', 'pytest>=3.0', 'numpy>=1.10' ],
|
||||
+ install_requires=[ 'six', 'pytest>=3.0'],
|
||||
keywords=['doctest', 'rst', 'pytest', 'py.test'],
|
||||
- install_requires=['six', 'pytest>=3.0', 'numpy>=1.10'],
|
||||
+ install_requires=['six', 'pytest>=3.0'],
|
||||
python_requires='>=2.7',
|
||||
entry_points={
|
||||
'pytest11': [
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4e641bc720661c08ec3afe44a7951660cdff5e187259c433aa66e9ec2d5ccea1
|
||||
size 19620
|
3
pytest-doctestplus-0.4.0.tar.gz
Normal file
3
pytest-doctestplus-0.4.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8872b9c236924af20c39c2813d7f1bde50a1edca7c4aba5a8bfbae3a32360e87
|
||||
size 19783
|
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 20 09:47:57 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
- Update to 0.4.0:
|
||||
* Avoid SyntaxWarning regarding invalid escape sequence in Python 3.9. [#62]
|
||||
* Compatibility with pytest 5.1 to avoid AttributeError caused by FixtureRequest. [#63]
|
||||
- Drop merged patch:
|
||||
* merged_pr_63.patch
|
||||
- Rebase patch:
|
||||
* pr_37.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 6 16:53:49 UTC 2019 - John Vandenberg <jayvdb@gmail.com>
|
||||
|
||||
|
@ -26,7 +26,7 @@
|
||||
%endif
|
||||
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
||||
Name: python-pytest-doctestplus%{psuffix}
|
||||
Version: 0.3.0
|
||||
Version: 0.4.0
|
||||
Release: 0
|
||||
Summary: Pytest plugin with advanced doctest features
|
||||
License: BSD-3-Clause
|
||||
@ -35,7 +35,6 @@ URL: https://github.com/astropy/pytest-doctestplus
|
||||
Source: https://files.pythonhosted.org/packages/source/p/pytest-doctestplus/pytest-doctestplus-%{version}.tar.gz
|
||||
# Backport of https://github.com/astropy/pytest-doctestplus/pull/37
|
||||
Patch0: pr_37.patch
|
||||
Patch1: https://github.com/astropy/pytest-doctestplus/commit/0a7176531d8395a381bf76ce8ae2e59eef1a60ea.patch#/merged_pr_63.patch
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python-rpm-macros
|
||||
@ -56,7 +55,7 @@ advanced doctest support and enables the testing of reStructuredText
|
||||
|
||||
%prep
|
||||
%setup -q -n pytest-doctestplus-%{version}
|
||||
%autopatch -p1
|
||||
%patch0 -p1
|
||||
# do not change the pytest behaviour for us
|
||||
rm -f setup.cfg
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user