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

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

[Marek Szuba]

commit:     8330d6312f5833d9c20b8447d1759501107434e5
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 19:05:25 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu May 13 19:09:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8330d631

dev-python/vdf: support python3_10

Had to be patched to import ABCs from collections.abc rather than
collections directly (deprecated since 3.3, originally scheduled to be
disallowed in 3.9, eventually stopped working in 3.10), with that taken
care of builds, tests and installs fine.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 dev-python/vdf/files/vdf-3.3-collections_abc.patch | 11 +++++++++++
 dev-python/vdf/vdf-3.3.ebuild                      |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dev-python/vdf/files/vdf-3.3-collections_abc.patch b/dev-python/vdf/files/vdf-3.3-collections_abc.patch
new file mode 100644
index 00000000000..22c64760168
--- /dev/null
+++ b/dev-python/vdf/files/vdf-3.3-collections_abc.patch
@@ -0,0 +1,11 @@
+--- a/vdf/vdict.py
++++ b/vdf/vdict.py
+@@ -5,7 +5,7 @@
+     _iter_values = 'values'
+     _range = range
+     _string_type = str
+-    import collections as _c
++    import collections.abc as _c
+     class _kView(_c.KeysView):
+         def __iter__(self):
+             return self._mapping.iterkeys()

diff --git a/dev-python/vdf/vdf-3.3.ebuild b/dev-python/vdf/vdf-3.3.ebuild
index b0147e4aab7..d4f3fdcce98 100644
--- a/dev-python/vdf/vdf-3.3.ebuild
+++ b/dev-python/vdf/vdf-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -17,6 +17,7 @@ KEYWORDS="amd64"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2-mock_from_stdlib.patch
+	"${FILESDIR}"/${PN}-3.3-collections_abc.patch
 )
 
 distutils_enable_tests pytest

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

[Marek Szuba]

commit:     ab52b47db5b7935c74d99d588bcf60c9284fa1ec
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 23 08:57:35 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jun 23 09:15:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab52b47d

dev-python/vdf: drop 3.3

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 dev-python/vdf/Manifest                            |  1 -
 .../vdf/files/vdf-3.2-mock_from_stdlib.patch       |  9 ---------
 dev-python/vdf/files/vdf-3.3-collections_abc.patch | 11 -----------
 dev-python/vdf/vdf-3.3.ebuild                      | 23 ----------------------
 4 files changed, 44 deletions(-)

diff --git a/dev-python/vdf/Manifest b/dev-python/vdf/Manifest
index 2ac463c4196..0007d605882 100644
--- a/dev-python/vdf/Manifest
+++ b/dev-python/vdf/Manifest
@@ -1,2 +1 @@
-DIST vdf-3.3.tar.gz 15799 BLAKE2B 48e12d6456f776ae7bf3a3dfec3bbe49f6089ce57720f4ab7beec7502604da290018c7af75f7bb58b1d8a25dc44daea7e028f70d75f7eecdaa9277e9f75a6fd0 SHA512 10b944ff88313001cdfd416b04f13daa7350aad75d3f790b6562cd3953fb5adebf7a0b54be24d853d68eb7ef2b8b469569ed37b3aafb0a2f4d0c6caa6816335f
 DIST vdf-3.4.tar.gz 17082 BLAKE2B f4f65134d5b1b5e52fcbc438b3bfd9000006659d8198e37e377edfda1c6166df0687ce44caf704feffeaa0d23356fffbfce11d467a093e8eb623ccb39a3da9d0 SHA512 a22668039d32cb1ef4660ea187a3a144a32e55e5b02c4c567b850d059a47beac111f9164c67bbe3e7b67d15117efe7b207882465b2353a65b7e0f0c107e88d5c

diff --git a/dev-python/vdf/files/vdf-3.2-mock_from_stdlib.patch b/dev-python/vdf/files/vdf-3.2-mock_from_stdlib.patch
deleted file mode 100644
index 511e5dd1ddc..00000000000
--- a/dev-python/vdf/files/vdf-3.2-mock_from_stdlib.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/tests/test_vdf.py
-+++ b/tests/test_vdf.py
-@@ -1,5 +1,5 @@
- import unittest
--import mock
-+import unittest.mock as mock
- import sys
- 
- try:

diff --git a/dev-python/vdf/files/vdf-3.3-collections_abc.patch b/dev-python/vdf/files/vdf-3.3-collections_abc.patch
deleted file mode 100644
index 22c64760168..00000000000
--- a/dev-python/vdf/files/vdf-3.3-collections_abc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/vdf/vdict.py
-+++ b/vdf/vdict.py
-@@ -5,7 +5,7 @@
-     _iter_values = 'values'
-     _range = range
-     _string_type = str
--    import collections as _c
-+    import collections.abc as _c
-     class _kView(_c.KeysView):
-         def __iter__(self):
-             return self._mapping.iterkeys()

diff --git a/dev-python/vdf/vdf-3.3.ebuild b/dev-python/vdf/vdf-3.3.ebuild
deleted file mode 100644
index d4f3fdcce98..00000000000
--- a/dev-python/vdf/vdf-3.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A module for (de)serialization to and from VDF, Valve's key-value text format"
-HOMEPAGE="https://github.com/ValvePython/vdf"
-SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-mock_from_stdlib.patch
-	"${FILESDIR}"/${PN}-3.3-collections_abc.patch
-)
-
-distutils_enable_tests pytest