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

[Michał Górny]

commit:     46b5dffed4d5d8fff2592c4e9f9a731b8235ff03
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 29 14:11:02 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 30 07:40:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b5dffe

dev-python/deprecated: Port to py39

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

 dev-python/deprecated/deprecated-1.2.10.ebuild     |  7 ++-
 dev-python/deprecated/deprecated-1.2.9.ebuild      |  1 -
 .../deprecated/files/deprecated-1.2.10-py39.patch  | 57 ++++++++++++++++++++++
 3 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/dev-python/deprecated/deprecated-1.2.10.ebuild b/dev-python/deprecated/deprecated-1.2.10.ebuild
index a5088d2c205..b2b1fcd65d1 100644
--- a/dev-python/deprecated/deprecated-1.2.10.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python @deprecated decorator to deprecate old API"
@@ -15,6 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py39.patch
+)

diff --git a/dev-python/deprecated/deprecated-1.2.9.ebuild b/dev-python/deprecated/deprecated-1.2.9.ebuild
index a6bed5059a0..cf3f9570dd6 100644
--- a/dev-python/deprecated/deprecated-1.2.9.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.9.ebuild
@@ -15,6 +15,5 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest

diff --git a/dev-python/deprecated/files/deprecated-1.2.10-py39.patch b/dev-python/deprecated/files/deprecated-1.2.10-py39.patch
new file mode 100644
index 00000000000..42ab81445b7
--- /dev/null
+++ b/dev-python/deprecated/files/deprecated-1.2.10-py39.patch
@@ -0,0 +1,57 @@
+From 629e7b702ede03262afeb86cd7a6d42d739504d2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
+Date: Sat, 30 May 2020 09:30:58 +0200
+Subject: [PATCH] Update expected class method deprecation msgs in tests for
+ py3.9
+
+Python 3.9 has fixed @classmethod combining with other decorators,
+making deprecated correctly report 'class method' (instead of function
+or static method).  Update the tests to account for that.
+
+Fixes #29
+---
+ tests/test_deprecated.py | 6 +++++-
+ tests/test_sphinx.py     | 5 ++++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_deprecated.py b/tests/test_deprecated.py
+index 3796640..e4c00ef 100644
+--- a/tests/test_deprecated.py
++++ b/tests/test_deprecated.py
+@@ -1,4 +1,5 @@
+ # -*- coding: utf-8 -*-
++import sys
+ import warnings
+ 
+ import pytest
+@@ -184,7 +185,10 @@ def test_classic_deprecated_class_method__warns(classic_deprecated_class_method)
+     assert len(warns) == 1
+     warn = warns[0]
+     assert issubclass(warn.category, DeprecationWarning)
+-    assert "deprecated function (or staticmethod)" in str(warn.message)
++    if sys.version_info >= (3, 9):
++        assert "deprecated class method" in str(warn.message)
++    else:
++        assert "deprecated function (or staticmethod)" in str(warn.message)
+     assert warn.filename == __file__, 'Incorrect warning stackLevel'
+ 
+ 
+diff --git a/tests/test_sphinx.py b/tests/test_sphinx.py
+index 42f2460..efc8628 100644
+--- a/tests/test_sphinx.py
++++ b/tests/test_sphinx.py
+@@ -334,7 +334,10 @@ def test_sphinx_deprecated_class_method__warns(sphinx_deprecated_class_method):
+     assert len(warns) == 1
+     warn = warns[0]
+     assert issubclass(warn.category, DeprecationWarning)
+-    assert "deprecated function (or staticmethod)" in str(warn.message)
++    if sys.version_info >= (3, 9):
++        assert "deprecated class method" in str(warn.message)
++    else:
++        assert "deprecated function (or staticmethod)" in str(warn.message)
+ 
+ 
+ def test_should_raise_type_error():
+-- 
+2.26.2
+