diff options
Diffstat (limited to 'dev-python/ioflo')
-rw-r--r-- | dev-python/ioflo/Manifest | 8 | ||||
-rw-r--r-- | dev-python/ioflo/files/ioflo-1.7.8-network-test.patch | 32 | ||||
-rw-r--r-- | dev-python/ioflo/files/ioflo-2.0.2-py310.patch | 51 | ||||
-rw-r--r-- | dev-python/ioflo/files/ioflo-2.0.2-python39.patch | 131 | ||||
-rw-r--r-- | dev-python/ioflo/files/ioflo-2.0.2-tests.patch | 29 | ||||
-rw-r--r-- | dev-python/ioflo/ioflo-2.0.2-r4.ebuild | 37 | ||||
-rw-r--r-- | dev-python/ioflo/ioflo-2.0.3.ebuild | 2 |
7 files changed, 2 insertions, 288 deletions
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest index 02d3381fa956..cae7cc937740 100644 --- a/dev-python/ioflo/Manifest +++ b/dev-python/ioflo/Manifest @@ -1,9 +1,3 @@ -AUX ioflo-1.7.8-network-test.patch 1090 BLAKE2B 37e6125a3d26b902e3938efe49162c6e9e1beece8960fe035255e79673bd8920f3ca5dee90595accd8dc8883f63727985060e3f8c3d357333065ef1b738b62fa SHA512 76ebc002679a656b21e0e8adbfa46552172392c691db1a39320320a9b0e1261a1bb0fa9058bac0063027b3b56bffa9bfcb1d8dc0b37d232971209123d2ff8aca -AUX ioflo-2.0.2-py310.patch 2520 BLAKE2B fbb1b8b5d1d2d135abb21f7f2ff094d4c85bf4d8c005981356b13cca2860230542ab6b3c12f553feb84415be901c2a4660847561854cb6c86edb3a2c31ca84d2 SHA512 0917a402063453e5cbadf3cc830d0ec986c1abb7222af1a60aedd45264ed8a06eef6e27ff20ee6f9575752bcf5a18282518ed6368b3b0b7137108e4084718f7f -AUX ioflo-2.0.2-python39.patch 3813 BLAKE2B a21f5829b5a2fd4200350949d66d4fd77f5ba2b21d5fdb95c7754745fc2cf41f18640d4c79f5e1037fc0d4ca016c7dac062567aa8662b0e41e702e4dd0a94931 SHA512 b588703d653848401fb8e13be949f6de4ff41143eae669ccdcae8edaaac1883be0a684112dacfdf11fa3f2842dbde0dce2b47a7680cb87761d30ffa4018569e8 -AUX ioflo-2.0.2-tests.patch 1059 BLAKE2B a093cf0db0e00c4f06f0eeda76acee4515951e0dca1a77688e2cd4ccc33a3b10402228d76aa25f787cbfa8771d12f0613fe62e5fa38e09b6d8238870c2b25951 SHA512 5642963e6c29941c2803c6833d229b9fab62f60e7534fb6bfd7a101746eff1704dcfe3bdbbc72bfb466317562d995ede5a70a8ffc83ae9e76ab2d9c01bcab349 -DIST ioflo-2.0.2.gh.tar.gz 837382 BLAKE2B 1fe878c8a9a47a9be5083e392e15256f1a566433b4341e2ee234e84332bb72af0c426d04c77ccace33cfb05664745caaa63e910913c3d63bbb2e5d8360a1ec90 SHA512 7485924ce329889afb1c3e0555b54fdbfb11eafce48fb0ac15bacd229fea512c44fcc118bbc4368ebc7c770d62129ee6b895b982f73a269de7131ea37daac02b DIST ioflo-2.0.3.gh.tar.gz 837379 BLAKE2B c10105c9ccff5377d14182fdecce293b213a180da1ce3214c1797c43bd36c0e322ee004505d09dac0ebf8875bcc4beb30da32f6a41bf702cf45c84a5a7819167 SHA512 b2d8c0a2504df87366b373d40d2536d6a75bc682aa72aaa20235893eed4725acf027fecf7263395a38141314d3b24435939f3e69db8f8bd8bc56ca8038b9ed8a -EBUILD ioflo-2.0.2-r4.ebuild 841 BLAKE2B 49fd7728fc8cdc13aa20a14d20a4a1246774dd8f4c5ee6d1802a3ad0876c88dc49893d3b70962a3d532243d55bf51d8cfdfb9901d2b18678e5badb2b54683d19 SHA512 77459bb0f054c4c08163a066f3ec963720a795f9cd0a0f5ebbe6683e4bb858b45eeb95d6667b028ec5c06da284209bf8ba63ab9dfefe6486eb79894b51fea73d -EBUILD ioflo-2.0.3.ebuild 1053 BLAKE2B 7edb5ab839e75fcb0bc8724317827c9c6e9154155ed84b64ebf642311e35a484b34f47044ba2e185762499a2efa0dceb74cff4e9beb89d1441ad0d2c82c25bf8 SHA512 33330f192004e11573a1c723c3e23c71e018e3dd4b5d224f5c07649ecda31a25c9705ca0f3154ce32f0d147b8e8363eb5bdfd9987c97064f330f7acebbf66d37 +EBUILD ioflo-2.0.3.ebuild 1050 BLAKE2B 8c4313415bbb8aed65837f4e366aaff90338674ac3d2e4b911cee52a1fbe92815b0ff4539660435183825205439d62166624a06edd5e7f4ed4e816406c096631 SHA512 87e071ad125d2a404733d3128f352f150cff800d7876ae7ca234ac9257a5ed911057ee62ebc3c599f02b401e26375331f3640593f076a56fa4a1f4e6078f203b MISC metadata.xml 494 BLAKE2B dc398c0ee508c0c1cf9ee17712efcbf7f994ed053416da6bdd236fe80402b80ce251272824bebbdcc7ea79cf98b6b5dd812de11fca55eb625bf19e5cf93228e3 SHA512 7364c6b7a37dd8ed762fc7d609e71ff93cd3321f6f94f88d795bd0a3082749571644cbdfd3c9d63a916249122fdfb47ff5377907159782ddf5744c5ea4a13f39 diff --git a/dev-python/ioflo/files/ioflo-1.7.8-network-test.patch b/dev-python/ioflo/files/ioflo-1.7.8-network-test.patch deleted file mode 100644 index 32c7f51298ce..000000000000 --- a/dev-python/ioflo/files/ioflo-1.7.8-network-test.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/ioflo/aio/udp/test/test_udping.py b/ioflo/aio/udp/test/test_udping.py -index 9aefdf0..ec44721 100644 ---- a/ioflo/aio/udp/test/test_udping.py -+++ b/ioflo/aio/udp/test/test_udping.py -@@ -122,6 +122,7 @@ class BasicTestCase(unittest.TestCase): - shutil.rmtree(tempDirpath) - console.reinit(verbosity=console.Wordage.concise) - -+ @unittest.skip("needs network access") - def testBroadcast(self): - """ - Test Class SocketUdpNb -diff --git a/ioflo/base/test/test_logging.py b/ioflo/base/test/test_logging.py -index 0b8ce13..b64d469 100644 ---- a/ioflo/base/test/test_logging.py -+++ b/ioflo/base/test/test_logging.py -@@ -33,6 +33,7 @@ def tearDownModule(): - console.reinit(verbosity=console.Wordage.concise) - - -+@unittest.skip("needs network access") - class LoggerTestCase(testing.LoggerIofloTestCase): - """ - Example TestCase -@@ -927,6 +928,7 @@ class LoggerTestCase(testing.LoggerIofloTestCase): - pass - - -+@unittest.skip("needs network access") - class HouseTestCase(testing.HouseIofloTestCase): - """ - Example TestCase diff --git a/dev-python/ioflo/files/ioflo-2.0.2-py310.patch b/dev-python/ioflo/files/ioflo-2.0.2-py310.patch deleted file mode 100644 index 7effeeb57811..000000000000 --- a/dev-python/ioflo/files/ioflo-2.0.2-py310.patch +++ /dev/null @@ -1,51 +0,0 @@ -commit 2961d846dd250334b8fc52c2ef4c00ebc36ed510 -Author: Felix Yan <felixonmars@archlinux.org> -Date: Fri Nov 20 04:42:02 2020 +0800 - - Fix compatibility with Python 3.9 - - json.loads() removed encoding parameter - (https://bugs.python.org/issue39377) - It was a no-op since 3.1. - -diff --git a/ioflo/aio/http/clienting.py b/ioflo/aio/http/clienting.py -index 11132e3..967570e 100644 ---- a/ioflo/aio/http/clienting.py -+++ b/ioflo/aio/http/clienting.py -@@ -268,13 +268,13 @@ class Requester(object): - '\r\n{2}'.format(boundary, key, val)) - formParts.append('\r\n--{0}--'.format(boundary)) - form = "".join(formParts) -- body = form.encode(encoding='utf-8') -+ body = form.encode('utf-8') - self.headers[u'content-type'] = u'multipart/form-data; boundary={0}'.format(boundary) - else: - formParts = [u"{0}={1}".format(key, val) for key, val in self.fargs.items()] - form = u'&'.join(formParts) - form = quote_plus(form, '&=') -- body = form.encode(encoding='utf-8') -+ body = form.encode('utf-8') - self.headers[u'content-type'] = u'application/x-www-form-urlencoded; charset=utf-8' - else: # body last in precendence - body = self.body -diff --git a/ioflo/aio/http/httping.py b/ioflo/aio/http/httping.py -index ba604e7..a22cc84 100644 ---- a/ioflo/aio/http/httping.py -+++ b/ioflo/aio/http/httping.py -@@ -746,7 +746,7 @@ class EventSource(object): - if edata: # data so dispatch event by appending to .events - if self.dictable: - try: -- ejson = json.loads(edata, encoding='utf-8', object_pairs_hook=odict) -+ ejson = json.loads(edata, object_pairs_hook=odict) - except ValueError as ex: - ejson = None - else: # valid json set edata to ejson -@@ -1058,7 +1058,6 @@ class Parsent(object): - if self.jsoned or self.dictable: # attempt to deserialize json - try: - self.data = json.loads(self.body.decode('utf-8'), -- encoding='utf-8', - object_pairs_hook=odict) - except ValueError as ex: - self.data = None diff --git a/dev-python/ioflo/files/ioflo-2.0.2-python39.patch b/dev-python/ioflo/files/ioflo-2.0.2-python39.patch deleted file mode 100644 index dca7d54850b6..000000000000 --- a/dev-python/ioflo/files/ioflo-2.0.2-python39.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff --git a/ioflo/aid/aiding.py b/ioflo/aid/aiding.py -index 6840d07..525b311 100644 ---- a/ioflo/aid/aiding.py -+++ b/ioflo/aid/aiding.py -@@ -135,7 +135,7 @@ def nameToPath(name): - return path - - def isPath(s): -- """Returns True if string s is valid Store path name -+ r"""Returns True if string s is valid Store path name - Returns False otherwise - - Faster to use precompiled versions in base -@@ -201,7 +201,7 @@ def isPath(s): - return False - - def isIdentifier(s): -- """Returns True if string s is valid python identifier (variable, attribute etc) -+ r"""Returns True if string s is valid python identifier (variable, attribute etc) - Returns False otherwise - - how to determine if string is valid python identifier -diff --git a/ioflo/aid/classing.py b/ioflo/aid/classing.py -index 2bd37b5..493f5dc 100644 ---- a/ioflo/aid/classing.py -+++ b/ioflo/aid/classing.py -@@ -5,7 +5,7 @@ meta class and base class utility classes and functions - from __future__ import absolute_import, division, print_function - - import sys --from collections import Iterable, Sequence -+from collections.abc import Iterable, Sequence - from abc import ABCMeta - import functools - import inspect -@@ -123,7 +123,7 @@ def isIterator(obj): - - - --from collections import Generator -+from collections.abc import Generator - - def attributize(genfunc): - """ -diff --git a/ioflo/aid/eventing.py b/ioflo/aid/eventing.py -index 837778b..f76ff0c 100644 ---- a/ioflo/aid/eventing.py -+++ b/ioflo/aid/eventing.py -@@ -7,7 +7,7 @@ from __future__ import absolute_import, division, print_function - import sys - import os - import datetime --from collections import Set # both set and frozen set -+from collections.abc import Set # both set and frozen set - - # Import ioflo libs - from .sixing import * -diff --git a/ioflo/aid/osetting.py b/ioflo/aid/osetting.py -index 6e6fffd..a99a09c 100644 ---- a/ioflo/aid/osetting.py -+++ b/ioflo/aid/osetting.py -@@ -6,11 +6,11 @@ http://code.activestate.com/recipes/576694/ - """ - from __future__ import absolute_import, division, print_function - --import collections -+import collections.abc - - from .sixing import * - --class oset(collections.MutableSet): -+class oset(collections.abc.MutableSet): - """ - Ordered Set, preserves order of entry in set - -diff --git a/ioflo/base/acting.py b/ioflo/base/acting.py -index c4b7bb3..95ad188 100644 ---- a/ioflo/base/acting.py -+++ b/ioflo/base/acting.py -@@ -5,7 +5,8 @@ - - import time - import struct --from collections import deque, Mapping -+from collections import deque -+from collections.abc import Mapping - from functools import wraps - import inspect - import copy -diff --git a/ioflo/base/doing.py b/ioflo/base/doing.py -index 5af023c..c074380 100644 ---- a/ioflo/base/doing.py -+++ b/ioflo/base/doing.py -@@ -3,7 +3,8 @@ doing.py doer module for do verb behaviors - """ - import time - import struct --from collections import deque, Mapping -+from collections import deque -+from collections.abc import Mapping - from functools import wraps - import inspect - import copy -diff --git a/ioflo/base/framing.py b/ioflo/base/framing.py -index 3416289..6a33a35 100644 ---- a/ioflo/base/framing.py -+++ b/ioflo/base/framing.py -@@ -5,7 +5,8 @@ - import sys - - import copy --from collections import deque, Mapping -+from collections import deque -+from collections.abc import Mapping - import uuid - - from ..aid.sixing import * -diff --git a/ioflo/base/logging.py b/ioflo/base/logging.py -index d78a5fa..dca7460 100644 ---- a/ioflo/base/logging.py -+++ b/ioflo/base/logging.py -@@ -10,7 +10,8 @@ import datetime - import copy - import io - --from collections import deque, MutableSequence, MutableMapping, Mapping -+from collections import deque -+from collections.abc import MutableSequence, MutableMapping, Mapping - - from ..aid.sixing import * - from .globaling import * diff --git a/dev-python/ioflo/files/ioflo-2.0.2-tests.patch b/dev-python/ioflo/files/ioflo-2.0.2-tests.patch deleted file mode 100644 index 6003cb374f0d..000000000000 --- a/dev-python/ioflo/files/ioflo-2.0.2-tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/ioflo/aio/tcp/test/test_tcping.py b/ioflo/aio/tcp/test/test_tcping.py -index f78d43f..ea9cc26 100644 ---- a/ioflo/aio/tcp/test/test_tcping.py -+++ b/ioflo/aio/tcp/test/test_tcping.py -@@ -12,6 +12,8 @@ import shutil - import socket - import errno - -+import pytest -+ - from ioflo.aid.sixing import * - from ioflo.aid.consoling import getConsole - from ioflo.aio import wiring -@@ -966,6 +968,7 @@ class BasicTestCase(unittest.TestCase): - wireLogBeta.close() - console.reinit(verbosity=console.Wordage.concise) - -+ @pytest.mark.skip("Broken on modern python versions") - def testTLSConnectionVerifyNeither(self): - """ - Test TLS client server connection with neither verify certs -@@ -1490,6 +1493,7 @@ class BasicTestCase(unittest.TestCase): - wireLogBeta.close() - console.reinit(verbosity=console.Wordage.concise) - -+ @pytest.mark.skip("Broken on modern python versions") - def testTLSConnectionVerifyBothTLSv1(self): - """ - Test TLS client server connection with neither verify certs diff --git a/dev-python/ioflo/ioflo-2.0.2-r4.ebuild b/dev-python/ioflo/ioflo-2.0.2-r4.ebuild deleted file mode 100644 index 335aa9ac4663..000000000000 --- a/dev-python/ioflo/ioflo-2.0.2-r4.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 - -DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework" -HOMEPAGE=" - https://github.com/ioflo/ioflo/ - https://pypi.org/project/ioflo/ -" -SRC_URI=" - https://github.com/ioflo/ioflo/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" - -PATCHES=( - "${FILESDIR}/ioflo-1.7.8-network-test.patch" - "${FILESDIR}/ioflo-2.0.2-python39.patch" - "${FILESDIR}/ioflo-2.0.2-tests.patch" - "${FILESDIR}/ioflo-2.0.2-py310.patch" -) - -distutils_enable_tests pytest - -python_prepare_all() { - sed -e 's:"setuptools_git[^"]*",::' -i setup.py || die - distutils-r1_python_prepare_all -} diff --git a/dev-python/ioflo/ioflo-2.0.3.ebuild b/dev-python/ioflo/ioflo-2.0.3.ebuild index 40e370d56271..b787fa8adcd2 100644 --- a/dev-python/ioflo/ioflo-2.0.3.ebuild +++ b/dev-python/ioflo/ioflo-2.0.3.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~riscv x86" distutils_enable_tests pytest |