Hello community,

here is the log from the commit of package python-pytest4 for openSUSE:Factory 
checked in at 2019-11-04 17:05:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest4 (Old)
 and      /work/SRC/openSUSE:Factory/.python-pytest4.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-pytest4"

Mon Nov  4 17:05:31 2019 rev:10 rq:738201 version:4.6.6

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pytest4/python-pytest4.changes    
2019-09-30 15:53:24.610172893 +0200
+++ /work/SRC/openSUSE:Factory/.python-pytest4.new.2990/python-pytest4.changes  
2019-11-04 17:05:32.464205660 +0100
@@ -1,0 +2,17 @@
+Mon Oct 14 08:07:27 UTC 2019 - Ondřej Súkup <[email protected]>
+
+- update to 4.6.6
+- drop importlib-py38.patch and attrs.patch
+ * Fixed using multiple short options together in the command-line
+ * Fix "lexer" being used when uploading to bpaste.net from --pastebin to text
+ * python version checks (detected by flake8-2020) in case python4 becomes 
thing
+ * Fix warnings about deprecated cmp attribute in attrs>=19.2
+ * Replace importlib_metadata backport with importlib.metadata on Py3.8
+
+-------------------------------------------------------------------
+Thu Oct 10 14:27:20 UTC 2019 - Ondřej Súkup <[email protected]>
+
+- add attrs.patch based on gh#5902 Fix warnings with attrs 19.2
+    and fix object assertions
+
+-------------------------------------------------------------------

Old:
----
  importlib-py38.patch
  pytest-4.6.5.tar.gz

New:
----
  pytest-4.6.6.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-pytest4.spec ++++++
--- /var/tmp/diff_new_pack.neVRXP/_old  2019-11-04 17:05:33.480206745 +0100
+++ /var/tmp/diff_new_pack.neVRXP/_new  2019-11-04 17:05:33.480206745 +0100
@@ -26,14 +26,13 @@
 %bcond_with test
 %endif
 Name:           python-pytest4%{psuffix}
-Version:        4.6.5
+Version:        4.6.6
 Release:        0
 Summary:        Python testing tool with autodiscovery and detailed asserts
 License:        MIT
 Group:          Development/Languages/Python
 URL:            https://github.com/pytest-dev/pytest
 Source:         
https://files.pythonhosted.org/packages/source/p/pytest/pytest-%{version}.tar.gz
-Patch0:         importlib-py38.patch
 BuildRequires:  %{python_module setuptools >= 40.0}
 BuildRequires:  %{python_module setuptools_scm}
 BuildRequires:  fdupes
@@ -86,7 +85,6 @@
 
 %prep
 %setup -q -n pytest-%{version}
-%patch0 -p1
 
 %build
 %python_build

++++++ pytest-4.6.5.tar.gz -> pytest-4.6.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/.travis.yml new/pytest-4.6.6/.travis.yml
--- old/pytest-4.6.5/.travis.yml        2019-08-05 20:04:19.000000000 +0200
+++ new/pytest-4.6.6/.travis.yml        2019-10-13 16:54:01.000000000 +0200
@@ -99,8 +99,17 @@
 
     - stage: deploy
       python: '3.6'
-      install: pip install -U setuptools setuptools_scm
+      install: pip install -U setuptools setuptools_scm tox
       script: skip
