Merge pull request #43 from lgrahl/maintenance-update

Maintenance Update

Author: lgrahl

.gitignore

@@ -69,3 +69,9 @@ gen
 
 # Vim
 *.swp
+
+# VS Code
+.vscode/
+
+# MyPy Cache
+.mypy_cache/

.travis.yml

@@ -15,16 +15,15 @@ before_cache:
 language: python
 matrix:
   include:
-  - python: "3.4"
-    env: EVENT_LOOP=asyncio
   - python: "3.5"
     env: EVENT_LOOP=asyncio
-  - python: "3.5"
-    env: EVENT_LOOP=uvloop
-    before_script: "pip install .[uvloop]"
   - python: "3.6"
     env: EVENT_LOOP=asyncio
-  - python: "3.6"
+  - python: "3.7"
+    env: EVENT_LOOP=asyncio
+  - python: "3.8"
+    env: EVENT_LOOP=asyncio
+  - python: "3.8"
     env: EVENT_LOOP=uvloop
     before_script: "pip install .[uvloop]"
 
@@ -39,11 +38,8 @@ install:
 
 # Run flake8, isort, check docs & tests
 script:
-  - >
-    if [[ "$TRAVIS_PYTHON_VERSION" != "pypy3" ]]; then
-      flake8 . || travis_terminate 1;
-      isort -rc -c . || (isort -rc -df . && return 1) || travis_terminate 1;
-    fi
+  - flake8 .
+  - isort -rc -c . || (isort -rc -df . && return 1)
   - python setup.py checkdocs
   - py.test --cov-config .coveragerc --cov=threema.gateway --loop=$EVENT_LOOP
   - mypy .

setup.py

@@ -38,14 +38,14 @@ def read(file):
 # Note: These are just tools that aren't required, so a version range
 #       is not necessary here.
 tests_require = [
-    'pytest>=3.1.3',
-    'pytest-asyncio>=0.6.0',
-    'pytest-cov>=2.5.1',
-    'flake8>=3.3.0',
-    'isort>=4.2.15',
+    'pytest>=3.1.3,<4',
+    'pytest-asyncio>=0.6.0,<0.10',
+    'pytest-cov>=2.5.1,<3',
+    'flake8==3.7.9',
+    'isort==4.3.21',
     'collective.checkdocs>=0.2',
     'Pygments>=2.2.0',  # required by checkdocs
-    'mypy>=0.521',
+    'mypy==0.770',
 ]
 
 setup(
@@ -58,7 +58,7 @@ def read(file):
         'logbook>=1.1.0,<2',
         'libnacl>=1.5.2,<2',
         'click>=6.7,<7',  # doesn't seem to follow semantic versioning
-        'aiohttp>=2.2.5,<3',
+        'aiohttp>=2.3.10,<3',
         'wrapt>=1.10.10,<2',
     ],
     tests_require=tests_require,

tests/conftest.py

@@ -20,6 +20,10 @@
 from threema.gateway import e2e
 from threema.gateway.key import Key
 
+# Turn off deprecation warnings for now
+# TODO: Port code to async/await
+os.environ['PYTHONWARNINGS'] = 'ignore'
+
 _res_path = os.path.normpath(os.path.join(
     os.path.abspath(__file__), os.pardir, 'res'))
 
@@ -85,7 +89,7 @@ def __init__(self):
     @asyncio.coroutine
     def pubkeys(self, request):
         key = request.match_info['key']
-        from_, secret = request.GET['from'], request.GET['secret']
+        from_, secret = request.query['from'], request.query['secret']
         if (from_, secret) not in pytest.msgapi.api_identities:
             return web.Response(status=401)
         elif len(key) != 8:
@@ -99,7 +103,7 @@ def pubkeys(self, request):
     @asyncio.coroutine
     def lookup_phone(self, request):
         phone = request.match_info['phone']
-        from_, secret = request.GET['from'], request.GET['secret']
+        from_, secret = request.query['from'], request.query['secret']
         if (from_, secret) not in pytest.msgapi.api_identities:
             return web.Response(status=401)
         elif not phone.isdigit():
@@ -111,7 +115,7 @@ def lookup_phone(self, request):
     @asyncio.coroutine
     def lookup_phone_hash(self, request):
         phone_hash = request.match_info['phone_hash']
-        from_, secret = request.GET['from'], request.GET['secret']
+        from_, secret = request.query['from'], request.query['secret']
         hash_ = '98b05f6eda7a878f6f016bdcdc9db6eb61a6b190e814ff787142115af144214c'
         if (from_, secret) not in pytest.msgapi.api_identities:
             return web.Response(status=401)
@@ -127,7 +131,7 @@ def lookup_phone_hash(self, request):
     @asyncio.coroutine
     def lookup_email(self, request):
         email = request.match_info['email']
-        from_, secret = request.GET['from'], request.GET['secret']
+        from_, secret = request.query['from'], request.query['secret']
         if (from_, secret) not in pytest.msgapi.api_identities:
             return web.Response(status=401)
         elif email == 'echoecho@example.com':
@@ -137,7 +141,7 @@ def lookup_email(self, request):
     @asyncio.coroutine
     def lookup_email_hash(self, request):
         email_hash = request.match_info['email_hash']
-        from_, secret = request.GET['from'], request.GET['secret']
+        from_, secret = request.query['from'], request.query['secret']
         hash_ = '45a13d422b40f81936a9987245d3f6d9064c90607273af4f578246b4484669e2'
         if (from_, secret) not in pytest.msgapi.api_identities:
             return web.Response(status=401)
@@ -153,7 +157,7 @@ def lookup_email_hash(self, request):
     @asyncio.coroutine
     def capabilities(self, request):
         id_ = request.match_info['id']
