1 |
commit: f92b187003eadbd0f2f59e6a0f85e7c8e6f9122b |
2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
3 |
AuthorDate: Thu May 14 12:38:59 2020 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
5 |
CommitDate: Thu May 14 12:38:59 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f92b1870 |
7 |
|
8 |
dev-python: aiohttp-cors moved to ::gentoo |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> |
12 |
|
13 |
dev-python/aiohttp-cors/Manifest | 1 - |
14 |
dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild | 36 ------------ |
15 |
.../files/aiohttp-cors-0.7.0-py3_7.patch | 22 -------- |
16 |
.../files/aiohttp-cors-0.7.0-tests.patch | 66 ---------------------- |
17 |
dev-python/aiohttp-cors/metadata.xml | 8 --- |
18 |
5 files changed, 133 deletions(-) |
19 |
|
20 |
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest |
21 |
deleted file mode 100644 |
22 |
index 4912de9..0000000 |
23 |
--- a/dev-python/aiohttp-cors/Manifest |
24 |
+++ /dev/null |
25 |
@@ -1 +0,0 @@ |
26 |
-DIST aiohttp-cors-0.7.0.tar.gz 39728 BLAKE2B 747499856272f551cf8e2e0911ff7cbb2c7cb8a1f3159327dd8f0d40cabbbd9713a1a9e30ef9c99f3f9642567c99025e049db837c89f907d6698a27005ac2632 SHA512 72e0b365b952c08a02c1123d7672cfea01063e2ff01743a71e10f804d22178edc0f1c6b7f87b7ed484ca7c24e89a32de90d0d279f2f5c060427319182f9bdd3b |
27 |
|
28 |
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild |
29 |
deleted file mode 100644 |
30 |
index 4e87a24..0000000 |
31 |
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,36 +0,0 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-PYTHON_COMPAT=( python3_{6,7} ) |
40 |
- |
41 |
-inherit distutils-r1 |
42 |
- |
43 |
-DESCRIPTION="Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server" |
44 |
-HOMEPAGE="https://github.com/aio-libs/aiohttp-cors" |
45 |
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
46 |
- |
47 |
-LICENSE="Apache-2.0" |
48 |
-SLOT="0" |
49 |
-KEYWORDS="~amd64 ~x86" |
50 |
- |
51 |
-RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]" |
52 |
-BDEPEND=" |
53 |
- test? ( |
54 |
- dev-python/pytest-aiohttp[${PYTHON_USEDEP}] |
55 |
- dev-python/selenium[${PYTHON_USEDEP}] |
56 |
- )" |
57 |
- |
58 |
-distutils_enable_tests pytest |
59 |
- |
60 |
-# https://github.com/aio-libs/aiohttp-cors/pull/278 |
61 |
-PATCHES=( |
62 |
- "${FILESDIR}/${P}-tests.patch" |
63 |
- "${FILESDIR}/${P}-py3_7.patch" |
64 |
-) |
65 |
- |
66 |
-src_prepare() { |
67 |
- sed -i -e '/^addopts=/d' setup.cfg || die |
68 |
- distutils-r1_src_prepare |
69 |
-} |
70 |
|
71 |
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 |
72 |
deleted file mode 100644 |
73 |
index e09119c..0000000 |
74 |
--- a/dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-py3_7.patch |
75 |
+++ /dev/null |
76 |
@@ -1,22 +0,0 @@ |
77 |
-From e64b95848f3253157d831f4934841fceeaf9b2e3 Mon Sep 17 00:00:00 2001 |
78 |
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@×××××××.cz> |
79 |
-Date: Thu, 14 Nov 2019 12:54:47 +0100 |
80 |
-Subject: [PATCH] Test instance type by isinstance, not issubclass |
81 |
- |
82 |
-Fixes https://github.com/aio-libs/aiohttp-cors/issues/277 |
83 |
---- |
84 |
- tests/unit/test_cors_config.py | 2 +- |
85 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
86 |
- |
87 |
-diff --git a/tests/unit/test_cors_config.py b/tests/unit/test_cors_config.py |
88 |
-index 817410e..d494e20 100644 |
89 |
---- a/tests/unit/test_cors_config.py |
90 |
-+++ b/tests/unit/test_cors_config.py |
91 |
-@@ -103,7 +103,7 @@ def test_static_resource(app, cors): |
92 |
- "/file", "/", name="dynamic_named_route") |
93 |
- assert len(app.router.keys()) == 1 |
94 |
- for resource in list(app.router.resources()): |
95 |
-- if issubclass(resource, web.StaticResource): |
96 |
-+ if isinstance(resource, web.StaticResource): |
97 |
- cors.add(resource) |
98 |
- assert len(app.router.keys()) == 1 |
99 |
|
100 |
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 |
101 |
deleted file mode 100644 |
102 |
index e6480b5..0000000 |
103 |
--- a/dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-tests.patch |
104 |
+++ /dev/null |
105 |
@@ -1,66 +0,0 @@ |
106 |
-From fed5542836c6afa925f3b607d544a92307c5e09f Mon Sep 17 00:00:00 2001 |
107 |
-From: Andrew Svetlov <andrew.svetlov@×××××.com> |
108 |
-Date: Mon, 15 Oct 2018 21:32:48 +0300 |
109 |
-Subject: [PATCH] Fix tests |
110 |
- |
111 |
---- |
112 |
- tests/integration/test_real_browser.py | 18 ++++++++---------- |
113 |
- tests/unit/test_cors_config.py | 5 ++--- |
114 |
- 2 files changed, 10 insertions(+), 13 deletions(-) |
115 |
- |
116 |
-diff --git a/tests/integration/test_real_browser.py b/tests/integration/test_real_browser.py |
117 |
-index a5c9030..5dff79a 100644 |
118 |
---- a/tests/integration/test_real_browser.py |
119 |
-+++ b/tests/integration/test_real_browser.py |
120 |
-@@ -193,22 +193,20 @@ class IntegrationServers: |
121 |
- |
122 |
- # Start servers. |
123 |
- for server_name, server_descr in self.servers.items(): |
124 |
-- handler = server_descr.app.make_handler() |
125 |
-- server = await self.loop.create_server( |
126 |
-- handler, |
127 |
-- sock=server_sockets[server_name]) |
128 |
-- server_descr.handler = handler |
129 |
-- server_descr.server = server |
130 |
-+ runner = web.AppRunner(server_descr.app) |
131 |
-+ await runner.setup() |
132 |
-+ site = web.SockSite(runner, server_sockets[server_name]) |
133 |
-+ await site.start() |
134 |
-+ server_descr.runner = runner |
135 |
- |
136 |
- self._logger.info("Started server '%s' at '%s'", |
137 |
- server_name, server_descr.url) |
138 |
- |
139 |
- async def stop_servers(self): |
140 |
- for server_descr in self.servers.values(): |
141 |
-- server_descr.server.close() |
142 |
-- await server_descr.handler.shutdown() |
143 |
-- await server_descr.server.wait_closed() |
144 |
-- await server_descr.app.cleanup() |
145 |
-+ runner = server_descr.runner |
146 |
-+ await runner.shutdown() |
147 |
-+ await runner.cleanup() |
148 |
- |
149 |
- self.servers = {} |
150 |
- |
151 |
-diff --git a/tests/unit/test_cors_config.py b/tests/unit/test_cors_config.py |
152 |
-index 5b8d8f3..817410e 100644 |
153 |
---- a/tests/unit/test_cors_config.py |
154 |
-+++ b/tests/unit/test_cors_config.py |
155 |
-@@ -58,11 +58,10 @@ def options_route(app): |
156 |
- "OPTIONS", "/options_path", _handler) |
157 |
- |
158 |
- |
159 |
--def test_add_options_route(cors, options_route): |
160 |
-+def test_add_options_route(app, cors, options_route): |
161 |
- """Test configuring OPTIONS route""" |
162 |
-- |
163 |
- with pytest.raises(ValueError, |
164 |
-- match="/options_path already has OPTIONS handler"): |
165 |
-+ match="already has OPTIONS handler"): |
166 |
- cors.add(options_route.resource) |
167 |
- |
168 |
- |
169 |
--- |
170 |
-2.25.1 |
171 |
- |
172 |
|
173 |
diff --git a/dev-python/aiohttp-cors/metadata.xml b/dev-python/aiohttp-cors/metadata.xml |
174 |
deleted file mode 100644 |
175 |
index 90e51cd..0000000 |
176 |
--- a/dev-python/aiohttp-cors/metadata.xml |
177 |
+++ /dev/null |
178 |
@@ -1,8 +0,0 @@ |
179 |
-<?xml version="1.0" encoding="UTF-8"?> |
180 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
181 |
-<pkgmetadata> |
182 |
- <!-- maintainer-needed --> |
183 |
- <upstream> |
184 |
- <remote-id type="github">aio-libs/aiohttp-cors</remote-id> |
185 |
- </upstream> |
186 |
-</pkgmetadata> |