+      # token to upload github release notes: GH_RELEASE_NOTES_TOKEN
+      env:
+        - secure: 
"OjOeL7/0JUDkV00SsTs732e8vQjHynpbG9FKTNtZZJ+1Zn4Cib+hAlwmlBnvVukML0X60YpcfjnC4quDOIGLPsh5zeXnvJmYtAIIUNQXjWz8NhcGYrhyzuP1rqV22U68RTCdmOq3lMYU/W2acwHP7T49PwJtOiUM5kF120UAQ0Zi5EmkqkIvH8oM5mO9Dlver+/U7Htpz9rhKrHBXQNCMZI6yj2aUyukqB2PN2fjAlDbCF//+FmvYw9NjT4GeFOSkTCf4ER9yfqs7yglRfwiLtOCZ2qKQhWZNsSJDB89rxIRXWavJUjJKeY2EW2/NkomYJDpqJLIF4JeFRw/HhA47CYPeo6BJqyyNV+0CovL1frpWfi9UQw2cMbgFUkUIUk3F6DD59PHNIOX2R/HX56dQsw7WKl3QuHlCOkICXYg8F7Ta684IoKjeTX03/6QNOkURfDBwfGszY0FpbxrjCSWKom6RyZdyidnESaxv9RzjcIRZVh1rp8KMrwS1OrwRSdG0zjlsPr49hWMenN/8fKgcHTV4/r1Tj6mip0dorSRCrgUNIeRBKgmui6FS8642ab5JNKOxMteVPVR2sFuhjOQ0Jy+PmvceYY9ZMWc3+/B/KVh0dZ3hwvLGZep/vxDS2PwCA5/xw31714vT5LxidKo8yECjBynMU/wUTTS695D3NY="
+      addons:
+        apt:
+          packages:
+            # required by publish_gh_release_notes
+            - pandoc
+      after_deploy: tox -e publish_gh_release_notes
       deploy:
         provider: pypi
         user: nicoddemus
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/CHANGELOG.rst 
new/pytest-4.6.6/CHANGELOG.rst
--- old/pytest-4.6.5/CHANGELOG.rst      2019-08-05 20:04:19.000000000 +0200
+++ new/pytest-4.6.6/CHANGELOG.rst      2019-10-13 16:54:01.000000000 +0200
@@ -18,6 +18,32 @@
 
 .. towncrier release notes start
 
+pytest 4.6.6 (2019-10-11)
+=========================
+
+Bug Fixes
+---------
+
+- `#5523 <https://github.com/pytest-dev/pytest/issues/5523>`_: Fixed using 
multiple short options together in the command-line (for example ``-vs``) in 
Python 3.8+.
+
+
+- `#5537 <https://github.com/pytest-dev/pytest/issues/5537>`_: Replace 
``importlib_metadata`` backport with ``importlib.metadata`` from the
+  standard library on Python 3.8+.
+
+
+- `#5806 <https://github.com/pytest-dev/pytest/issues/5806>`_: Fix "lexer" 
being used when uploading to bpaste.net from ``--pastebin`` to "text".
+
+
+- `#5902 <https://github.com/pytest-dev/pytest/issues/5902>`_: Fix warnings 
about deprecated ``cmp`` attribute in ``attrs>=19.2``.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#5801 <https://github.com/pytest-dev/pytest/issues/5801>`_: Fixes python 
version checks (detected by ``flake8-2020``) in case python4 becomes a thing.
+
+
 pytest 4.6.5 (2019-08-05)
 =========================
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/PKG-INFO new/pytest-4.6.6/PKG-INFO
--- old/pytest-4.6.5/PKG-INFO   2019-08-05 20:04:36.000000000 +0200
+++ new/pytest-4.6.6/PKG-INFO   2019-10-13 16:54:20.000000000 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest
-Version: 4.6.5
+Version: 4.6.6
 Summary: pytest: simple powerful testing with Python
 Home-page: https://docs.pytest.org/en/latest/
 Author: Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, 
Brianna Laugher, Florian Bruhin and others
@@ -168,5 +168,5 @@
 Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
-Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
+Requires-Python: !=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7
 Provides-Extra: testing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/azure-pipelines.yml 
new/pytest-4.6.6/azure-pipelines.yml
--- old/pytest-4.6.5/azure-pipelines.yml        2019-08-05 20:04:19.000000000 
+0200
+++ new/pytest-4.6.6/azure-pipelines.yml        2019-10-13 16:54:01.000000000 
+0200
@@ -91,7 +91,7 @@
     condition: eq(variables['python.needs_vc'], True)
     displayName: 'Install VC for py27'
 
-  - script: python -m pip install --upgrade pip && python -m pip install tox
+  - script: python -m pip install tox
     displayName: 'Install tox'
 
   - script: |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/doc/en/announce/index.rst 
new/pytest-4.6.6/doc/en/announce/index.rst
--- old/pytest-4.6.5/doc/en/announce/index.rst  2019-08-05 20:04:19.000000000 
+0200
+++ new/pytest-4.6.6/doc/en/announce/index.rst  2019-10-13 16:54:01.000000000 
+0200
@@ -6,6 +6,7 @@
    :maxdepth: 2
 
 
