Merge pull request #78 from allo-media/master

Release 2.3.1

scripts/inspect_queue.py

@@ -26,7 +26,7 @@
 import json
 import pprint
 
-import cbor
+import cbor2 as cbor
 
 import pika
 from pika.exceptions import (

scripts/monitor.py

@@ -27,7 +27,7 @@
 import os
 import pprint
 
-import cbor
+import cbor2 as cbor
 from eventail.async_service.pika import Service
 
 

scripts/publish_configuration.py

@@ -26,7 +26,7 @@
 import json
 import os.path
 
-import cbor
+import cbor2 as cbor
 
 from eventail.sync_publisher import Endpoint
 
@@ -48,7 +48,7 @@
     unserialize = json.loads if ext == ".json" else cbor.loads
     with open(args.payload, "rb") as ins:
         data = ins.read()
-    payload = unserialize(data)
+    payload = unserialize(data)  # type: ignore
 
     endpoint = Endpoint(args.amqp_url, "debug_configuration_event_publisher")
     endpoint.publish_configuration(args.event, payload)

scripts/publish_event.py

@@ -28,7 +28,7 @@
 import os.path
 import time
 
-import cbor
+import cbor2 as cbor
 import pika
 
 from eventail.async_service.pika import Service
@@ -82,7 +82,7 @@ def on_delivery_confirmation(self, method_frame: pika.frame.Method) -> None:
     unserialize = json.loads if ext == ".json" else cbor.loads
     with open(args.payload, "rb") as ins:
         data = ins.read()
-    payload = unserialize(data)
+    payload = unserialize(data)  # type: ignore
     event_sender = EventSender(
         [args.amqp_url], args.event, payload, use_json=ext == "json"
     )

scripts/send_command.py

@@ -28,7 +28,7 @@
 import pprint
 import os.path
 
-import cbor
+import cbor2 as cbor
 
 from eventail.async_service.pika import Service
 
@@ -98,6 +98,6 @@ def handle_result(
     unserialize = json.loads if ext == ".json" else cbor.loads
     with open(args.payload, "rb") as ins:
         data = ins.read()
-    payload = unserialize(data)
+    payload = unserialize(data)  # type: ignore
     rpc = RPC([args.amqp_url], args.command, payload, use_json=ext == "json")
     rpc.run()

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="eventail",
-    version="2.3.0",
+    version="2.3.1",
     url="https://github.com/allo-media/eventail",
     author="Allo-Media",
     author_email="[email protected]",
@@ -33,7 +33,7 @@
         "scripts/resurrect.py",
         "scripts/send_command.py",
     ],
-    install_requires=["pika>=1.2.0", "cbor", "redis>=4.5.4"],
+    install_requires=["pika>=1.2.0", "cbor2", "redis>=4.5.4"],
     extras_require={
         "synchronous": ["kombu"],
         "test": ["tox"],

src/eventail/async_service/pika/base.py

@@ -38,7 +38,7 @@
 from contextlib import AbstractContextManager
 from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union
 
-import cbor
+import cbor2 as cbor
 import pika
 
 from eventail.gelf import GELF

src/eventail/sync_publisher.py

@@ -29,7 +29,7 @@
 import socket
 from typing import Any, Dict, List, Optional
 
-import cbor
+import cbor2 as cbor
 from kombu import Connection, Exchange
 from kombu.pools import producers, set_limit
 

src/eventail/tmp_store.py

@@ -28,7 +28,7 @@
 from typing import Any, Callable, Dict, List, Optional, Tuple
 from uuid import uuid4
 
-import cbor
+import cbor2 as cbor
 import redis
 import redis.sentinel
 from redis.exceptions import ConnectionError, RedisError