Merge branch 'develop' into 'master'

v0.5.3

See merge request slumber/multi-user!174

.gitlab-ci.yml

@@ -1,5 +1,13 @@
 stages:
+  - test
   - build
+  - deploy
+  - doc
+
+
 
 include:
-  - local: .gitlab/ci/build.gitlab-ci.yml
+  - local: .gitlab/ci/test.gitlab-ci.yml
+  - local: .gitlab/ci/build.gitlab-ci.yml
+  - local: .gitlab/ci/deploy.gitlab-ci.yml
+  - local: .gitlab/ci/doc.gitlab-ci.yml

.gitlab/ci/build.gitlab-ci.yml

@@ -1,5 +1,6 @@
 build:
   stage: build
+  needs: ["test"]
   image: debian:stable-slim
   script:
     - rm -rf tests .git .gitignore script

CHANGELOG.md

@@ -264,10 +264,4 @@ All notable changes to this project will be documented in this file.
 
 - Server crashing during snapshots
 - Blender 3.1 numpy loading error during early connection process
-- Server docker arguments
+- Server docker arguments
-
-## [0.5.5] - 2022-06-12
-
-### Fixed
-
-- Numpy mesh serialization error

docs/conf.py

@@ -16,12 +16,12 @@ import sys
 
 # -- Project information -----------------------------------------------------
 
-project = 'Multi-User 0.5.x Documentation'
+project = 'Multi-User 0.5.0 Documentation'
 copyright = '2020, Swann Martinez'
 author = 'Swann Martinez, Poochy, Fabian'
 
 # The full version, including alpha/beta/rc tags
-version_release = '0.5.5'
+version_release = '0.5.1-develop'
 
 
 # -- General configuration ---------------------------------------------------

multi_user/__init__.py