+   release-4.6.6
    release-4.6.5
    release-4.6.4
    release-4.6.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/doc/en/announce/release-4.6.6.rst 
new/pytest-4.6.6/doc/en/announce/release-4.6.6.rst
--- old/pytest-4.6.5/doc/en/announce/release-4.6.6.rst  1970-01-01 
01:00:00.000000000 +0100
+++ new/pytest-4.6.6/doc/en/announce/release-4.6.6.rst  2019-10-13 
16:54:01.000000000 +0200
@@ -0,0 +1,20 @@
+pytest-4.6.6
+=======================================
+
+pytest 4.6.6 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at 
https://docs.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Michael Goerz
+
+
+Happy testing,
+The pytest Development Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/doc/en/example/reportingdemo.rst 
new/pytest-4.6.6/doc/en/example/reportingdemo.rst
--- old/pytest-4.6.5/doc/en/example/reportingdemo.rst   2019-08-05 
20:04:19.000000000 +0200
+++ new/pytest-4.6.6/doc/en/example/reportingdemo.rst   2019-10-13 
16:54:01.000000000 +0200
@@ -436,7 +436,7 @@
             items = [1, 2, 3]
             print("items is %r" % items)
     >       a, b = items.pop()
-    E       TypeError: 'int' object is not iterable
+    E       TypeError: cannot unpack non-iterable int object
 
     failure_demo.py:182: TypeError
     --------------------------- Captured stdout call 
---------------------------
@@ -515,7 +515,7 @@
         def test_z2_type_error(self):
             items = 3
     >       a, b = items
-    E       TypeError: 'int' object is not iterable
+    E       TypeError: cannot unpack non-iterable int object
 
     failure_demo.py:222: TypeError
     ______________________ TestMoreErrors.test_startswith 
______________________
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/doc/en/example/simple.rst 
new/pytest-4.6.6/doc/en/example/simple.rst
--- old/pytest-4.6.5/doc/en/example/simple.rst  2019-08-05 20:04:19.000000000 
+0200
+++ new/pytest-4.6.6/doc/en/example/simple.rst  2019-10-13 16:54:01.000000000 
+0200
@@ -440,7 +440,7 @@
     test_some_are_slow.py ...                                            [100%]
 
     ========================= slowest 3 test durations 
=========================
-    0.31s call     test_some_are_slow.py::test_funcslow2
+    0.30s call     test_some_are_slow.py::test_funcslow2
     0.20s call     test_some_are_slow.py::test_funcslow1
     0.10s call     test_some_are_slow.py::test_funcfast
     ========================= 3 passed in 0.12 seconds 
=========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/doc/en/getting-started.rst 
new/pytest-4.6.6/doc/en/getting-started.rst
--- old/pytest-4.6.5/doc/en/getting-started.rst 2019-08-05 20:04:19.000000000 
+0200
+++ new/pytest-4.6.6/doc/en/getting-started.rst 2019-10-13 16:54:01.000000000 
+0200
@@ -28,7 +28,7 @@
 .. code-block:: bash
 
     $ pytest --version
