Merge branch 'main' into pre/0.9.0-pre1

Author: dbluhm

aries_staticagent/static_connection.py

@@ -655,14 +655,17 @@ async def send_and_await_returned_async(
     ) -> Message:
         """Send a message and wait for a message to be returned."""
 
-        with self.next(type_=type_, condition=condition) as next_message:
-            await self.send_async(
-                msg,
-                return_route=return_route,
-                plaintext=plaintext,
-                anoncrypt=anoncrypt,
-            )
-            return await asyncio.wait_for(next_message, timeout)
+        async def _time_boxed():
+            with self.next(type_=type_, condition=condition) as next_message:
+                await self.send_async(
+                    msg,
+                    return_route=return_route,
+                    plaintext=plaintext,
+                    anoncrypt=anoncrypt,
+                )
+                return await next_message
+
+        return await asyncio.wait_for(_time_boxed(), timeout)
 
     async def await_message(
         self,

aries_staticagent/type.py

@@ -3,7 +3,7 @@
 from operator import is_not
 from typing import Union
 import re
-from semver import VersionInfo, parse
+from semver import VersionInfo
 
 MTURI_RE = re.compile(r"(.*?)([a-z0-9._-]+)/(\d[^/]*)/([a-z0-9._-]+)$")
 
@@ -27,14 +27,14 @@ def from_str(cls, version_str):
                 args.append("0")
             return Semver(*map(int, filter(partial(is_not, None), args)))
 
-        parts = parse(version_str)
+        parts = VersionInfo.parse(version_str)
 
         return cls(
-            parts["major"],
-            parts["minor"],
-            parts["patch"],
-            parts["prerelease"],
-            parts["build"],
+            parts.major,
+            parts.minor,
+            parts.patch,
+            parts.prerelease,
+            parts.build,
         )
 
 

docs/Gemfile.lock

@@ -7,7 +7,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     coffee-script (2.4.1)
       coffee-script-source

examples/return_route_client.py

@@ -21,13 +21,15 @@ def main():
             endpoint='http://localhost:{}'.format(os.environ.get('PORT', 3000))
         )
     )
-    reply = conn.send_and_await_reply({
-        "@type": "https://didcomm.org/"
-                 "basicmessage/1.0/message",
-        "~l10n": {"locale": "en"},
-        "sent_time": utils.timestamp(),
-        "content": "The Cron script has been executed."
-    }, return_route='all')
+    reply = conn.send_and_await_reply(
+        {
+            "@type": "https://didcomm.org/basicmessage/1.0/message",
+            "~l10n": {"locale": "en"},
+            "sent_time": utils.timestamp(),
+            "content": "The Cron script has been executed."
+        },
+        return_route='all'
+    )
     print('Msg from conn:', reply and reply.pretty_print())