Hello community,
here is the log from the commit of package python-pytest-doctestplus for
openSUSE:Factory checked in at 2020-08-28 23:45:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-doctestplus (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-doctestplus.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-doctestplus"
Fri Aug 28 23:45:17 2020 rev:9 rq:829699 version:0.8.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-pytest-doctestplus/python-pytest-doctestplus.changes
2020-06-10 00:49:52.731174574 +0200
+++
/work/SRC/openSUSE:Factory/.python-pytest-doctestplus.new.3399/python-pytest-doctestplus.changes
2020-08-28 23:45:19.935488177 +0200
@@ -1,0 +2,6 @@
+Tue Aug 25 13:53:35 UTC 2020 - Marketa Calabkova <[email protected]>
+
+- Update to 0.8.0
+ * Compatibility with ``pytest`` 6.0.0. [#120]
+
+-------------------------------------------------------------------
Old:
----
pytest-doctestplus-0.7.0.tar.gz
New:
----
pytest-doctestplus-0.8.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-doctestplus.spec ++++++
--- /var/tmp/diff_new_pack.L8liZr/_old 2020-08-28 23:45:21.995486857 +0200
+++ /var/tmp/diff_new_pack.L8liZr/_new 2020-08-28 23:45:21.999486854 +0200
@@ -27,7 +27,7 @@
%define skip_python2 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-pytest-doctestplus%{psuffix}
-Version: 0.7.0
+Version: 0.8.0
Release: 0
Summary: Pytest plugin with advanced doctest features
License: BSD-3-Clause
@@ -69,6 +69,7 @@
%if %{with test}
%check
export LANG=en_US.UTF8
+export PY_IGNORE_IMPORTMISMATCH=1
# README.rst contains Python 3 only imports
%pytest --doctest-plus --doctest-rst -k 'not README.rst'
%endif
++++++ pytest-doctestplus-0.7.0.tar.gz -> pytest-doctestplus-0.8.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-doctestplus-0.7.0/CHANGES.rst
new/pytest-doctestplus-0.8.0/CHANGES.rst
--- old/pytest-doctestplus-0.7.0/CHANGES.rst 2020-05-20 16:57:53.000000000
+0200
+++ new/pytest-doctestplus-0.8.0/CHANGES.rst 2020-07-31 22:55:19.000000000
+0200
@@ -1,3 +1,8 @@
+0.8.0 (2020-07-31)
+==================
+
+- Compatibility with ``pytest`` 6.0.0. [#120]
+
0.7.0 (2020-05-20)
==================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-doctestplus-0.7.0/PKG-INFO
new/pytest-doctestplus-0.8.0/PKG-INFO
--- old/pytest-doctestplus-0.7.0/PKG-INFO 2020-05-20 16:58:54.000000000
+0200
+++ new/pytest-doctestplus-0.8.0/PKG-INFO 2020-07-31 23:04:35.411392200
+0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.2
+Metadata-Version: 2.1
Name: pytest-doctestplus
-Version: 0.7.0
+Version: 0.8.0
Summary: Pytest plugin with advanced doctest features.
Home-page: https://astropy.org
Author: The Astropy Developers
@@ -301,3 +301,4 @@
Classifier: Topic :: Software Development :: Testing
Classifier: Topic :: Utilities
Requires-Python: >=3.6
+Description-Content-Type: text/x-rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pytest-doctestplus-0.7.0/pytest_doctestplus/__init__.py
new/pytest-doctestplus-0.8.0/pytest_doctestplus/__init__.py
--- old/pytest-doctestplus-0.7.0/pytest_doctestplus/__init__.py 2020-05-20
16:57:20.000000000 +0200
+++ new/pytest-doctestplus-0.8.0/pytest_doctestplus/__init__.py 2020-07-31
22:55:19.000000000 +0200
@@ -3,4 +3,4 @@
This package contains pytest plugins that are used by the astropy test suite.
"""
-__version__ = '0.7.0'
+__version__ = '0.8.0.dev0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pytest-doctestplus-0.7.0/pytest_doctestplus/plugin.py
new/pytest-doctestplus-0.8.0/pytest_doctestplus/plugin.py
--- old/pytest-doctestplus-0.7.0/pytest_doctestplus/plugin.py 2020-05-20
16:56:16.000000000 +0200
+++ new/pytest-doctestplus-0.8.0/pytest_doctestplus/plugin.py 2020-07-31
22:55:19.000000000 +0200
@@ -10,6 +10,8 @@
import sys
import warnings
+from packaging.version import Version
+
import pytest
from pytest_doctestplus.utils import ModuleChecker
@@ -21,6 +23,8 @@
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 @@
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()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-doctestplus-0.7.0/pytest_doctestplus/utils.py
new/pytest-doctestplus-0.8.0/pytest_doctestplus/utils.py
--- old/pytest-doctestplus-0.7.0/pytest_doctestplus/utils.py 2020-05-20
16:56:16.000000000 +0200
+++ new/pytest-doctestplus-0.8.0/pytest_doctestplus/utils.py 2020-07-31
22:55:19.000000000 +0200
@@ -1,31 +1,30 @@
+import importlib.util
+import json
import logging
import operator
import re
import subprocess
import sys
-from distutils.version import LooseVersion
+from packaging.version import Version
+
+import pkg_resources
logger = logging.getLogger(__name__)
class ModuleChecker:
def __init__(self):
- if LooseVersion(sys.version) < LooseVersion('3.4'):
- import imp
- self._find_module = imp.find_module
- self._find_distribution = self._check_distribution
- self.packages = self.get_packages()
- else:
- import importlib.util
- import pkg_resources
- self._find_module = importlib.util.find_spec
- self._find_distribution = pkg_resources.require
- self.packages = {}
+ self._find_module = importlib.util.find_spec
+ self._find_distribution = pkg_resources.require
+ self.packages = {}
def get_packages(self):
- packages = subprocess.check_output([sys.executable, '-m', 'pip',
'freeze']).decode().splitlines()
- packages = [package.split('==') for package in packages if '==' in
package]
- return {name.lower(): version for name, version in packages}
+ packages = subprocess.check_output(
+ [sys.executable, '-m', 'pip', 'list', '--format', 'json']
+ ).decode()
+ packages = {item['name'].lower(): item['version']
+ for item in json.loads(packages)}
+ return packages
def compare_versions(self, v1, v2, op):
op_map = {
@@ -38,7 +37,7 @@
if op not in op_map:
return False
op = op_map[op]
- return op(LooseVersion(v1), LooseVersion(v2))
+ return op(Version(v1), Version(v2))
def _check_distribution(self, module):
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pytest-doctestplus-0.7.0/pytest_doctestplus.egg-info/PKG-INFO
new/pytest-doctestplus-0.8.0/pytest_doctestplus.egg-info/PKG-INFO
--- old/pytest-doctestplus-0.7.0/pytest_doctestplus.egg-info/PKG-INFO
2020-05-20 16:58:54.000000000 +0200
+++ new/pytest-doctestplus-0.8.0/pytest_doctestplus.egg-info/PKG-INFO
2020-07-31 23:04:35.000000000 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.2
+Metadata-Version: 2.1
Name: pytest-doctestplus
-Version: 0.7.0
+Version: 0.8.0
Summary: Pytest plugin with advanced doctest features.
Home-page: https://astropy.org
Author: The Astropy Developers
@@ -301,3 +301,4 @@
Classifier: Topic :: Software Development :: Testing
Classifier: Topic :: Utilities
Requires-Python: >=3.6
+Description-Content-Type: text/x-rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-doctestplus-0.7.0/setup.py
new/pytest-doctestplus-0.8.0/setup.py
--- old/pytest-doctestplus-0.7.0/setup.py 2020-05-20 16:57:37.000000000
+0200
+++ new/pytest-doctestplus-0.8.0/setup.py 2020-07-31 23:01:05.000000000
+0200
@@ -12,10 +12,11 @@
setup(
name='pytest-doctestplus',
- version='0.7.0',
+ version='0.8.0',
license='BSD',
description='Pytest plugin with advanced doctest features.',
long_description=readme(),
+ long_description_content_type='text/x-rst',
author='The Astropy Developers',
author_email='[email protected]',
url='https://astropy.org',
