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

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

[Zac Medico]

commit:     49c4bbb2604de2cbda3017cb879df3c7c3f21272
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 08:29:30 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun May 14 09:29:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c4bbb2

dev-python/snakeoil: Add python3.6 to PYTHON_COMPAT

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../snakeoil/files/snakeoil-0.7.1-test.patch       | 31 ++++++++++++++++++++++
 dev-python/snakeoil/snakeoil-0.7.1.ebuild          |  8 ++++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/dev-python/snakeoil/files/snakeoil-0.7.1-test.patch b/dev-python/snakeoil/files/snakeoil-0.7.1-test.patch
new file mode 100644
index 00000000000..73e2701b0eb
--- /dev/null
+++ b/dev-python/snakeoil/files/snakeoil-0.7.1-test.patch
@@ -0,0 +1,31 @@
+From 8ee72903bc714725fbcfdcc38b9228772758b890 Mon Sep 17 00:00:00 2001
+From: Tim Harder <radhermit@gmail.com>
+Date: Fri, 27 Jan 2017 11:54:39 -0500
+Subject: [PATCH] test: fix delayed instantiation tests for py3.6
+
+---
+ snakeoil/test/test_obj.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/snakeoil/test/test_obj.py b/snakeoil/test/test_obj.py
+index abcad55..f8aafd2 100644
+--- a/snakeoil/test/test_obj.py
++++ b/snakeoil/test/test_obj.py
+@@ -29,7 +29,7 @@ def test_simple(self):
+ 
+     def test_descriptor_awareness(self):
+         def assertKls(cls, ignores=(),
+-                      default_ignores=("__new__", "__init__",
++                      default_ignores=("__new__", "__init__", "__init_subclass__",
+                                        "__getattribute__", "__class__",
+                                        "__getnewargs__", "__doc__")):
+             required = set(x for x in dir(cls)
+@@ -53,7 +53,7 @@ def test_BaseDelayedObject(self):
+         # assert that all methods/descriptors of object
+         # are covered via the base.
+         o = set(dir(object)).difference("__%s__" % x for x in [
+-            "class", "getattribute", "new", "init", "doc"])
++            "class", "getattribute", "new", "init", "init_subclass", "doc"])
+         diff = o.difference(obj.base_kls_descriptors)
+         self.assertFalse(diff, msg=(
+             "base delayed instantiation class should cover all of object, but "

diff --git a/dev-python/snakeoil/snakeoil-0.7.1.ebuild b/dev-python/snakeoil/snakeoil-0.7.1.ebuild
index c5e27b4fbea..080b0c89c38 100644
--- a/dev-python/snakeoil/snakeoil-0.7.1.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
@@ -22,6 +22,10 @@ SLOT="0"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
+PATCHES=(
+	"${FILESDIR}/${P}-test.patch"
+)
+
 python_configure_all() {
 	# disable snakeoil 2to3 caching
 	unset PY2TO3_CACHEDIR

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

[Michał Górny]

commit:     4b3dc2328e3f321e94050640875505ab66cd9d7c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 30 06:44:25 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 30 07:12:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3dc232

dev-python/snakeoil: Port to py39

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../snakeoil/files/snakeoil-0.8.8-py39.patch       | 28 ++++++++++++++++++++++
 dev-python/snakeoil/snakeoil-0.8.8.ebuild          |  6 ++++-
 dev-python/snakeoil/snakeoil-9999.ebuild           |  2 +-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/dev-python/snakeoil/files/snakeoil-0.8.8-py39.patch b/dev-python/snakeoil/files/snakeoil-0.8.8-py39.patch
new file mode 100644
index 00000000000..dbda88bd588
--- /dev/null
+++ b/dev-python/snakeoil/files/snakeoil-0.8.8-py39.patch
@@ -0,0 +1,28 @@
+From eeb1f45216eced42b386d6ea65eadc49798c7174 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 28 May 2020 14:00:34 +0200
+Subject: [PATCH] test_obj: Ignore __class_getitem__
+
+Ignore __class_getitem__ special that was added to some stdlib objects
+in Python 3.9.  It is used as part of type declarations.
+---
+ tests/module/test_obj.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/module/test_obj.py b/tests/module/test_obj.py
+index 03b100c..43c5c47 100644
+--- a/tests/module/test_obj.py
++++ b/tests/module/test_obj.py
+@@ -23,7 +23,8 @@ class TestDelayedInstantiation:
+         def assertKls(cls, ignores=(),
+                       default_ignores=("__new__", "__init__", "__init_subclass__",
+                                        "__getattribute__", "__class__",
+-                                       "__getnewargs__", "__doc__")):
++                                       "__getnewargs__", "__doc__",
++                                       "__class_getitem__")):
+             required = set(x for x in dir(cls)
+                            if x.startswith("__") and x.endswith("__"))
+             missing = required.difference(obj.kls_descriptors)
+-- 
+2.26.2
+

diff --git a/dev-python/snakeoil/snakeoil-0.8.8.ebuild b/dev-python/snakeoil/snakeoil-0.8.8.ebuild
index c762561aef9..72c91229bc3 100644
--- a/dev-python/snakeoil/snakeoil-0.8.8.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.8.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
@@ -27,6 +27,10 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 "
 [[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-py39.patch
+)
+
 python_test() {
 	esetup.py test
 }

diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index 1b7261487c4..68c9d150960 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1