@@ -19,7 +19,7 @@
 bl_info = {
     "name": "Multi-User",
     "author": "Swann Martinez",
-    "version": (0, 5, 8),
+    "version": (0, 5, 4),
     "description": "Enable real-time collaborative workflow inside blender",
     "blender": (2, 82, 0),
     "location": "3D View > Sidebar > Multi-User tab",

multi_user/environment.py

@@ -30,8 +30,8 @@ VERSION_EXPR = re.compile('\d+.\d+.\d+')
 DEFAULT_CACHE_DIR = os.path.join(
     os.path.dirname(os.path.abspath(__file__)), "cache")
 REPLICATION_DEPENDENCIES = {
-    ("pyzmq", "25.0.0"),
+    "zmq",
-    ("deepdiff","5.7.0"),
+    "deepdiff"
 }
 LIBS = os.path.join(os.path.dirname(os.path.abspath(__file__)), "libs")
 REPLICATION = os.path.join(LIBS,"replication")
@@ -55,7 +55,7 @@ def install_pip():
     subprocess.run([str(PYTHON_PATH), "-m", "ensurepip"])
 
 
-def install_package(name: str, version:str=None, install_dir: str=None):
+def install_package(name: str, install_dir: str):
     logging.info(f"installing {name} version...")
     env = os.environ
     if "PIP_REQUIRE_VIRTUALENV" in env:
@@ -65,8 +65,7 @@ def install_package(name: str, version:str=None, install_dir: str=None):
         # env var for the subprocess.
         env = os.environ.copy()
         del env["PIP_REQUIRE_VIRTUALENV"]
-    module_name = f"{name}" if version is None else f"{name}=={version}"
+    subprocess.run([str(PYTHON_PATH), "-m", "pip", "install", f"{name}", "-t", install_dir], env=env)
-    subprocess.run([str(PYTHON_PATH), "-m", "pip", "install", module_name, "-t", install_dir], env=env)
 
     if name in sys.modules:
         del sys.modules[name]
@@ -120,7 +119,7 @@ def remove_paths(paths: list):
             sys.path.remove(path)
 
 
-def install_modules(dependencies: tuple, python_path: str, install_dir: str):
+def install_modules(dependencies: list, python_path: str, install_dir: str):
     global PYTHON_PATH, SUBPROCESS_DIR
 
     PYTHON_PATH = Path(python_path)
@@ -129,9 +128,9 @@ def install_modules(dependencies: tuple, python_path: str, install_dir: str):
     if not module_can_be_imported("pip"):
         install_pip()
 
-    for package_name, package_version in dependencies:
+    for package_name in dependencies:
         if not module_can_be_imported(package_name):
-            install_package(package_name, version=package_version, install_dir=install_dir)
+            install_package(package_name, install_dir=install_dir)
             module_can_be_imported(package_name)
 
 def register():

multi_user/handlers.py

@@ -133,7 +133,7 @@ def load_pre_handler(dummy):
 
 @persistent
 def update_client_frame(scene):
-    if session and session.state == STATE_ACTIVE and bpy.context.screen and not bpy.context.screen.is_animation_playing:
+    if session and session.state == STATE_ACTIVE:
         porcelain.update_user_metadata(session.repository, {
             'frame_current': scene.frame_current
         })

multi_user/operators.py

@@ -297,20 +297,17 @@ def setup_timer():
     session_user_sync = timers.SessionUserSync()
     session_background_executor = timers.MainThreadExecutor(execution_queue=background_execution_queue)
     session_listen = timers.SessionListenTimer(timeout=0.001)
-    session_frame_sync = timers.SessionFrameSync(timeout=1)
 
     session_listen.register()
     session_update.register()
     session_user_sync.register()
     session_background_executor.register()
-    session_frame_sync.register()
 
     deleyables.append(session_background_executor)
     deleyables.append(session_update)
     deleyables.append(session_user_sync)
     deleyables.append(session_listen)
     deleyables.append(timers.AnnotationUpdates())
-    deleyables.append(session_frame_sync)
 
 def get_active_server_preset(context):
     active_index = context.window_manager.server_index

multi_user/preferences.py

@@ -44,27 +44,13 @@ DEFAULT_PRESETS = {
         "admin_password": "admin",
         "server_password": ""
     },
-    "NTHU Session 1" : {
+    "public session" : {
-        "server_name": "Session 1",
+        "server_name": "public session",
-        "ip": "31.38.153.178",
+        "ip": "51.75.71.183",
         "port": 5555,
         "admin_password": "",
         "server_password": ""
     },
-        "NTHU Session 2" : {
-        "server_name": "Session 2",
-        "ip": "31.38.153.178",
-        "port": 5655,
-        "admin_password": "",
-        "server_password": ""
-    },
-        "NTHU Session 3" : {
-        "server_name": "Session 3",
-        "ip": "31.38.153.178",
-        "port": 5755,
-        "admin_password": "",
-        "server_password": ""
-    }
 }
 
 def randomColor():

multi_user/timers.py

@@ -177,7 +177,6 @@ class AnnotationUpdates(Timer):
                                     affect_dependencies=False)
                     self._annotating = False
 
-
 class DynamicRightSelectTimer(Timer):
     def __init__(self, timeout=.1):
         super().__init__(timeout)
@@ -267,7 +266,7 @@ class DynamicRightSelectTimer(Timer):
 
 
 class ClientUpdate(Timer):
-    def __init__(self, timeout=1):
+    def __init__(self, timeout=.1):
         super().__init__(timeout)
         self.handle_quit = False
         self.users_metadata = {}
@@ -388,12 +387,3 @@ class MainThreadExecutor(Timer):
             function, kwargs = self.execution_queue.get()
             logging.debug(f"Executing {function.__name__}")
             function(**kwargs)
-
-    
-class SessionFrameSync(Timer):
-    def execute(self):
-        if session and session.state == STATE_ACTIVE:
-            if bpy.context.screen and bpy.context.screen.is_animation_playing:
-                porcelain.update_user_metadata(session.repository, {
-                    'frame_current': bpy.context.scene.frame_current
-                })