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

2022-06-19 Thread Sam James
commit: de25b99f222003cc373e990ed62f6e5fc55dddc7
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 20 03:11:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 20 03:11:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de25b99f

dev-python/dicttoxml: treeclean

Bug: https://bugs.gentoo.org/846788
Signed-off-by: Sam James  gentoo.org>

 dev-python/dicttoxml/Manifest  |  1 -
 dev-python/dicttoxml/dicttoxml-1.7.4-r3.ebuild | 22 
 .../dicttoxml/files/dicttoxml-1.7.4-py3.10.patch   | 58 --
 dev-python/dicttoxml/metadata.xml  | 17 ---
 profiles/package.mask  |  6 ---
 5 files changed, 104 deletions(-)

diff --git a/dev-python/dicttoxml/Manifest b/dev-python/dicttoxml/Manifest
deleted file mode 100644
index 4a7bb4a80d19..
--- a/dev-python/dicttoxml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dicttoxml-1.7.4.tar.gz 18190 BLAKE2B 
e8fd4974cbd9e83b72c25f28fa5595421be88ed5fbb1e64721280c4ead3003f95c98c7b4f12bced926f0c4af31b30dd76ddd49ddf297fa5f68eeb466d042ede6
 SHA512 
91abcf2b9b248717618e9fc1c8694e881b9deaa16438dd4674f94a22b4aabfdab3b13f95c3d44a60577d49eca82fb268f59b33d1312cf5388bdaf949a2865cbf

diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4-r3.ebuild 
b/dev-python/dicttoxml/dicttoxml-1.7.4-r3.ebuild
deleted file mode 100644
index e9afd3ab5d7c..
--- a/dev-python/dicttoxml/dicttoxml-1.7.4-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts a Python dictionary or other data type to a valid XML 
string"
-HOMEPAGE="https://github.com/quandyfactory/dicttoxml 
https://pypi.org/project/dicttoxml/;
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-PATCHES=(
-   # https://github.com/quandyfactory/dicttoxml/pull/73/files
-   "${FILESDIR}/${P}-py3.10.patch"
-)

diff --git a/dev-python/dicttoxml/files/dicttoxml-1.7.4-py3.10.patch 
b/dev-python/dicttoxml/files/dicttoxml-1.7.4-py3.10.patch
deleted file mode 100644
index 5b3fe172949e..
--- a/dev-python/dicttoxml/files/dicttoxml-1.7.4-py3.10.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2b7b4522b7255fbc8f1e04304d2e440d333909d5 Mon Sep 17 00:00:00 2001
-From: Kier von Konigslow 
-Date: Sat, 28 Dec 2019 14:08:46 -0500
-Subject: [PATCH] Fix deprecation with collections abc
-

- dicttoxml.py | 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/dicttoxml.py b/dicttoxml.py
-index ae1384a..5d2dd54 100755
 a/dicttoxml.py
