From 56502de73f8f49db42fac50ae8af0ea424a8f56f Mon Sep 17 00:00:00 2001 From: Scott Phillips Date: Thu, 17 Mar 2022 12:06:35 -0400 Subject: [PATCH 1/3] couple of minor python version updates --- python/requirements.txt | 6 +++--- python/setup.cfg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/requirements.txt b/python/requirements.txt index 931d9f48..de2554d5 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -1,9 +1,9 @@ base58~=2.1.1 betterproto~=2.0.0b4 -grpcio-tools~=1.43.0 -grpclib~=0.4.2 +grpcio-tools~=1.44.0 +grpclib~=0.4.3rc2 requests~=2.27.1 -setuptools~=60.5.0 +setuptools~=60.10.0 black flake8 pytest diff --git a/python/setup.cfg b/python/setup.cfg index e94d2fea..80befa48 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -21,7 +21,7 @@ python_requires = >=3.7 install_requires = protobuf>=3.17.3 betterproto>=2.0.0b4 - requests>=2.22.0 + requests>=2.27.1 [options.packages.find] exclude = tests From dece848d7effe804f1d5f4b48162bbd20d7959c1 Mon Sep 17 00:00:00 2001 From: Scott Phillips Date: Thu, 17 Mar 2022 12:56:49 -0400 Subject: [PATCH 2/3] fix the demo application and ensure it is tested --- python/setup.cfg | 2 ++ python/tests/okapi_demo.py | 17 +++++++++++------ python/tests/test_keys.py | 4 ++++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/python/setup.cfg b/python/setup.cfg index 80befa48..e134910f 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -47,3 +47,5 @@ libs/windows = libs/windows/okapi.dll libs/linux = libs/linux/libokapi.so libs/macos = libs/macos/libokapi.dylib # TODO - support ARM? +# libs/linux-aarch64 = libs/linux-aarch64/libokapi.so +# libs/linux-armv7 = libs/linux-armv7/libokapi.so \ No newline at end of file diff --git a/python/tests/okapi_demo.py b/python/tests/okapi_demo.py index d17d4751..50d6a77f 100644 --- a/python/tests/okapi_demo.py +++ b/python/tests/okapi_demo.py @@ -1,9 +1,14 @@ -from trinsicokapi.wrapper import DIDKey +from trinsicokapi import didkey from trinsicokapi.proto.okapi.keys.v1 import GenerateKeyRequest, KeyType -request = GenerateKeyRequest() -request.key_type = KeyType.Ed25519 -request.seed = bytes(bytearray([1, 2, 3])) +def run(): + request = GenerateKeyRequest() + request.key_type = KeyType.KEY_TYPE_ED25519 + request.seed = bytes(bytearray([1, 2, 3])) -key_response = DIDKey.generate(request) -print(key_response.key) + key_response = didkey.generate(request) + print(key_response.key) + + +if __name__ == "__main__": + run() diff --git a/python/tests/test_keys.py b/python/tests/test_keys.py index 594424d2..c7161dda 100644 --- a/python/tests/test_keys.py +++ b/python/tests/test_keys.py @@ -3,6 +3,7 @@ import base58 +from tests import okapi_demo from trinsicokapi import didkey from trinsicokapi.proto.okapi.keys.v1 import ( GenerateKeyRequest, @@ -46,6 +47,9 @@ def test_resolve_key(self): response = didkey.resolve(ResolveRequest(did=key)) self.assertIsNotNone(response) + def test_okapi_demo(self): + okapi_demo.run() + def assert_valid_key_generated(self, response, crv="Ed25519") -> bytes: self.assertIsNotNone(response) self.assertIsNotNone(response.key[0]) From ad733af9efe8457abb6b703358015829e5d0224d Mon Sep 17 00:00:00 2001 From: Scott Phillips Date: Thu, 17 Mar 2022 13:04:20 -0400 Subject: [PATCH 3/3] black and flake8 compliance --- python/tests/okapi_demo.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/tests/okapi_demo.py b/python/tests/okapi_demo.py index 50d6a77f..16e16233 100644 --- a/python/tests/okapi_demo.py +++ b/python/tests/okapi_demo.py @@ -1,6 +1,7 @@ from trinsicokapi import didkey from trinsicokapi.proto.okapi.keys.v1 import GenerateKeyRequest, KeyType + def run(): request = GenerateKeyRequest() request.key_type = KeyType.KEY_TYPE_ED25519