From 56e5709a354f3d046515ff168c25305b33c9463b Mon Sep 17 00:00:00 2001 From: Swann Date: Thu, 19 Mar 2020 17:26:30 +0100 Subject: [PATCH] refactor: use pickle instead of msgpack --- README.md | 1 - multi_user/__init__.py | 4 +--- multi_user/bl_types/bl_datablock.py | 2 +- multi_user/libs/replication | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index cbabd14..c764a65 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,6 @@ I'm working on it. | Dependencies | Version | Needed | | ------------ | :-----: | -----: | | ZeroMQ | latest | yes | -| msgpack | latest | yes | | JsonDiff | latest | yes | diff --git a/multi_user/__init__.py b/multi_user/__init__.py index 1fc7420..2990789 100644 --- a/multi_user/__init__.py +++ b/multi_user/__init__.py @@ -1,7 +1,7 @@ bl_info = { "name": "Multi-User", "author": "Swann Martinez", - "version": (0, 0, 2), + "version": (0, 0, 3), "description": "Enable real-time collaborative workflow inside blender", "blender": (2, 80, 0), "location": "3D View > Sidebar > Multi-User tab", @@ -29,8 +29,6 @@ from .libs.replication.replication.constants import RP_COMMON # TODO: remove dependency as soon as replication will be installed as a module DEPENDENCIES = { ("zmq","zmq"), - ("msgpack","msgpack"), - ("yaml","pyyaml"), ("jsondiff","jsondiff") } diff --git a/multi_user/bl_types/bl_datablock.py b/multi_user/bl_types/bl_datablock.py index be6c8ed..60c0a86 100644 --- a/multi_user/bl_types/bl_datablock.py +++ b/multi_user/bl_types/bl_datablock.py @@ -166,7 +166,7 @@ class BlDatablock(ReplicatedDatablock): if not self.is_library: dependencies.extend(self.resolve_deps_implementation()) - print(dependencies) + return dependencies def resolve_deps_implementation(self): diff --git a/multi_user/libs/replication b/multi_user/libs/replication index 99bf948..2e84bb6 160000 --- a/multi_user/libs/replication +++ b/multi_user/libs/replication @@ -1 +1 @@ -Subproject commit 99bf94874a07890dc747ec53519aa34443a95146 +Subproject commit 2e84bb65b8a430f6b98533bd9a95028fb243f535