Mark 1.18 as released

No functional changes.

CHANGELOG.md

@@ -1,9 +1,5 @@
 # Blender Cloud changelog
 
-## Version 1.19 (2021-02-23)
-
-- Another Python 3.9+ compatibility fix.
-
 ## Version 1.18 (2021-02-16)
 
 - Add compatibility with Python 3.9 (as used in Blender 2.93).

blender_cloud/__init__.py

@@ -21,7 +21,7 @@
 bl_info = {
     "name": "Blender Cloud",
     "author": "Sybren A. Stüvel, Francesco Siddi, Inês Almeida, Antony Riakiotakis",
-    "version": (1, 19),
+    "version": (1, 18),
     "blender": (2, 80, 0),
     "location": "Addon Preferences panel, and Ctrl+Shift+Alt+A anywhere for texture browser",
     "description": "Texture library browser and Blender Sync. Requires the Blender ID addon "

blender_cloud/blender.py

@@ -47,7 +47,7 @@ log = logging.getLogger(__name__)
 icons = None
 
 
-@pyside_cache
+@pyside_cache("version")
 def blender_syncable_versions(self, context):
     """Returns the list of items used by SyncStatusProperties.version EnumProperty."""
 
@@ -117,7 +117,7 @@ class SyncStatusProperties(PropertyGroup):
         self["available_blender_versions"] = new_versions
 
 
-@pyside_cache
+@pyside_cache("project")
 def bcloud_available_projects(self, context):
     """Returns the list of items used by BlenderCloudProjectGroup.project EnumProperty."""
 

blender_cloud/flamenco/__init__.py

@@ -91,7 +91,7 @@ def scene_sample_count(scene) -> int:
     return samples
 
 
-@pyside_cache
+@pyside_cache("manager")
 def available_managers(self, context):
     """Returns the list of items used by a manager-selector EnumProperty."""
 

blender_cloud/utils.py

@@ -19,7 +19,6 @@
 import json
 import pathlib
 import typing
-from typing import Any, Dict, Optional, Tuple
 
 
 def sizeof_fmt(num: int, suffix="B") -> str:
@@ -36,7 +35,7 @@ def sizeof_fmt(num: int, suffix="B") -> str:
     return "%.1f Yi%s" % (num, suffix)
 
 
-def find_in_path(path: pathlib.Path, filename: str) -> Optional[pathlib.Path]:
+def find_in_path(path: pathlib.Path, filename: str) -> typing.Optional[pathlib.Path]:
     """Performs a breadth-first search for the filename.
 
     Returns the path that contains the file, or None if not found.
@@ -67,29 +66,41 @@ def find_in_path(path: pathlib.Path, filename: str) -> Optional[pathlib.Path]:
     return None
 
 
-# Mapping from (module name, function name) to the last value returned by that function.
-_pyside_cache: Dict[Tuple[str, str], Any] = {}
-
-
-def pyside_cache(wrapped):
+def pyside_cache(propname):
     """Decorator, stores the result of the decorated callable in Python-managed memory.
 
     This is to work around the warning at
     https://www.blender.org/api/blender_python_api_master/bpy.props.html#bpy.props.EnumProperty
     """
 
-    import functools
+    if callable(propname):
+        raise TypeError('Usage: pyside_cache("property_name")')
 
-    @functools.wraps(wrapped)
-    # We can't use (*args, **kwargs), because EnumProperty explicitly checks
-    # for the number of fixed positional arguments.
-    def decorator(self, context):
-        result = None
-        try:
-            result = wrapped(self, context)
-            return result
-        finally:
-            _pyside_cache[wrapped.__module__, wrapped.__name__] = result
+    def decorator(wrapped):
+        """Stores the result of the callable in Python-managed memory.
+
+        This is to work around the warning at
+        https://www.blender.org/api/blender_python_api_master/bpy.props.html#bpy.props.EnumProperty
+        """
+
+        import functools
+
+        @functools.wraps(wrapped)
+        # We can't use (*args, **kwargs), because EnumProperty explicitly checks
+        # for the number of fixed positional arguments.
+        def wrapper(self, context):
+            result = None
+            try:
+                result = wrapped(self, context)
+                return result
+            finally:
+                try:
+                    rna_type, rna_info = self.bl_rna.__annotations__[propname]
+                except AttributeError:
+                    rna_type, rna_info = getattr(self.bl_rna, propname)
+                rna_info["_cached_result"] = result
+
+        return wrapper
 
     return decorator
 

setup.py

@@ -248,9 +248,8 @@ setup(
         "install_egg_info": AvoidEggInfo,
         "wheels": BuildWheels,
     },
-    name="blender_cloud",
     description="The Blender Cloud addon allows browsing the Blender Cloud from Blender.",
-    version="1.19",
+    version="1.18",
     author="Sybren A. Stüvel",
     author_email="sybren@stuvel.eu",
     packages=find_packages("."),