Your message dated Fri, 11 Dec 2020 10:03:52 +0000
with message-id <e1knfhe-0003ae...@fasolo.debian.org>
and subject line Bug#977110: fixed in pytest-doctestplus 0.7.0-2
has caused the Debian Bug report #977110,
regarding Compatibility with pytest 6.0.0
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
977110: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=977110
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: pytest-doctestplus
Version: 0.7.0-1
Severity: important
User: pyt...@packages.debian.org
Usertags: pytest-v6
Tags: patch

Hi,

It would be appreciated if you could include the attached patch in the
next release. It enables forward compatibility with pytest 6.0.0,
currently in experimental.

This would fix a FTBFS with ~15 packages build-depending on
python3-pytest-doctestplus.

Thanks!
Christian
From: Christian Kastner <c...@kvr.at>
Date: Fri, 11 Dec 2020 00:03:07 +0100
Subject: Compatibility with pytest 6.0.0

This enables forward compatibility with pytest 6.0.0.

Bug: https://github.com/astropy/pytest-doctestplus/issues/118
Origin: https://github.com/astropy/pytest-doctestplus/pull/120/commits/1a661006d8d01986830a7baf3812cfce63ec2705
---
 pytest_doctestplus/plugin.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pytest_doctestplus/plugin.py b/pytest_doctestplus/plugin.py
index e6556a2..10109b0 100644
--- a/pytest_doctestplus/plugin.py
+++ b/pytest_doctestplus/plugin.py
@@ -10,6 +10,8 @@ import re
 import sys
 import warnings
 
+from packaging.version import Version
+
 import pytest
 
 from pytest_doctestplus.utils import ModuleChecker
@@ -21,6 +23,8 @@ except ImportError:  # PY2
     def indent(text, prefix):
         return '\n'.join([prefix + line for line in text.splitlines()])
 
+PYTEST_GT_5 = Version(pytest.__version__) > Version('5.9.9')
+
 comment_characters = {
     '.txt': '#',
     '.tex': '%',
@@ -169,7 +173,12 @@ def pytest_configure(config):
             if self.fspath.basename == "setup.py":
                 return
             elif self.fspath.basename == "conftest.py":
-                module = self.config.pluginmanager._importconftest(self.fspath)
+                if PYTEST_GT_5:
+                    module = self.config.pluginmanager._importconftest(
+                        self.fspath, self.config.getoption("importmode"))
+                else:
+                    module = self.config.pluginmanager._importconftest(
+                        self.fspath)
             else:
                 try:
                     module = self.fspath.pyimport()
-- 
2.29.2


--- End Message ---
--- Begin Message ---
Source: pytest-doctestplus
Source-Version: 0.7.0-2
Done: Ole Streicher <oleb...@debian.org>

We believe that the bug you reported is fixed in the latest version of
pytest-doctestplus, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 977...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Ole Streicher <oleb...@debian.org> (supplier of updated pytest-doctestplus 
package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Fri, 11 Dec 2020 10:35:14 +0100
Source: pytest-doctestplus
Architecture: source
Version: 0.7.0-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Python Team <team+pyt...@tracker.debian.org>
Changed-By: Ole Streicher <oleb...@debian.org>
Closes: 977110
Changes:
 pytest-doctestplus (0.7.0-2) unstable; urgency=medium
 .
   [ Ondřej Nový ]
   * d/control: Update Maintainer field with new Debian Python Team
     contact address.
   * d/control: Update Vcs-* fields with new Debian Python Team Salsa
     layout.
 .
   [ Debian Janitor ]
   * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
     Repository-Browse.
 .
   [ Ole Streicher ]
   * Compatibility with pytest 6.0.0 (Closes: #977110)
   * Add "Rules-Requires-Root: no" to d/control
Checksums-Sha1:
 32c32054b7161522fb6afa812809ab3461e6c8f1 2198 pytest-doctestplus_0.7.0-2.dsc
 fa97b47d55f45d82770f7cf4f99edf90592e7d7c 3524 
pytest-doctestplus_0.7.0-2.debian.tar.xz
Checksums-Sha256:
 280a2d225d230e8b051219aa64183945c1baa27cf720eea248a75103a3b1b8de 2198 
pytest-doctestplus_0.7.0-2.dsc
 a85b9a2c95dc39d42edff4f0952712dac337ef8fd98d2971c648c45483f98001 3524 
pytest-doctestplus_0.7.0-2.debian.tar.xz
Files:
 50148ba810e4c133b102a81e3f133730 2198 python optional 
pytest-doctestplus_0.7.0-2.dsc
 25207110fbafba16f1e4ebd6397d6aeb 3524 python optional 
pytest-doctestplus_0.7.0-2.debian.tar.xz

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEuvxshffLFD/utvsVcRWv0HcQ3PcFAl/TQFMACgkQcRWv0HcQ
3PcykA/+JIGZtJqYT389FyB1lD0Xd+7Z+DJf+rKUhWM0JceVDLwkmguETOuboh3W
zIhOE53HsORKnsxViJWVhwgi/JELEOIAtEdnc4QcPodqbTbz3uHQ82dggSEImDDt
2uE3d1tHbw8wPzpMXHJl9LK8a1NmA4Fz87hlw+NbtQXnUNZscEKj5v8pn9RdFZ2C
vMZkW0D4elazoBlROBFvkBMEe995+jFP3dV2giMeT/FihvR0NrVGtXLKVUHA3RUB
iUy9KtREu1FLYBXL6KL1m+jcyRAiYHuxfWxUvvWG6f/lH92hcMAaG71EJ7Gvom/+
TXt2urcWk7OB9H4Cpk8j79Xu5bVCvjsfxtCEJbeDlEjHWd0DtDDEub6S+/SpyPkj
E9vISx7DYrR7Zr63AVEoGr8OhAQJ8GFI74/tqAbUUeh2HkHEYzGMGnNtTwBKa45K
ExOaTHbPtF2uEP+QDZGaqiass5MatSXBHMJw7aXzYtb1g9YHknLQPLzYjHz2Zipt
fPnQuDjjMTkHtzMACm7xw/xRdfb3SWF+SWFgdNdPg7gRjWBnDQ1Oy+iULQ2u2MZX
Rq5zDzfpBPznrhtXXLJO+OkHveSLfRjTjhSNLf6goehkkYOuaS8rnM5u9H1C35Sw
1il/pCRdhwrV4DwNEQOU4W96O//koBqqvwt+5zpjgsUJE7Wm1PE=
=8yFq
-----END PGP SIGNATURE-----

--- End Message ---
_______________________________________________
Python-modules-team mailing list
Python-modules-team@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/python-modules-team

Reply via email to