-        from_, secret = request.GET['from'], request.GET['secret']
+        from_, secret = request.query['from'], request.query['secret']
         if (from_, secret) not in pytest.msgapi.api_identities:
             return web.Response(status=401)
         elif id_ == 'ECHOECHO':
@@ -164,7 +168,7 @@ def capabilities(self, request):
 
     @asyncio.coroutine
     def credits(self, request):
-        from_, secret = request.GET['from'], request.GET['secret']
+        from_, secret = request.query['from'], request.query['secret']
         if (from_, secret) not in pytest.msgapi.api_identities:
             return web.Response(status=401)
         return web.Response(body=b'100')
@@ -227,7 +231,7 @@ def upload_blob(self, request):
             data = (yield from request.post())
 
             # Check API identity
-            api_identity = (request.GET['from'], request.GET['secret'])
+            api_identity = (request.query['from'], request.query['secret'])
             if api_identity not in pytest.msgapi.api_identities:
                 return web.Response(status=401)
         except KeyError:
@@ -244,7 +248,7 @@ def upload_blob(self, request):
         blob_id = hashlib.md5(blob).hexdigest()
 
         # Process
-        if request.GET['from'] == pytest.msgapi.nocredit_id:
+        if request.query['from'] == pytest.msgapi.nocredit_id:
             return web.Response(status=402)
         elif len(blob) == 0:
             return web.Response(status=400)
@@ -261,7 +265,7 @@ def download_blob(self, request):
         blob_id = request.match_info['blob_id']
 
         # Check API identity
-        from_, secret = request.GET['from'], request.GET['secret']
+        from_, secret = request.query['from'], request.query['secret']
         if (from_, secret) not in pytest.msgapi.api_identities:
             return web.Response(status=401)
 

tests/test_api.py

@@ -22,11 +22,16 @@
 )
 
 
+@asyncio.coroutine
+def download_blob(connection, blob_id):
+    response = yield from connection.download(blob_id)
+    return response.read()
+
+
 @asyncio.coroutine
 def get_latest_blob_ids(server, connection):
-    blobs = [(yield from (yield from connection.download(blob_id)).read())
-             for blob_id in server.latest_blob_ids]
-    return blobs
+    return asyncio.gather(*[download_blob(connection, blob_id)
+                            for blob_id in server.latest_blob_ids])
 
 
 class TestLookupPublicKey:
@@ -54,16 +59,17 @@ def test_valid_id(self, connection, server):
         assert key.hex_pk() == server.echoecho_key
 
     @pytest.mark.asyncio
+    @asyncio.coroutine
     def test_cache_expiration(self, connection, server):
         connection.get_public_key.cache_clear()
         connection.get_public_key.cache.expiration = 0.05
         for _ in range(10):
-            yield from self.test_valid_id(connection, server)
+            yield from connection.get_public_key('ECHOECHO')
         cache_info = connection.get_public_key.cache_info()
         assert cache_info.misses == 1
         assert cache_info.hits == 9
         yield from asyncio.sleep(0.2)
-        yield from self.test_valid_id(connection, server)
+        yield from connection.get_public_key('ECHOECHO')
         cache_info = connection.get_public_key.cache_info()
         # For some reason, the cache is not always being cleared and I don't want
         # Travis to fail all the time

tests/test_cli.py

@@ -2,11 +2,9 @@
 
 import pytest
 
+from threema.gateway import ReceptionCapability
 from threema.gateway import __version__ as _version
-from threema.gateway import (
-    ReceptionCapability,
-    feature_level,
-)
+from threema.gateway import feature_level
 from threema.gateway.key import Key
 
 

threema/gateway/__init__.py

@@ -23,9 +23,9 @@
 """
 import itertools
 
-# noinspection PyUnresolvedReferences
+from . import _gateway
+from . import exception as _exception
 from ._gateway import *  # noqa
-# noinspection PyUnresolvedReferences
 from .exception import *  # noqa
 
 __author__ = 'Lennart Grahl <lennart.grahl@gmail.com>'
@@ -36,6 +36,6 @@
 __all__ = tuple(itertools.chain(
     ('feature_level',),
     ('bin', 'simple', 'e2e', 'key', 'util'),
-    _gateway.__all__,  # noqa
-    exception.__all__,  # noqa
+    _gateway.__all__,
+    _exception.__all__,
 ))

threema/gateway/_gateway.py

@@ -90,7 +90,7 @@ class Connection(AioRunMixin):
         'download',
     }
     fingerprint = binascii.unhexlify(
-        b'a6840a28041a1c43d90c21122ea324272f5c90c82dd64f52701f3a8f1a2b395b')
+        b'42b1038e72f00c8c4dad78a3ebdc6d7a50c5ef288da9019b9171e4d675c08a17')
     urls = {
         'get_public_key': 'https://msgapi.threema.ch/pubkeys/{}',
         'get_id_by_phone': 'https://msgapi.threema.ch/lookup/phone/{}',

threema/gateway/bin/callback_server.py

@@ -8,11 +8,9 @@
 import logbook
 import logbook.more
 
+from threema.gateway import Connection
 from threema.gateway import __version__ as _version
-from threema.gateway import (
-    Connection,
-    util,
-)
+from threema.gateway import util
 from threema.gateway.e2e import AbstractCallback
 from threema.gateway.key import Key
 

threema/gateway/bin/gateway_client.py

@@ -11,9 +11,9 @@
 import logbook
 import logbook.more
 
+from threema.gateway import Connection
 from threema.gateway import __version__ as _version
 from threema.gateway import (
-    Connection,
     e2e,
     feature_level,
     simple,