-+++ b/dicttoxml.py
-@@ -15,7 +15,7 @@
- version = __version__
- 
- from random import randint
--import collections
-+import collections.abc
- import numbers
- import logging
- from xml.dom.minidom import parseString
-@@ -96,7 +96,7 @@ def get_xml_type(val):
- return 'null'
- if isinstance(val, dict):
- return 'dict'
--if isinstance(val, collections.Iterable):
-+if isinstance(val, collections.abc.Iterable):
- return 'list'
- return type(val).__name__
- 
-@@ -188,7 +188,7 @@ def convert(obj, ids, attr_type, item_func, cdata, 
parent='root'):
- if isinstance(obj, dict):
- return convert_dict(obj, ids, parent, attr_type, item_func, cdata)
- 
--if isinstance(obj, collections.Iterable):
-+if isinstance(obj, collections.abc.Iterable):
- return convert_list(obj, ids, parent, attr_type, item_func, cdata)
- 
- raise TypeError('Unsupported data type: %s (%s)' % (obj, 
type(obj).__name__))
-@@ -232,7 +232,7 @@ def convert_dict(obj, ids, parent, attr_type, item_func, 
cdata):
- )
- )
- 
--elif isinstance(val, collections.Iterable):
-+elif isinstance(val, collections.abc.Iterable):
- if attr_type:
- attr['type'] = get_xml_type(val)
- addline('<%s%s>%s' % (
-@@ -295,7 +295,7 @@ def convert_list(items, ids, parent, attr_type, item_func, 
cdata):
- )
- )
- 
--elif isinstance(item, collections.Iterable):
-+elif isinstance(item, collections.abc.Iterable):
- if not attr_type:
- addline('<%s %s>%s' % (
- item_name, make_attrstring(attr), 

diff --git a/dev-python/dicttoxml/metadata.xml 
b/dev-python/dicttoxml/metadata.xml
deleted file mode 100644
index 7834b72e5bb3..
--- a/dev-python/dicttoxml/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-  
-chutz...@gentoo.org
-Patrick McLean
-  
-  
-pyt...@gentoo.org
-Python
-  
-  
-  
-dicttoxml
-quandyfactory/dicttoxml
-  
-

diff --git a/profiles/package.mask 

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

2021-08-23 Thread Louis Sautier
commit: 27c3aaec24b9f604673bf84e6cafb7d50d0de8fa
Author: Louis Sautier  gentoo  org>
AuthorDate: Mon Aug 23 22:29:51 2021 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Mon Aug 23 22:44:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c3aaec

dev-python/dicttoxml: enable py3.10

Signed-off-by: Louis Sautier  gentoo.org>

 dev-python/dicttoxml/dicttoxml-1.7.4-r2.ebuild | 22 
 .../dicttoxml/files/dicttoxml-1.7.4-py3.10.patch   | 58 ++
 2 files changed, 80 insertions(+)

diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4-r2.ebuild 
b/dev-python/dicttoxml/dicttoxml-1.7.4-r2.ebuild
new file mode 100644
index 000..a6882bd1903
--- /dev/null
+++ b/dev-python/dicttoxml/dicttoxml-1.7.4-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Converts a Python dictionary or other data type to a valid XML 
string"
+HOMEPAGE="https://github.com/quandyfactory/dicttoxml 
https://pypi.org/project/dicttoxml/;
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+PATCHES=(
+   # https://github.com/quandyfactory/dicttoxml/pull/73/files
+   "${FILESDIR}/${P}-py3.10.patch"
+)

diff --git a/dev-python/dicttoxml/files/dicttoxml-1.7.4-py3.10.patch 
b/dev-python/dicttoxml/files/dicttoxml-1.7.4-py3.10.patch
new file mode 100644
index 000..5b3fe172949
--- /dev/null
+++ b/dev-python/dicttoxml/files/dicttoxml-1.7.4-py3.10.patch
@@ -0,0 +1,58 @@
+From 2b7b4522b7255fbc8f1e04304d2e440d333909d5 Mon Sep 17 00:00:00 2001
+From: Kier von Konigslow 
+Date: Sat, 28 Dec 2019 14:08:46 -0500
+Subject: [PATCH] Fix deprecation with collections abc
+
+---
+ dicttoxml.py | 10 +-
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/dicttoxml.py b/dicttoxml.py
+index ae1384a..5d2dd54 100755
+--- a/dicttoxml.py
 b/dicttoxml.py
+@@ -15,7 +15,7 @@
+ version = __version__
+ 
+ from random import randint
+-import collections
++import collections.abc
+ import numbers
+ import logging
+ from xml.dom.minidom import parseString
+@@ -96,7 +96,7 @@ def get_xml_type(val):
+ return 'null'
+ if isinstance(val, dict):
+ return 'dict'
+-if isinstance(val, collections.Iterable):
++if isinstance(val, collections.abc.Iterable):
+ return 'list'
+ return type(val).__name__
+ 
+@@ -188,7 +188,7 @@ def convert(obj, ids, attr_type, item_func, cdata, 
parent='root'):
+ if isinstance(obj, dict):
+ return convert_dict(obj, ids, parent, attr_type, item_func, cdata)
+ 
+-if isinstance(obj, collections.Iterable):
++if isinstance(obj, collections.abc.Iterable):
+ return convert_list(obj, ids, parent, attr_type, item_func, cdata)
+ 
+ raise TypeError('Unsupported data type: %s (%s)' % (obj, 
type(obj).__name__))
+@@ -232,7 +232,7 @@ def convert_dict(obj, ids, parent, attr_type, item_func, 
cdata):
+ )
+ )
+ 
+-elif isinstance(val, collections.Iterable):
++elif isinstance(val, collections.abc.Iterable):
+ if attr_type:
+ attr['type'] = get_xml_type(val)
+ addline('<%s%s>%s' % (
+@@ -295,7 +295,7 @@ def convert_list(items, ids, parent, attr_type, item_func, 
cdata):
+ )
+ )
+ 
+-elif isinstance(item, collections.Iterable):
++elif isinstance(item, collections.abc.Iterable):
+ if not attr_type:
+ addline('<%s %s>%s' % (
+ item_name, make_attrstring(attr),