From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1171096-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 86D3B1382C5 for <garchives@archives.gentoo.org>; Thu, 14 May 2020 12:39:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACAD7E097E; Thu, 14 May 2020 12:39:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7DBACE097E for <gentoo-commits@lists.gentoo.org>; Thu, 14 May 2020 12:39:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AAD27350B53 for <gentoo-commits@lists.gentoo.org>; Thu, 14 May 2020 12:39:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC831234 for <gentoo-commits@lists.gentoo.org>; Thu, 14 May 2020 12:39:12 +0000 (UTC) From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" <andrewammerlaan@riseup.net> Message-ID: <1589459939.f92b187003eadbd0f2f59e6a0f85e7c8e6f9122b.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-python/aiohttp-cors/files/, dev-python/aiohttp-cors/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-python/aiohttp-cors/Manifest dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-py3_7.patch dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-tests.patch dev-python/aiohttp-cors/metadata.xml X-VCS-Directories: dev-python/aiohttp-cors/files/ dev-python/aiohttp-cors/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: f92b187003eadbd0f2f59e6a0f85e7c8e6f9122b X-VCS-Branch: dev Date: Thu, 14 May 2020 12:39:12 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b9050bcf-de5d-4842-98cd-088dfcaa18a9 X-Archives-Hash: ff47f4f2ef24384ddceed1c37b41fa9d Message-ID: <20200514123912.XyfOqykD438duC3NOFDQwckQPUhorW0RUpeTvPMJ2Ps@z> commit: f92b187003eadbd0f2f59e6a0f85e7c8e6f9122b Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> AuthorDate: Thu May 14 12:38:59 2020 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Thu May 14 12:38:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f92b1870 dev-python: aiohttp-cors moved to ::gentoo Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> dev-python/aiohttp-cors/Manifest | 1 - dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild | 36 ------------ .../files/aiohttp-cors-0.7.0-py3_7.patch | 22 -------- .../files/aiohttp-cors-0.7.0-tests.patch | 66 ---------------------- dev-python/aiohttp-cors/metadata.xml | 8 --- 5 files changed, 133 deletions(-) diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest deleted file mode 100644 index 4912de9..0000000 --- a/dev-python/aiohttp-cors/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST aiohttp-cors-0.7.0.tar.gz 39728 BLAKE2B 747499856272f551cf8e2e0911ff7cbb2c7cb8a1f3159327dd8f0d40cabbbd9713a1a9e30ef9c99f3f9642567c99025e049db837c89f907d6698a27005ac2632 SHA512 72e0b365b952c08a02c1123d7672cfea01063e2ff01743a71e10f804d22178edc0f1c6b7f87b7ed484ca7c24e89a32de90d0d279f2f5c060427319182f9bdd3b diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild deleted file mode 100644 index 4e87a24..0000000 --- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit distutils-r1 - -DESCRIPTION="Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server" -HOMEPAGE="https://github.com/aio-libs/aiohttp-cors" -SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - dev-python/pytest-aiohttp[${PYTHON_USEDEP}] - dev-python/selenium[${PYTHON_USEDEP}] - )" - -distutils_enable_tests pytest - -# https://github.com/aio-libs/aiohttp-cors/pull/278 -PATCHES=( - "${FILESDIR}/${P}-tests.patch" - "${FILESDIR}/${P}-py3_7.patch" -) - -src_prepare() { - sed -i -e '/^addopts=/d' setup.cfg || die - distutils-r1_src_prepare -} diff --git a/dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-py3_7.patch b/dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-py3_7.patch deleted file mode 100644 index e09119c..0000000 --- a/dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-py3_7.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e64b95848f3253157d831f4934841fceeaf9b2e3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz> -Date: Thu, 14 Nov 2019 12:54:47 +0100 -Subject: [PATCH] Test instance type by isinstance, not issubclass - -Fixes https://github.com/aio-libs/aiohttp-cors/issues/277 ---- - tests/unit/test_cors_config.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/unit/test_cors_config.py b/tests/unit/test_cors_config.py -index 817410e..d494e20 100644 ---- a/tests/unit/test_cors_config.py -+++ b/tests/unit/test_cors_config.py -@@ -103,7 +103,7 @@ def test_static_resource(app, cors): - "/file", "/", name="dynamic_named_route") - assert len(app.router.keys()) == 1 - for resource in list(app.router.resources()): -- if issubclass(resource, web.StaticResource): -+ if isinstance(resource, web.StaticResource): - cors.add(resource) - assert len(app.router.keys()) == 1 diff --git a/dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-tests.patch b/dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-tests.patch deleted file mode 100644 index e6480b5..0000000 --- a/dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-tests.patch +++ /dev/null @@ -1,66 +0,0 @@ -From fed5542836c6afa925f3b607d544a92307c5e09f Mon Sep 17 00:00:00 2001 -From: Andrew Svetlov <andrew.svetlov@gmail.com> -Date: Mon, 15 Oct 2018 21:32:48 +0300 -Subject: [PATCH] Fix tests - ---- - tests/integration/test_real_browser.py | 18 ++++++++---------- - tests/unit/test_cors_config.py | 5 ++--- - 2 files changed, 10 insertions(+), 13 deletions(-) - -diff --git a/tests/integration/test_real_browser.py b/tests/integration/test_real_browser.py -index a5c9030..5dff79a 100644 ---- a/tests/integration/test_real_browser.py -+++ b/tests/integration/test_real_browser.py -@@ -193,22 +193,20 @@ class IntegrationServers: - - # Start servers. - for server_name, server_descr in self.servers.items(): -- handler = server_descr.app.make_handler() -- server = await self.loop.create_server( -- handler, -- sock=server_sockets[server_name]) -- server_descr.handler = handler -- server_descr.server = server -+ runner = web.AppRunner(server_descr.app) -+ await runner.setup() -+ site = web.SockSite(runner, server_sockets[server_name]) -+ await site.start() -+ server_descr.runner = runner - - self._logger.info("Started server '%s' at '%s'", - server_name, server_descr.url) - - async def stop_servers(self): - for server_descr in self.servers.values(): -- server_descr.server.close() -- await server_descr.handler.shutdown() -- await server_descr.server.wait_closed() -- await server_descr.app.cleanup() -+ runner = server_descr.runner -+ await runner.shutdown() -+ await runner.cleanup() - - self.servers = {} - -diff --git a/tests/unit/test_cors_config.py b/tests/unit/test_cors_config.py -index 5b8d8f3..817410e 100644 ---- a/tests/unit/test_cors_config.py -+++ b/tests/unit/test_cors_config.py -@@ -58,11 +58,10 @@ def options_route(app): - "OPTIONS", "/options_path", _handler) - - --def test_add_options_route(cors, options_route): -+def test_add_options_route(app, cors, options_route): - """Test configuring OPTIONS route""" -- - with pytest.raises(ValueError, -- match="/options_path already has OPTIONS handler"): -+ match="already has OPTIONS handler"): - cors.add(options_route.resource) - - --- -2.25.1 - diff --git a/dev-python/aiohttp-cors/metadata.xml b/dev-python/aiohttp-cors/metadata.xml deleted file mode 100644 index 90e51cd..0000000 --- a/dev-python/aiohttp-cors/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">aio-libs/aiohttp-cors</remote-id> - </upstream> -</pkgmetadata>