-    This is pytest version 4.x.y, imported from 
$PYTHON_PREFIX/lib/python3.6/site-packages/pytest.py
+    This is pytest version 4.x.y, imported from 
$PYTHON_PREFIX/lib/python3.7/site-packages/pytest.py
 
 .. _`simpletest`:
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/scripts/publish_gh_release_notes.py 
new/pytest-4.6.6/scripts/publish_gh_release_notes.py
--- old/pytest-4.6.5/scripts/publish_gh_release_notes.py        1970-01-01 
01:00:00.000000000 +0100
+++ new/pytest-4.6.6/scripts/publish_gh_release_notes.py        2019-10-13 
16:54:01.000000000 +0200
@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+"""
+Script used to publish GitHub release notes extracted from CHANGELOG.rst.
+
+This script is meant to be executed after a successful deployment in Travis.
+
+Uses the following environment variables:
+
+* GIT_TAG: the name of the tag of the current commit.
+* GH_RELEASE_NOTES_TOKEN: a personal access token with 'repo' permissions. It 
should be encrypted using:
+
+    $travis encrypt GH_RELEASE_NOTES_TOKEN=<token> -r pytest-dev/pytest
+
+  And the contents pasted in the ``deploy.env.secure`` section in the 
``travis.yml`` file.
+
+The script also requires ``pandoc`` to be previously installed in the system.
+
+Requires Python3.6+.
+"""
+import os
+import re
+import sys
+from pathlib import Path
+
+import github3
+import pypandoc
+
+
+def publish_github_release(slug, token, tag_name, body):
+    github = github3.login(token=token)
+    owner, repo = slug.split("/")
+    repo = github.repository(owner, repo)
+    return repo.create_release(tag_name=tag_name, body=body)
+
+
+def parse_changelog(tag_name):
+    p = Path(__file__).parent.parent / "CHANGELOG.rst"
+    changelog_lines = p.read_text(encoding="UTF-8").splitlines()
+
+    title_regex = re.compile(r"pytest (\d\.\d+\.\d+) \(\d{4}-\d{2}-\d{2}\)")
+    consuming_version = False
+    version_lines = []
+    for line in changelog_lines:
+        m = title_regex.match(line)
+        if m:
+            # found the version we want: start to consume lines until we find 
the next version title
+            if m.group(1) == tag_name:
+                consuming_version = True
+            # found a new version title while parsing the version we want: 
break out
+            elif consuming_version:
+                break
+        if consuming_version:
+            version_lines.append(line)
+
+    return "\n".join(version_lines)
+
+
+def convert_rst_to_md(text):
+    return pypandoc.convert_text(text, "md", format="rst")
+
+
+def main(argv):
+    if len(argv) > 1:
+        tag_name = argv[1]
+    else:
+        tag_name = os.environ.get("TRAVIS_TAG")
+        if not tag_name:
+            print("tag_name not given and $TRAVIS_TAG not set", 
file=sys.stderr)
+            return 1
+
+    token = os.environ.get("GH_RELEASE_NOTES_TOKEN")
+    if not token:
+        print("GH_RELEASE_NOTES_TOKEN not set", file=sys.stderr)
+        return 1
+
+    slug = os.environ.get("TRAVIS_REPO_SLUG")
+    if not slug:
+        print("TRAVIS_REPO_SLUG not set", file=sys.stderr)
+        return 1
+
+    rst_body = parse_changelog(tag_name)
+    md_body = convert_rst_to_md(rst_body)
+    if not publish_github_release(slug, token, tag_name, md_body):
+        print("Could not publish release notes:", file=sys.stderr)
+        print(md_body, file=sys.stderr)
+        return 5
+
+    print()
+    print(f"Release notes for {tag_name} published successfully:")
+    print(f"https://github.com/{slug}/releases/tag/{tag_name}";)
+    print()
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/setup.py new/pytest-4.6.6/setup.py
--- old/pytest-4.6.5/setup.py   2019-08-05 20:04:19.000000000 +0200
+++ new/pytest-4.6.6/setup.py   2019-10-13 16:54:01.000000000 +0200
@@ -15,7 +15,7 @@
     'pathlib2>=2.2.0;python_version<"3.6"',
     'colorama;sys_platform=="win32"',
     "pluggy>=0.12,<1.0",
-    "importlib-metadata>=0.12",
+    'importlib-metadata>=0.12;python_version<"3.8"',
     "wcwidth",
 ]
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/src/_pytest/_version.py 
new/pytest-4.6.6/src/_pytest/_version.py
--- old/pytest-4.6.5/src/_pytest/_version.py    2019-08-05 20:04:36.000000000 
+0200
+++ new/pytest-4.6.6/src/_pytest/_version.py    2019-10-13 16:54:20.000000000 
+0200
@@ -1,4 +1,4 @@
 # coding: utf-8
 # file generated by setuptools_scm
 # don't change, don't track in version control
-version = '4.6.5'
+version = '4.6.6'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/src/_pytest/assertion/util.py 
new/pytest-4.6.6/src/_pytest/assertion/util.py
--- old/pytest-4.6.5/src/_pytest/assertion/util.py      2019-08-05 
20:04:19.000000000 +0200
+++ new/pytest-4.6.6/src/_pytest/assertion/util.py      2019-10-13 
16:54:01.000000000 +0200
@@ -12,6 +12,7 @@
 from ..compat import Sequence
 from _pytest import outcomes
 from _pytest._io.saferepr import saferepr
