Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to external frozenlist and aiosignal libraries #5293

Merged
merged 6 commits into from
Nov 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
.vimrc
.vscode
aiohttp/_find_header.c
aiohttp/_frozenlist.c
aiohttp/_frozenlist.html
aiohttp/_headers.html
aiohttp/_headers.pxi
aiohttp/_helpers.c
Expand Down
1 change: 1 addition & 0 deletions CHANGES/5293.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Switch to external frozenlist and aiosignal libraries.
1 change: 0 additions & 1 deletion aiohttp/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
DefaultResolver as DefaultResolver,
ThreadedResolver as ThreadedResolver,
)
from .signals import Signal as Signal
from .streams import (
EMPTY_PAYLOAD as EMPTY_PAYLOAD,
DataQueue as DataQueue,
Expand Down
108 changes: 0 additions & 108 deletions aiohttp/_frozenlist.pyx

This file was deleted.

72 changes: 0 additions & 72 deletions aiohttp/frozenlist.py

This file was deleted.

46 changes: 0 additions & 46 deletions aiohttp/frozenlist.pyi

This file was deleted.

34 changes: 0 additions & 34 deletions aiohttp/signals.py

This file was deleted.

12 changes: 0 additions & 12 deletions aiohttp/signals.pyi

This file was deleted.

2 changes: 1 addition & 1 deletion aiohttp/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from typing import TYPE_CHECKING, Any, Callable, Iterator, List, Optional, Type, Union
from unittest import mock

from aiosignal import Signal
from multidict import CIMultiDict, CIMultiDictProxy
from yarl import URL

Expand All @@ -26,7 +27,6 @@
from .client_ws import ClientWebSocketResponse
from .helpers import _SENTINEL, PY_38, sentinel
from .http import HttpVersion, RawRequestMessage
from .signals import Signal
from .web import (
Application,
AppRunner,
Expand Down
2 changes: 1 addition & 1 deletion aiohttp/tracing.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
from types import SimpleNamespace
from typing import TYPE_CHECKING, Awaitable, Optional, Type, TypeVar

from aiosignal import Signal
from multidict import CIMultiDict
from yarl import URL

from .client_reqrep import ClientResponse
from .signals import Signal

if TYPE_CHECKING: # pragma: no cover
from typing_extensions import Protocol
Expand Down
4 changes: 2 additions & 2 deletions aiohttp/web_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
cast,
)

from aiosignal import Signal
from frozenlist import FrozenList
from typing_extensions import final

from . import hdrs
from .frozenlist import FrozenList
from .log import web_logger
from .signals import Signal
from .web_middlewares import _fix_request_current_app
from .web_request import Request
from .web_response import StreamResponse
Expand Down
2 changes: 2 additions & 0 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
-r multidict.txt
# required c-ares will not build on windows and has build problems on Macos Python<3.7
aiodns==2.0.0; sys_platform=="linux" or sys_platform=="darwin" and python_version>="3.7"
aiosignal==1.1.2
async-timeout==4.0.0a3
asynctest==0.13.0; python_version<"3.8"
Brotli==1.0.9
cchardet==2.1.7
chardet==3.0.4
frozenlist==1.1.1
gunicorn==20.0.4
typing_extensions==3.7.4.3
uvloop==0.14.0; platform_system!="Windows" and implementation_name=="cpython" and python_version<"3.9" # MagicStack/uvloop#14
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
],
define_macros=[("HTTP_PARSER_STRICT", 0)],
),
Extension("aiohttp._frozenlist", ["aiohttp/_frozenlist.c"]),
Extension("aiohttp._helpers", ["aiohttp/_helpers.c"]),
Extension("aiohttp._http_writer", ["aiohttp/_http_writer.c"]),
]
Expand All @@ -57,6 +56,8 @@
'asynctest==0.13.0; python_version<"3.8"',
"yarl>=1.0,<2.0",
"typing_extensions>=3.7.4",
"frozenlist>=1.1.1",
"aiosignal>=1.1.2",
]


Expand Down
Loading