From a10e2cf24faeabac05de775c911cf866e1e12e10 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Wed, 27 Jan 2021 18:51:38 +0000 Subject: Updating liguros repo --- .../grpcio-tools/files/setup.py-respect-cc.patch | 14 ---- dev-python/grpcio/files/setup.py-respect-cc.patch | 33 --------- dev-python/pid/files/pid-2.2.5-fix_tests.patch | 31 -------- dev-python/pocketlint/pocketlint-0.20.ebuild | 2 +- dev-python/polib/polib-1.1.0-r1.ebuild | 2 +- ...ython-3.8-fixes-for-endpoint-and-tests-37.patch | 84 ---------------------- ...sonrpc-server-0.3.4-remove-pytest-cov-dep.patch | 15 ---- dev-python/sudsds/metadata.xml | 2 +- dev-python/sudsds/sudsds-1.0.1-r1.ebuild | 20 ++++++ dev-python/sudsds/sudsds-1.0.1-r2.ebuild | 21 ------ 10 files changed, 23 insertions(+), 201 deletions(-) delete mode 100644 dev-python/grpcio-tools/files/setup.py-respect-cc.patch delete mode 100644 dev-python/grpcio/files/setup.py-respect-cc.patch delete mode 100644 dev-python/pid/files/pid-2.2.5-fix_tests.patch delete mode 100644 dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch delete mode 100644 dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch create mode 100644 dev-python/sudsds/sudsds-1.0.1-r1.ebuild delete mode 100644 dev-python/sudsds/sudsds-1.0.1-r2.ebuild (limited to 'dev-python') diff --git a/dev-python/grpcio-tools/files/setup.py-respect-cc.patch b/dev-python/grpcio-tools/files/setup.py-respect-cc.patch deleted file mode 100644 index 029f96489686..000000000000 --- a/dev-python/grpcio-tools/files/setup.py-respect-cc.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/setup.py 2020-06-08 00:11:23.457959701 -0700 -+++ b/setup.py 2020-06-08 00:11:54.384652323 -0700 -@@ -68,9 +68,10 @@ - - def check_linker_need_libatomic(): - """Test if linker on system needs libatomic.""" -+ cc = os.environ.get('CC', 'cc') - code_test = (b'#include \n' + - b'int main() { return std::atomic{}; }') -- cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'], -+ cc_test = subprocess.Popen([cc, '-x', 'c++', '-std=c++11', '-'], - stdin=PIPE, - stdout=PIPE, - stderr=PIPE) diff --git a/dev-python/grpcio/files/setup.py-respect-cc.patch b/dev-python/grpcio/files/setup.py-respect-cc.patch deleted file mode 100644 index 545346e8152e..000000000000 --- a/dev-python/grpcio/files/setup.py-respect-cc.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0a6c58fc0161e697bbf64b4f3d4ef14b03ac186b Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev -Date: Sun, 7 Jun 2020 23:35:31 -0700 -Subject: [PATCH] setup.py: respect CC variable in latomic test - -some configurations do not provide generic cc binary. -while rest of the build calls CHOST prefixed binaries, -this check fails. fix it. - -Signed-off-by: Georgy Yakovlev ---- - setup.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 2379703eb7..0f92270607 100644 ---- a/setup.py -+++ b/setup.py -@@ -144,9 +144,10 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get( - - def check_linker_need_libatomic(): - """Test if linker on system needs libatomic.""" -+ cc = os.environ.get('CC', 'cc') - code_test = (b'#include \n' + - b'int main() { return std::atomic{}; }') -- cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'], -+ cc_test = subprocess.Popen([cc, '-x', 'c++', '-std=c++11', '-'], - stdin=PIPE, - stdout=PIPE, - stderr=PIPE) --- -2.27.0 - diff --git a/dev-python/pid/files/pid-2.2.5-fix_tests.patch b/dev-python/pid/files/pid-2.2.5-fix_tests.patch deleted file mode 100644 index 3184e631ee77..000000000000 --- a/dev-python/pid/files/pid-2.2.5-fix_tests.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/tests/test_pid.py b/tests/test_pid.py -index 28fda19..99e2a29 100644 ---- a/tests/test_pid.py -+++ b/tests/test_pid.py -@@ -170,13 +170,13 @@ def test_pid_already_locked_custom_name(): - def test_pid_already_locked_multi_process(): - with pid.PidFile() as _pid: - s = ''' --import pid --with pid.PidFile("pytest", piddir="/tmp"): -+import os, pid, sys -+with pid.PidFile(os.path.basename(sys.argv[0]), piddir="/tmp"): - pass - ''' -- result = run(['python', '-c', s]) -+ result = run([sys.executable, '-c', s]) - returncode = result if isinstance(result, int) else result.returncode -- assert returncode == 1 -+ assert returncode == 0 - assert os.path.exists(_pid.filename) - assert not os.path.exists(_pid.filename) - -@@ -189,7 +189,7 @@ with pid.PidFile("pytest2", piddir="/tmp") as _pid: - assert os.path.exists(_pid.filename) - assert not os.path.exists(_pid.filename) - ''' -- result = run(['python', '-c', s]) -+ result = run([sys.executable, '-c', s]) - returncode = result if isinstance(result, int) else result.returncode - assert returncode == 0 - assert os.path.exists(_pid.filename) diff --git a/dev-python/pocketlint/pocketlint-0.20.ebuild b/dev-python/pocketlint/pocketlint-0.20.ebuild index 5993ede4e71a..543fff816148 100644 --- a/dev-python/pocketlint/pocketlint-0.20.ebuild +++ b/dev-python/pocketlint/pocketlint-0.20.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/dev-python/polib/polib-1.1.0-r1.ebuild b/dev-python/polib/polib-1.1.0-r1.ebuild index 33ff8e429e20..7ac2ce5c72e6 100644 --- a/dev-python/polib/polib-1.1.0-r1.ebuild +++ b/dev-python/polib/polib-1.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch deleted file mode 100644 index 8d597ddda03f..000000000000 --- a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 7987e30c99edddab8acbf567bad0ebf2d1c3381d Mon Sep 17 00:00:00 2001 -From: Ben Greiner -Date: Mon, 17 Aug 2020 21:28:03 +0200 -Subject: [PATCH] Python 3.8 fixes for endpoint and tests (#37) - -* fix endpoint exception lists for Python 3.8 -Author: @maximbaz according to #33 - -* fix test_writer_bad_message -not only windows can have problems with serializing datetime - -Co-authored-by: Carlos Cordoba -Co-authored-by: Marko Bakovic ---- - pyls_jsonrpc/endpoint.py | 1 + - test/test_endpoint.py | 4 ++-- - test/test_streams.py | 19 +++++++++---------- - 3 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/pyls_jsonrpc/endpoint.py b/pyls_jsonrpc/endpoint.py -index e8bfb5b..0caf612 100644 ---- a/pyls_jsonrpc/endpoint.py -+++ b/pyls_jsonrpc/endpoint.py -@@ -236,6 +236,7 @@ class Endpoint(object): - if error is not None: - log.debug("Received error response to message %s: %s", msg_id, error) - request_future.set_exception(JsonRpcException.from_dict(error)) -+ return - - log.debug("Received result for message %s: %s", msg_id, result) - request_future.set_result(result) -diff --git a/test/test_endpoint.py b/test/test_endpoint.py -index 47a038b..b954732 100644 ---- a/test/test_endpoint.py -+++ b/test/test_endpoint.py -@@ -115,9 +115,9 @@ def test_request_cancel(endpoint, consumer): - 'params': {'id': MSG_ID} - }) - -- with pytest.raises(exceptions.JsonRpcException) as exc_info: -+ with pytest.raises((exceptions.JsonRpcException, futures.CancelledError)) as exc_info: - assert future.result(timeout=2) -- assert exc_info.type == exceptions.JsonRpcRequestCancelled -+ assert exc_info.type in (exceptions.JsonRpcRequestCancelled, futures.CancelledError) - - - def test_consume_notification(endpoint, dispatcher): -diff --git a/test/test_streams.py b/test/test_streams.py -index 8c2e93e..480a73b 100644 ---- a/test/test_streams.py -+++ b/test/test_streams.py -@@ -97,7 +97,8 @@ def test_writer(wfile, writer): - - def test_writer_bad_message(wfile, writer): - # A datetime isn't serializable(or poorly serializable), -- # ensure the write method doesn't throw -+ # ensure the write method doesn't throw, but the result could be empty -+ # or the correct datetime - import datetime - writer.write(datetime.datetime( - year=2019, -@@ -108,12 +109,10 @@ def test_writer_bad_message(wfile, writer): - second=1, - )) - -- if os.name == 'nt': -- assert wfile.getvalue() == b'' -- else: -- assert wfile.getvalue() == ( -- b'Content-Length: 10\r\n' -- b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n' -- b'\r\n' -- b'1546304461' -- ) -+ assert wfile.getvalue() in [ -+ b'', -+ b'Content-Length: 10\r\n' -+ b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n' -+ b'\r\n' -+ b'1546304461' -+ ] --- -2.26.2 - diff --git a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch deleted file mode 100644 index a81919eae4bd..000000000000 --- a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch +++ /dev/null @@ -1,15 +0,0 @@ -pytest-cov is a deprecated dep -diff --git a/setup.cfg b/setup.cfg -index 03b63df..165c746 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -13,9 +13,6 @@ exclude = test/plugins/.ropeproject,test/.ropeproject - - [tool:pytest] - testpaths = test --addopts = -- --cov-report html --cov-report term --junitxml=pytest.xml -- --cov pyls --cov test - - [egg_info] - tag_build = diff --git a/dev-python/sudsds/metadata.xml b/dev-python/sudsds/metadata.xml index c4e7a7e3d49d..a56745df0223 100644 --- a/dev-python/sudsds/metadata.xml +++ b/dev-python/sudsds/metadata.xml @@ -8,5 +8,5 @@ A lightweight SOAP python client for consuming Web Services. Czech NIC labs fork. - calculatelinux-overlay + kit-fixups diff --git a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild new file mode 100644 index 000000000000..054a9f5306c4 --- /dev/null +++ b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} ) + +inherit distutils-r1 + +DESCRIPTION="Lightweight SOAP client - Czech NIC labs fork" +HOMEPAGE="https://labs.nic.cz/page/969/" +SRC_URI="http://www.nic.cz/public_media/datove_schranky/releases/src/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="doc" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="" diff --git a/dev-python/sudsds/sudsds-1.0.1-r2.ebuild b/dev-python/sudsds/sudsds-1.0.1-r2.ebuild deleted file mode 100644 index 3f8cc35cdc97..000000000000 --- a/dev-python/sudsds/sudsds-1.0.1-r2.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} ) - -DISTUTILS_USE_SETUPTOOLS=manual -inherit distutils-r1 - -DESCRIPTION="Lightweight SOAP client - Czech NIC labs fork" -HOMEPAGE="https://labs.nic.cz/page/969/" -SRC_URI="http://www.nic.cz/public_media/datove_schranky/releases/src/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc" - -DEPEND="dev-python/setuptools-python2[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" -- cgit v1.3.1