+from _pytest.compat import ATTRS_EQ_FIELD
 
 # The _reprcompare attribute on the util module is used by the new assertion
 # interpretation code and assertion rewriter to detect this plugin was
@@ -374,7 +375,9 @@
         fields_to_check = [field for field, info in all_fields.items() if 
info.compare]
     elif isattrs(left):
         all_fields = left.__attrs_attrs__
-        fields_to_check = [field.name for field in all_fields if field.cmp]
+        fields_to_check = [
+            field.name for field in all_fields if getattr(field, 
ATTRS_EQ_FIELD)
+        ]
 
     same = []
     diff = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/src/_pytest/compat.py 
new/pytest-4.6.6/src/_pytest/compat.py
--- old/pytest-4.6.5/src/_pytest/compat.py      2019-08-05 20:04:19.000000000 
+0200
+++ new/pytest-4.6.6/src/_pytest/compat.py      2019-10-13 16:54:01.000000000 
+0200
@@ -13,6 +13,7 @@
 import sys
 from contextlib import contextmanager
 
+import attr
 import py
 import six
 from six import text_type
@@ -61,6 +62,12 @@
         return None
 
 
+if sys.version_info >= (3, 8):
+    from importlib import metadata as importlib_metadata  # noqa
+else:
+    import importlib_metadata  # noqa
+
+
 def _format_args(func):
     return str(signature(func))
 
@@ -406,8 +413,8 @@
 
     pytest.collect = ModuleType("pytest.collect")
     pytest.collect.__all__ = []  # used for setns
-    for attr in COLLECT_FAKEMODULE_ATTRIBUTES:
-        setattr(pytest.collect, attr, getattr(pytest, attr))
+    for attribute in COLLECT_FAKEMODULE_ATTRIBUTES:
+        setattr(pytest.collect, attribute, getattr(pytest, attribute))
 
 
 if _PY2:
@@ -455,3 +462,9 @@
 
 else:
     from functools import lru_cache  # noqa: F401
+
+
+if getattr(attr, "__version_info__", ()) >= (19, 2):
+    ATTRS_EQ_FIELD = "eq"
+else:
+    ATTRS_EQ_FIELD = "cmp"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/src/_pytest/config/__init__.py 
new/pytest-4.6.6/src/_pytest/config/__init__.py
--- old/pytest-4.6.5/src/_pytest/config/__init__.py     2019-08-05 
20:04:19.000000000 +0200
+++ new/pytest-4.6.6/src/_pytest/config/__init__.py     2019-10-13 
16:54:01.000000000 +0200
@@ -13,7 +13,6 @@
 import types
 import warnings
 
-import importlib_metadata
 import py
 import six
 from packaging.version import Version
@@ -31,6 +30,7 @@
 from _pytest import deprecated
 from _pytest._code import ExceptionInfo
 from _pytest._code import filter_traceback
+from _pytest.compat import importlib_metadata
 from _pytest.compat import lru_cache
 from _pytest.compat import safe_str
 from _pytest.outcomes import fail
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/src/_pytest/mark/structures.py 
new/pytest-4.6.6/src/_pytest/mark/structures.py
--- old/pytest-4.6.5/src/_pytest/mark/structures.py     2019-08-05 
20:04:19.000000000 +0200
+++ new/pytest-4.6.6/src/_pytest/mark/structures.py     2019-10-13 
16:54:01.000000000 +0200
@@ -8,6 +8,7 @@
 import six
 
 from ..compat import ascii_escaped
+from ..compat import ATTRS_EQ_FIELD
 from ..compat import getfslineno
 from ..compat import MappingMixin
 from ..compat import NOTSET
@@ -377,7 +378,8 @@
         return "<NodeKeywords for node %s>" % (self.node,)
 
 
