Hello community, here is the log from the commit of package python-pip for openSUSE:Factory checked in at 2019-07-30 13:04:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pip (Old) and /work/SRC/openSUSE:Factory/.python-pip.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pip" Tue Jul 30 13:04:18 2019 rev:43 rq:717473 version:19.1.1+git.1557777841.63878672 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pip/python-pip.changes 2019-05-17 23:40:44.737992490 +0200 +++ /work/SRC/openSUSE:Factory/.python-pip.new.4126/python-pip.changes 2019-07-30 13:04:19.662402838 +0200 @@ -1,0 +2,6 @@ +Mon Jul 22 08:24:11 UTC 2019 - Tomáš Chvátal <tchva...@suse.com> + +- Add patch to build with pytest5, also sent upstream: + * pytest5.patch + +------------------------------------------------------------------- New: ---- pytest5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pip.spec ++++++ --- /var/tmp/diff_new_pack.DnCDRK/_old 2019-07-30 13:04:20.198402723 +0200 +++ /var/tmp/diff_new_pack.DnCDRK/_new 2019-07-30 13:04:20.198402723 +0200 @@ -34,6 +34,7 @@ URL: http://www.pip-installer.org Source: pip-%{version}.tar.xz Patch0: pip-shipped-requests-cabundle.patch +Patch1: pytest5.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -71,6 +72,7 @@ %prep %setup -q -n pip-%{version} %patch0 -p1 +%patch1 -p1 # remove shebangs verbosely (if only sed would offer a verbose mode...) for f in $(find src -name \*.py -exec grep -l '^#!%{_bindir}/env' {} \;); do sed -i 's|^#!%{_bindir}/env .*$||g' $f ++++++ pytest5.patch ++++++ Index: pip-19.1.1+git.1557777841.63878672/tests/unit/test_wheel.py =================================================================== --- pip-19.1.1+git.1557777841.63878672.orig/tests/unit/test_wheel.py +++ pip-19.1.1+git.1557777841.63878672/tests/unit/test_wheel.py @@ -378,7 +378,7 @@ def test_check_compatibility(): # test raises with correct error with pytest.raises(UnsupportedWheel) as e: wheel.check_compatibility(higher_v, name) - assert 'is not compatible' in str(e) + assert 'is not compatible' in str(e.value) # Should only log.warning - minor version is greater higher_v = (vc[0], vc[1] + 1)
