Skip to content

Commit

Permalink
Merge pull request #329 from kalaspuff/feature/aiohttp-3.0.0
Browse files Browse the repository at this point in the history
Added packages for aiohttp 3.0.0
  • Loading branch information
kalaspuff authored Mar 4, 2018
2 parents b60dfbf + 44bf836 commit 1af2fef
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 12 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
language: python
sudo: required
python:
- 3.5.1
- 3.5.2
- 3.5.3
- 3.5.4
- 3.5
Expand Down
9 changes: 9 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
Changes
=======

0.9.0 (2018-XX-XX)
------------------
- Updated to use ``aiohttp`` 3.X.X+ and ``aiobotocore`` 0.6.X+.

- Dropped support for Python versions below 3.5.3 as new ``aiohttp`` requires
at least Python 3.5.3. Last version with support for Python 3.5.0, 3.5.1 and
3.5.2 is ``tomodachi==0.8.2``.


0.8.3 (2018-03-02)
------------------
- Print stack trace for outputs from ``schedule`` invoker functions tasks
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Run the service 😎
Requirements 👍
---------------
* Python_ 3.5+
* Python_ 3.5.3+, 3.6+, 3.7+
* aiohttp_
* aiobotocore_
* aioamqp_
Expand Down
10 changes: 7 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
aioamqp==0.10.0
aiobotocore==0.5.3
aiohttp==2.3.10
async-timeout==2.0.0
aiobotocore==0.6.0
aiodns==1.1.1
aiohttp==3.0.5
async-timeout==1.4.0
attrs==17.4.0
botocore==1.8.21
cchardet==2.1.1
chardet==3.0.4
codecov==2.0.15
colorama==0.3.9
Expand All @@ -12,6 +15,7 @@ jmespath==0.9.3
multidict==4.1.0
mypy==0.570
packaging==17.1
pycares==2.3.0
pycodestyle==2.3.1
py==1.5.2
pyparsing==2.2.0
Expand Down
10 changes: 5 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
'aioamqp>=0.10.0, <0.11.0',
'ujson>=1.35',
'uvloop>=0.8.1',
'aiobotocore>=0.5.1, <0.6.0',
'aiobotocore>=0.6.0, <0.7.0',
'tzlocal>=1.4',
'aiohttp>=2.3.8, <2.4.0',
'yarl>=1.0.0',
'aiohttp>=3.0.5, <3.1.0',
'yarl>=1.1.0',
'colorama>=0.3.9, <0.4.0'
]

PY_VER = sys.version_info

if not PY_VER >= (3, 5):
raise RuntimeError("tomodachi doesn't support Python earlier than 3.5")
if not PY_VER >= (3, 5, 3):
raise RuntimeError("tomodachi doesn't support Python earlier than 3.5.3")


def read(f: str) -> str:
Expand Down
2 changes: 1 addition & 1 deletion tomodachi/__version__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version_info__ = (0, 8, 3)
__version_info__ = (0, 9, 0)
__version__ = ''.join(['.{}'.format(str(n)) if type(n) is int else str(n) for n in __version_info__]).replace('.', '', 1 if type(__version_info__[0]) is int else 0)

if __name__ == "__main__":
Expand Down
1 change: 1 addition & 0 deletions tomodachi/transport/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ async def _func(obj: Any, request: web.Request) -> None:
async for message in websocket:
if message.type == WSMsgType.TEXT:
if _receive_func:
await _receive_func(message.data)
try:
await _receive_func(message.data)
except Exception as e:
Expand Down

0 comments on commit 1af2fef

Please sign in to comment.