Updating liguros repo

9 files changed, 112 insertions, 5 deletions

diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index 9da825ff87f2..408f4b9ca039 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -1 +1,2 @@
 DIST py-cpuinfo-6.0.0.tar.gz 145260 BLAKE2B 58cfeb698619f2f51dada63b236969393e387f6e66fffe853ab633e438b4b893489c097211a20ece597a06d3c0cf89d285b5ab34e80029510e86b1a322ff1f06 SHA512 4941a5193cc376a44e99bc82644ec9d7e8f9f11b4e5fb1ad22a71c959959dde7f67290b436dfad2f26c68ef17d08e33538cf80443f763268c503af17b8479438
+DIST py-cpuinfo-7.0.0.tar.gz 95887 BLAKE2B 8f5764db94faf41dc554353ac2a21416998efd602b6228f21db6e5b3257563b4f7352221eb7f354ebe431910b0b8dadd52558233261df557c6a7943b7ec138c4 SHA512 fd291533dc5e78d75851e61ef2a754d9bdb62cbb5e04c86db0d6ea2d074a1e920b1ff50c136df3dd640cb64deaccd4f187c5af02c586a3d28b8c74dfe4143893
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-7.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-7.0.0.ebuild
new file mode 100644
index 000000000000..e9164a900e57
--- /dev/null
+++ b/dev-python/py-cpuinfo/py-cpuinfo-7.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Get CPU info with pure Python 2 & 3"
+HOMEPAGE="https://github.com/workhorsy/py-cpuinfo https://pypi.org/project/py-cpuinfo/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch b/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch
new file mode 100644
index 000000000000..cbdeb80c1c56
--- /dev/null
+++ b/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_modeltest.py b/tests/test_modeltest.py
+index ef9371c..becd3ae 100644
+--- a/tests/test_modeltest.py
++++ b/tests/test_modeltest.py
+@@ -350,7 +350,7 @@ def test_qt_tester_invalid(testdir):
+             "test_qt_tester_invalid.py:*: Qt modeltester errors",
+             "*-- Captured Qt messages --*",
+             "* QtWarningMsg: FAIL! model->columnCount(QModelIndex()) >= 0 () returned FALSE "
+-            "(qabstractitemmodeltester.cpp:*)",
++            "(*qabstractitemmodeltester.cpp:*)",
+             "*-- Captured stdout call --*",
+             "modeltest: Using Qt C++ tester",
+             "*== 1 failed in * ==*",
diff --git a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild b/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
index 1422fe2d1a86..55715700f9e8 100644
--- a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -19,7 +19,13 @@ KEYWORDS="~amd64 ~x86"
 
 DEPEND="dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]"
 
-PATCHES=( "${FILESDIR}/${P}-skip-show-window-test.patch" )
+# Patch 1 skips a test that does not work inside the emerge environment:
+# pytestqt.exceptions.TimeoutError: widget <PyQt5.QtWidgets.QWidget object at 0x7f57d8527af8> not activated in 1000 ms.
+# Patch 2 fixes upstream bug 314
+PATCHES=(
+	"${FILESDIR}/${P}-skip-show-window-test.patch"
+	"${FILESDIR}/${P}-fix-file-match-test.patch"
+)
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild
index 4fd132269c82..f73be0464463 100644
--- a/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -19,12 +19,11 @@ IUSE="test"
 
 DEPEND="test? (
 		>=dev-python/click-5[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
 	)"
 
-RESTRICT="test"  # help fixing tests welcome, please get in touch
-
 DOCS=( CHANGELOG.md README.md )
 
 distutils_enable_tests pytest
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index d7ccff4e55c2..9b5e5a0e3f3b 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1 +1,2 @@
 DIST sh-1.12.14.tar.gz 56861 BLAKE2B dcab86c518fdfdf763053f05a6701fbd0faa76e05d710d6ef709dca89b7527157385ecde355f5f358ba08f7da8e551712732ef43f3074f5568fc7092ed12f014 SHA512 5f2daa2666cf8efe90ba550c8ea5875f2a8812d787597c9d9b933f58feccd192e1ec0ab5695b756bdbfbf9748d106c2045be20838e680b31dac3f778970b5786