[email protected](cmp=False, hash=False)
+# mypy cannot find this overload, remove when on attrs>=19.2
[email protected](hash=False, **{ATTRS_EQ_FIELD: False})  # type: ignore
 class NodeMarkers(object):
     """
     internal structure for storing marks belonging to a node
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/src/_pytest/pastebin.py 
new/pytest-4.6.6/src/_pytest/pastebin.py
--- old/pytest-4.6.5/src/_pytest/pastebin.py    2019-08-05 20:04:19.000000000 
+0200
+++ new/pytest-4.6.6/src/_pytest/pastebin.py    2019-10-13 16:54:01.000000000 
+0200
@@ -77,11 +77,7 @@
         from urllib.request import urlopen
         from urllib.parse import urlencode
 
-    params = {
-        "code": contents,
-        "lexer": "python3" if sys.version_info[0] == 3 else "python",
-        "expiry": "1week",
-    }
+    params = {"code": contents, "lexer": "text", "expiry": "1week"}
     url = "https://bpaste.net";
     response = urlopen(url, data=urlencode(params).encode("ascii")).read()
     m = re.search(r'href="/raw/(\w+)"', response.decode("utf-8"))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/src/_pytest/pytester.py 
new/pytest-4.6.6/src/_pytest/pytester.py
--- old/pytest-4.6.5/src/_pytest/pytester.py    2019-08-05 20:04:19.000000000 
+0200
+++ new/pytest-4.6.6/src/_pytest/pytester.py    2019-10-13 16:54:01.000000000 
+0200
@@ -1124,7 +1124,7 @@
 
             if timeout is None:
                 ret = popen.wait()
-            elif six.PY3:
+            elif not six.PY2:
                 try:
                     ret = popen.wait(timeout)
                 except subprocess.TimeoutExpired:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/src/pytest.egg-info/PKG-INFO 
new/pytest-4.6.6/src/pytest.egg-info/PKG-INFO
--- old/pytest-4.6.5/src/pytest.egg-info/PKG-INFO       2019-08-05 
20:04:36.000000000 +0200
+++ new/pytest-4.6.6/src/pytest.egg-info/PKG-INFO       2019-10-13 
16:54:20.000000000 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest
-Version: 4.6.5
+Version: 4.6.6
 Summary: pytest: simple powerful testing with Python
 Home-page: https://docs.pytest.org/en/latest/
 Author: Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, 
Brianna Laugher, Florian Bruhin and others
@@ -168,5 +168,5 @@
 Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
-Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
+Requires-Python: !=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7
 Provides-Extra: testing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/src/pytest.egg-info/SOURCES.txt 
new/pytest-4.6.6/src/pytest.egg-info/SOURCES.txt
--- old/pytest-4.6.5/src/pytest.egg-info/SOURCES.txt    2019-08-05 
20:04:36.000000000 +0200
+++ new/pytest-4.6.6/src/pytest.egg-info/SOURCES.txt    2019-10-13 
16:54:20.000000000 +0200
@@ -199,6 +199,7 @@
 doc/en/announce/release-4.6.3.rst
 doc/en/announce/release-4.6.4.rst
 doc/en/announce/release-4.6.5.rst
+doc/en/announce/release-4.6.6.rst
 doc/en/announce/sprint2016.rst
 doc/en/example/attic.rst
 doc/en/example/conftest.py
@@ -241,6 +242,7 @@
 doc/en/proposals/parametrize_with_fixtures.rst
 extra/get_issues.py
 extra/setup-py.test/setup.py
+scripts/publish_gh_release_notes.py
 scripts/release.minor.rst
 scripts/release.patch.rst
 scripts/release.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/src/pytest.egg-info/requires.txt 
new/pytest-4.6.6/src/pytest.egg-info/requires.txt
--- old/pytest-4.6.5/src/pytest.egg-info/requires.txt   2019-08-05 
20:04:36.000000000 +0200
+++ new/pytest-4.6.6/src/pytest.egg-info/requires.txt   2019-10-13 
16:54:20.000000000 +0200
@@ -4,7 +4,6 @@
 attrs>=17.4.0
 atomicwrites>=1.0
 pluggy<1.0,>=0.12
-importlib-metadata>=0.12
 wcwidth
 
 [:python_version < "3.0"]
@@ -13,6 +12,9 @@
 [:python_version < "3.6"]
 pathlib2>=2.2.0
 
+[:python_version < "3.8"]
+importlib-metadata>=0.12
+
 [:python_version <= "2.7"]
 more-itertools<6.0.0,>=4.0.0
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/testing/acceptance_test.py 
new/pytest-4.6.6/testing/acceptance_test.py
--- old/pytest-4.6.5/testing/acceptance_test.py 2019-08-05 20:04:19.000000000 
+0200
+++ new/pytest-4.6.6/testing/acceptance_test.py 2019-10-13 16:54:01.000000000 
+0200
@@ -9,11 +9,11 @@
 import types
 
 import attr
-import importlib_metadata
 import py
 import six
 
 import pytest
+from _pytest.compat import importlib_metadata
 from _pytest.main import EXIT_NOTESTSCOLLECTED
 from _pytest.main import EXIT_USAGEERROR
 from _pytest.warnings import SHOW_PYTEST_WARNINGS_ARG
@@ -223,7 +223,7 @@
                 "conftest.py:2: in foo",
                 "    import qwerty",
                 "E   {}: No module named {q}qwerty{q}".format(
-                    exc_name, q="'" if six.PY3 else ""
+                    exc_name, q="" if six.PY2 else "'"
                 ),
             ]
         )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/testing/python/raises.py 
new/pytest-4.6.6/testing/python/raises.py
--- old/pytest-4.6.5/testing/python/raises.py   2019-08-05 20:04:19.000000000 
+0200
+++ new/pytest-4.6.6/testing/python/raises.py   2019-10-13 16:54:01.000000000 
+0200
@@ -289,7 +289,7 @@
 
     success = dummy_context_manager
     py2_only = pytest.mark.skipif(
-        six.PY3, reason="bytes in raises only supported in Python 2"
+        not six.PY2, reason="bytes in raises only supported in Python 2"
     )
 
     @pytest.mark.parametrize(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/testing/test_assertion.py 
new/pytest-4.6.6/testing/test_assertion.py
--- old/pytest-4.6.5/testing/test_assertion.py  2019-08-05 20:04:19.000000000 
+0200
+++ new/pytest-4.6.6/testing/test_assertion.py  2019-10-13 16:54:01.000000000 
+0200
@@ -14,6 +14,7 @@
 from _pytest import outcomes
 from _pytest.assertion import truncate
 from _pytest.assertion import util
+from _pytest.compat import ATTRS_EQ_FIELD
 
 PY3 = sys.version_info >= (3, 0)
 
@@ -179,7 +180,8 @@
                 return check
             """,
             "mainwrapper.py": """\
-            import pytest, importlib_metadata
+            import pytest
+            from _pytest.compat import importlib_metadata
 
             class DummyEntryPoint(object):
                 name = 'spam'
@@ -687,7 +689,7 @@
         @attr.s
         class SimpleDataObject(object):
             field_a = attr.ib()
-            field_b = attr.ib(cmp=False)
+            field_b = attr.ib(**{ATTRS_EQ_FIELD: False})
 
         left = SimpleDataObject(1, "b")
         right = SimpleDataObject(1, "b")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/testing/test_config.py 
new/pytest-4.6.6/testing/test_config.py
--- old/pytest-4.6.5/testing/test_config.py     2019-08-05 20:04:19.000000000 
+0200
+++ new/pytest-4.6.6/testing/test_config.py     2019-10-13 16:54:01.000000000 
+0200
@@ -6,10 +6,9 @@
 import sys
 import textwrap
 
-import importlib_metadata
-
 import _pytest._code
 import pytest
+from _pytest.compat import importlib_metadata
 from _pytest.config import _iter_rewritable_modules
 from _pytest.config.exceptions import UsageError
 from _pytest.config.findpaths import determine_setup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/testing/test_entry_points.py 
new/pytest-4.6.6/testing/test_entry_points.py
--- old/pytest-4.6.5/testing/test_entry_points.py       2019-08-05 
20:04:19.000000000 +0200
+++ new/pytest-4.6.6/testing/test_entry_points.py       2019-10-13 
16:54:01.000000000 +0200
@@ -3,7 +3,7 @@
 from __future__ import division
 from __future__ import print_function
 
-import importlib_metadata
+from _pytest.compat import importlib_metadata
 
 
 def test_pytest_entry_points_are_identical():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/testing/test_monkeypatch.py 
new/pytest-4.6.6/testing/test_monkeypatch.py
--- old/pytest-4.6.5/testing/test_monkeypatch.py        2019-08-05 
20:04:19.000000000 +0200
+++ new/pytest-4.6.6/testing/test_monkeypatch.py        2019-10-13 
16:54:01.000000000 +0200
@@ -209,7 +209,7 @@
 
     VAR_NAME = u"PYTEST_INTERNAL_MY_VAR"
 
-    @pytest.mark.skipif(six.PY3, reason="Python 2 only test")
+    @pytest.mark.skipif(not six.PY2, reason="Python 2 only test")
     def test_setenv_unicode_key(self, monkeypatch):
         with pytest.warns(
             pytest.PytestWarning,
@@ -217,7 +217,7 @@
         ):
             monkeypatch.setenv(self.VAR_NAME, "2")
 
-    @pytest.mark.skipif(six.PY3, reason="Python 2 only test")
+    @pytest.mark.skipif(not six.PY2, reason="Python 2 only test")
     def test_delenv_unicode_key(self, monkeypatch):
         with pytest.warns(
             pytest.PytestWarning,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/testing/test_pastebin.py 
new/pytest-4.6.6/testing/test_pastebin.py
--- old/pytest-4.6.5/testing/test_pastebin.py   2019-08-05 20:04:19.000000000 
+0200
+++ new/pytest-4.6.6/testing/test_pastebin.py   2019-10-13 16:54:01.000000000 
+0200
@@ -74,7 +74,7 @@
         """
         )
         result = testdir.runpytest("--pastebin=all")
