gentoo resync : 25.08.2020

3 files changed, 45 insertions, 26 deletions

diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 37166487efc3..2203934f3ffc 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -1,5 +1,7 @@
 AUX py-1.5.2-skip-apiwarn-pytest31.patch 517 BLAKE2B a086d8130c1ead322461e7d89249f07e2dd9a6eee4f7e878bd8c01cf19df695a6a5698ec0cc50770f0514cbedbd2aa88e3fc356a72c78eab4b6bc378b5d1f590 SHA512 01da1bb928fe3b22a69a439481a1ebdac790811da781b7ee497ffa1b7362270628527b33f2d5dc0e83ebc2e57cdaf9fbd2974735f580931222f33e543fd69762
-AUX py-1.8.0-pytest-4.patch 21458 BLAKE2B bfc44034bc01a7ada894bbddf8989705ea96d5b455f0eb45f14f63999e73ac94dfa1eb42698e13b5867d0fadfb58c75fbe1c9cc7e40f290145552c625b938b38 SHA512 cabfdb8cd2e229bfbd5e770a145dde60f9e649f683f8e3d57d2cf393a4d246fcb0eae4596cbbee010de97bfca26470a5dd4280d0f9e34d7f30df19b09f5ea8b6
+AUX py-1.8.0-pytest-4.patch 20364 BLAKE2B 8fe8f3b659ef6f586d3de299dcc2e986fec0ede3659c19c08f1c273e3204278620770051603e0c7bffbb47a6b9ecb438f5b7744c0c5894512b0f50877188a6e0 SHA512 ade290d37af218077100f03da5c8ce6e77b93e79317405b9e62059a2c97e14e21e56a11dec7d031f6f2deeff05ce0d6c0c3488535a6d117a02cacc1e18da46e3
 DIST py-1.8.0.tar.gz 205096 BLAKE2B e08554fc3e0bae2e2d4515f075991707af29aa5c39e1387e8f8a7dab25e78c7340d389c79936ddea27b1fb0438ebdee8b5e218bbb48c62089d7fb656b1b6dbe8 SHA512 37b9a66229b834a034d9ba6769a46addf098380b494c1eb863607a52d00b7ec5b9157dd7ac6ffc52535a05006648c775c78716d7f85cf44966065b225be6e95b
+DIST py-1.9.0.tar.gz 210098 BLAKE2B d7f9b22ebaedd12534198912c1fa0be80f42e97751701442e060e1c244b06ab82239fe78a3cc7119fa4df5d87ecfd97bfb2568744693d3ffe9824ae1d73e59f9 SHA512 965b2adfe1b13177629ccfcdf6d0a13460683ca7a01d585163deb1af15d926fc86680d9e51660f6cbb8569f822a4d54ce281c029e363d244ddf67e33b102ad0a
 EBUILD py-1.8.0.ebuild 1708 BLAKE2B bf4579b20c2b98910f611fa6c12ae64083e1e274a1062aff8ba528697a16b536e91189cee78ef9add278ff90005dbc7b638f599fe012a6263e1431c05473ca13 SHA512 65bee22f4d16768e8403cf46fa90e93347e29b9850b5a966a437693b2aa26be42140562d6f38a6bab501cd957835293bb0aa88caf5dc64ca68bb06f46770871f
+EBUILD py-1.9.0.ebuild 1279 BLAKE2B b593b7c7e87195d71f9d8dc8f67522a67a8d74d4a84d74559cdaea2530c7e2bc735a1def19cec5f3147d1acb183a3ccd07e5bb5bdc3f85d07f6b22b8a4a7ad36 SHA512 f125cb91420fe2770a5e285c8a0f174ba04ae07e07b891d54a01c29d5a3acf8b4ac7119f88106d759886efb4913da587f4c73fce6f2bfa1ce241b1df6d3c6e30
 MISC metadata.xml 340 BLAKE2B 110b7f7cc26818661b98f60f589a782c0a9ed827fb43a89eef8cd7096045b1cc168410d9525641d4a78dee9709679d4d9ee7c38680caef5f37a73f1e726007cd SHA512 ce65db3c076a27acc6af28c1adecf61bfd7d10872612994fd616c72e91264be87460823055182e3b60f6931f22386d3a9f541ddd16c902fd8e02a6a345e65f5c
diff --git a/dev-python/py/files/py-1.8.0-pytest-4.patch b/dev-python/py/files/py-1.8.0-pytest-4.patch
index d9d5cfa5b650..7d4de73ba776 100644
--- a/dev-python/py/files/py-1.8.0-pytest-4.patch
+++ b/dev-python/py/files/py-1.8.0-pytest-4.patch
@@ -38,31 +38,6 @@ Signed-off-by: Stanislav Levin <slev@altlinux.org>
  testing/root/test_std.py                     |  3 ++-
  17 files changed, 100 insertions(+), 82 deletions(-)
 
-diff --git a/doc/faq.txt b/doc/faq.txt
-index 52cb4b3f..cac83b2c 100644
---- a/doc/faq.txt
-+++ b/doc/faq.txt
-@@ -98,20 +98,6 @@ in a managed class/module/function scope.
- .. _`xUnit style setup`: test/xunit_setup.html
- .. _`pytest_nose`: test/plugin/nose.html
- 
--.. _`why pytest_pyfuncarg__ methods?`:
--
--Why the ``pytest_funcarg__*`` name for funcarg factories?
-----------------------------------------------------------------
--
--When experimenting with funcargs an explicit registration mechanism
--was considered.  But lacking a good use case for this indirection and
--flexibility we decided to go for `Convention over Configuration`_ and
--allow to directly specify the factory.  Besides removing the need
--for an indirection it allows to "grep" for ``pytest_funcarg__MYARG``
--and will safely find all factory functions for the ``MYARG`` function
--argument.  It helps to alleviate the de-coupling of function
--argument usage and creation.
--
- .. _`Convention over Configuration`: http://en.wikipedia.org/wiki/Convention_over_Configuration
- 
- Can I yield multiple values from a factory function?
 diff --git a/testing/code/test_assertion.py b/testing/code/test_assertion.py
 index e2a7f903..4cb39fe2 100644
 --- a/testing/code/test_assertion.py
diff --git a/dev-python/py/py-1.9.0.ebuild b/dev-python/py/py-1.9.0.ebuild
new file mode 100644
index 000000000000..958ce68bf629
--- /dev/null
+++ b/dev-python/py/py-1.9.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.2-skip-apiwarn-pytest31.patch
+	"${FILESDIR}"/${PN}-1.8.0-pytest-4.patch
+)
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+src_prepare() {
+	# broken on py3.8, don't seem important
+	sed -i -e 's:test_syntaxerror_rerepresentation:_&:' \
+		-e 's:test_comments:_&:' \
+		testing/code/test_source.py || die
+	# broken on py3.9, this package is just dead
+	sed -i -e 's:test_getfslineno:_&:' \
+		testing/code/test_source.py || die
+
+	distutils-r1_src_prepare
+
+	# broken, and relying on exact assertion strings
+	rm testing/code/test_assertion.py || die
+}