+DIST sh-1.14.0.tar.gz 63313 BLAKE2B 9975944455077729d172a34dcf7847930f9bb943d5345729a9c09afeb411de72b59cd5e4f1192406ba8430a26439acd2ee4d477b10f31b5e55be936c711f70a9 SHA512 816c0562f4f779ba79b5206d151893cd5043898d1b74ee109c0ea67f862a097ab9c7509e4a20459fc623f14fa3fb1a9e2a2ccec8257a68fcba14414779a20128
diff --git a/dev-python/sh/files/sh-1.14.0-fix-sleep-test.patch b/dev-python/sh/files/sh-1.14.0-fix-sleep-test.patch
new file mode 100644
index 000000000000..28d1ec9847fd
--- /dev/null
+++ b/dev-python/sh/files/sh-1.14.0-fix-sleep-test.patch
@@ -0,0 +1,33 @@
+From 83b189de4f461ed0370b0472f1938d3162ed00c7 Mon Sep 17 00:00:00 2001
+From: David Runge <dave@sleepmap.de>
+Date: Tue, 1 Sep 2020 23:18:13 +0200
+Subject: [PATCH] Remove hardcoded path for sleep executable
+
+test.py:
+In test_timeout the path for the sleep executable has been hardcoded to
+be /bin/sleep. However, on operating systems such as Arch Linux, Fedora
+or Solaris the executable resides in /usr/bin/sleep due to a /usr merge
+(e.g. see
+  https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/).
+By only checking for the name of the executable and its parameter the
+test becomes more generic and thus can run on any (Unix-like) operating
+system (given that `sleep` is in PATH).
+
+Fixes #539
+---
+ test.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test.py b/test.py
+index f8029c04..142fcc0d 100644
+--- a/test.py
++++ b/test.py
+@@ -2014,7 +2014,7 @@ def test_timeout(self):
+         try:
+             sh.sleep(sleep_for, _timeout=timeout).wait()
+         except sh.TimeoutException as e:
+-            self.assertEqual(e.full_cmd, '/bin/sleep 3')
++            assert 'sleep 3' in e.full_cmd
+         else:
+             self.fail("no timeout exception")
+         elapsed = time() - started
diff --git a/dev-python/sh/files/sh-1.14.0-skip-unreliable-test.patch b/dev-python/sh/files/sh-1.14.0-skip-unreliable-test.patch
new file mode 100644
index 000000000000..ea79229459ec
--- /dev/null
+++ b/dev-python/sh/files/sh-1.14.0-skip-unreliable-test.patch
@@ -0,0 +1,8 @@
+diff --git a/test.py b/test.py
+index a4b9915..fb2ffdd 100644
+--- a/test.py
++++ b/test.py
+@@ -2799,2 +2799,3 @@ print("cool")
+     @requires_progs("lsof")
++    @unittest.skip("Test seems to be unreliable")
+     def test_no_fd_leak(self):
diff --git a/dev-python/sh/sh-1.14.0.ebuild b/dev-python/sh/sh-1.14.0.ebuild
new file mode 100644
index 000000000000..5631ccfa7f62
--- /dev/null
+++ b/dev-python/sh/sh-1.14.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python subprocess interface"
+HOMEPAGE="https://github.com/amoffat/sh"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
+	"${FILESDIR}/sh-1.14.0-skip-unreliable-test.patch"
+	# https://github.com/amoffat/sh/pull/540
+	"${FILESDIR}/sh-1.14.0-fix-sleep-test.patch"
+)
+
+python_test() {
+	"${EPYTHON}" test.py || die "Tests fail with ${EPYTHON}"
+}