[gentoo-commits] repo/gentoo:master commit in: dev-python/importlib_metadata/, dev-python/importlib_metadata/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/importlib_metadata/, dev-python/importlib_metadata/files/

[Patrick McLean]

commit:     0c7ff49d4d1f1ce526618c99dcde0ad3f8359ff5
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Thu Nov 21 20:05:17 2019 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Nov 21 23:55:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c7ff49d

dev-python/importlib_metadata: Add py38 with patch for tests

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 .../files/importlib_metadata-0.23-py38.patch       | 36 ++++++++++++++++++++++
 .../importlib_metadata-0.23-r1.ebuild              |  6 +++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/dev-python/importlib_metadata/files/importlib_metadata-0.23-py38.patch b/dev-python/importlib_metadata/files/importlib_metadata-0.23-py38.patch
new file mode 100644
index 00000000000..f0b8b636543
--- /dev/null
+++ b/dev-python/importlib_metadata/files/importlib_metadata-0.23-py38.patch
@@ -0,0 +1,36 @@
+diff --git a/importlib_metadata/tests/test_main.py b/importlib_metadata/tests/test_main.py
+index 38ec884..0ab1cf1 100644
+--- a/importlib_metadata/tests/test_main.py
++++ b/importlib_metadata/tests/test_main.py
+@@ -2,11 +2,17 @@
+ from __future__ import unicode_literals
+ 
+ import re
++import sys
+ import textwrap
+ import unittest
+ import importlib
+ import importlib_metadata
+ 
++if sys.hexversion > 0x3080000:
++    from importlib.metadata import (
++        Distribution as SysDistribution,
++        )
++
+ from . import fixtures
+ from .. import (
+     Distribution, EntryPoint, MetadataPathFinder,
+@@ -157,8 +163,12 @@ class DiscoveryTests(fixtures.EggInfoPkg,
+ 
+     def test_package_discovery(self):
+         dists = list(distributions())
++        if sys.hexversion > 0x3080000:
++            dist_classes = (Distribution, SysDistribution)
++        else:
++            dist_classes = (Distribution)
+         assert all(
+-            isinstance(dist, Distribution)
++            isinstance(dist, dist_classes)
+             for dist in dists
+             )
+         assert any(

diff --git a/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild
index 4703e20cd4f..11128514911 100644
--- a/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
 
 inherit distutils-r1
 
@@ -35,6 +35,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/importlib_metadata-0.23-py38.patch"
+)
+
 distutils_enable_tests unittest
 
 python_check_deps() {