-        if sys.version_info[0] == 3:
+        if sys.version_info[0] >= 3:
             expected_msg = "*assert '☺' == 1*"
         else:
             expected_msg = "*assert '\\xe2\\x98\\xba' == 1*"
@@ -126,7 +126,7 @@
         assert len(mocked_urlopen) == 1
         url, data = mocked_urlopen[0]
         assert type(data) is bytes
-        lexer = "python3" if sys.version_info[0] == 3 else "python"
+        lexer = "text"
         assert url == "https://bpaste.net";
         assert "lexer=%s" % lexer in data.decode()
         assert "code=full-paste-contents" in data.decode()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/testing/test_warnings.py 
new/pytest-4.6.6/testing/test_warnings.py
--- old/pytest-4.6.5/testing/test_warnings.py   2019-08-05 20:04:19.000000000 
+0200
+++ new/pytest-4.6.6/testing/test_warnings.py   2019-10-13 16:54:01.000000000 
+0200
@@ -569,7 +569,7 @@
         assert WARNINGS_SUMMARY_HEADER not in result.stdout.str()
 
 
[email protected](six.PY3, reason="Python 2 only issue")
[email protected](not six.PY2, reason="Python 2 only issue")
 def test_infinite_loop_warning_against_unicode_usage_py2(testdir):
     """
     We need to be careful when raising the warning about unicode usage with 
"warnings.warn"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pytest-4.6.5/tox.ini new/pytest-4.6.6/tox.ini
--- old/pytest-4.6.5/tox.ini    2019-08-05 20:04:19.000000000 +0200
+++ new/pytest-4.6.6/tox.ini    2019-10-13 16:54:01.000000000 +0200
@@ -93,7 +93,7 @@
 [testenv:regen]
 changedir = doc/en
 skipsdist = True
-basepython = python3.6
+basepython = python3
 deps =
     sphinx
     PyYAML
@@ -125,7 +125,7 @@
 
 [testenv:release]
 decription = do a release, required posarg of the version number
-basepython = python3.6
+basepython = python3
 usedevelop = True
 passenv = *
 deps =
@@ -136,6 +136,17 @@
     wheel
 commands = python scripts/release.py {posargs}
 
+[testenv:publish_gh_release_notes]
+description = create GitHub release after deployment
+basepython = python3
+usedevelop = True
+passenv = GH_RELEASE_NOTES_TOKEN TRAVIS_TAG TRAVIS_REPO_SLUG
+deps =
+    github3.py
+    pypandoc
+commands = python scripts/publish_gh_release_notes.py
+
+
 [pytest]
 minversion = 2.0
 addopts = -ra -p pytester --strict-markers


Reply via email to