Python 3.13 support

Author: daiyip

.github/workflows/ci.yaml

@@ -14,7 +14,7 @@ jobs:
     runs-on: "${{ matrix.os }}"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         os: [ubuntu-latest]
     steps:
     - uses: actions/checkout@v2

pyglove/core/coding/execution.py

@@ -198,8 +198,9 @@ def _run():
     except Exception as e:  # pylint: disable=broad-exception-caught
       q.put(e)
 
-  q = multiprocessing.Queue()
-  p = multiprocessing.Process(
+  ctx = multiprocessing.get_context('fork')
+  q = ctx.Queue()
+  p = ctx.Process(
       target=_call, args=tuple([q] + list(args)), kwargs=kwargs
   )
   try:

pyglove/core/coding/permissions.py

@@ -20,7 +20,22 @@
 from pyglove.core import utils
 
 
-class CodePermission(enum.Flag):
+class CodePermissionMeta(enum.EnumMeta):
+
+  @property
+  def BASIC(cls) -> 'CodePermission':
+    """Returns basic permissions."""
+    return cls.ASSIGN | cls.CALL
+
+  @property
+  def ALL(cls) -> 'CodePermission':
+    """Returns all permissions."""
+    return (
+        cls.BASIC | cls.CONDITION | cls.LOOP | cls.EXCEPTION |
+        cls.CLASS_DEFINITION | cls.FUNCTION_DEFINITION | cls.IMPORT)
+
+
+class CodePermission(enum.Flag, metaclass=CodePermissionMeta):
   """Permissions for code execution."""
 
   # Allows assignment.
@@ -47,21 +62,6 @@ class CodePermission(enum.Flag):
   # Allows import.
   IMPORT = enum.auto()
 
-  @classmethod
-  @property
-  def BASIC(cls) -> 'CodePermission':    # pylint: disable=invalid-name
-    """Returns basic permissions."""
-    return CodePermission.ASSIGN | CodePermission.CALL
-
-  @classmethod
-  @property
-  def ALL(cls) -> 'CodePermission':    # pylint: disable=invalid-name
-    """Returns all permissions."""
-    return (
-        CodePermission.BASIC | CodePermission.CONDITION | CodePermission.LOOP |
-        CodePermission.EXCEPTION | CodePermission.CLASS_DEFINITION |
-        CodePermission.FUNCTION_DEFINITION | CodePermission.IMPORT)
-
 
 _TLS_CODE_RUN_PERMISSION = '__code_run_permission__'
 

pyglove/core/io/file_system_test.py

@@ -22,7 +22,7 @@
 class StdFileSystemTest(unittest.TestCase):
 
   def test_file(self):
-    tmp_dir = tempfile.gettempdir()
+    tmp_dir = tempfile.mkdtemp()
     fs = file_system.StdFileSystem()
 
     file1 = os.path.join(tmp_dir, 'file1')
@@ -44,7 +44,7 @@ def test_file(self):
     self.assertFalse(fs.exists(file1))
 
   def test_file_system(self):
-    tmp_dir = tempfile.gettempdir()
+    tmp_dir = tempfile.mkdtemp()
     fs = file_system.StdFileSystem()
 
     # Create a directory.
@@ -68,7 +68,7 @@ def test_file_system(self):
     # Test rm.
     with self.assertRaises(FileNotFoundError):
       fs.rm(os.path.join(dir_a, 'file2'))
-    with self.assertRaises(IsADirectoryError):
+    with self.assertRaises((IsADirectoryError, PermissionError)):
       fs.rm(os.path.join(dir_a, 'b'))
 
     # Test rmdir.
@@ -184,7 +184,7 @@ def test_file_system(self):
 class FileIoApiTest(unittest.TestCase):
 
   def test_standard_filesystem(self):
-    file1 = os.path.join(tempfile.gettempdir(), 'file1')
+    file1 = os.path.join(tempfile.mkdtemp(), 'file1')
     with self.assertRaises(FileNotFoundError):
       file_system.readfile(file1)
     self.assertIsNone(file_system.readfile(file1, nonexist_ok=True))
@@ -199,7 +199,7 @@ def test_standard_filesystem(self):
     file_system.rm(file1)
     self.assertFalse(file_system.path_exists(file1))
 
-    dir1 = os.path.join(tempfile.gettempdir(), 'dir1')
+    dir1 = os.path.join(tempfile.mkdtemp(), 'dir1')
     file_system.mkdir(dir1)
     self.assertEqual(file_system.listdir(dir1), [])
     file_system.mkdirs(os.path.join(dir1, 'a/b/c'))
@@ -208,7 +208,7 @@ def test_standard_filesystem(self):
     self.assertEqual(sorted(file_system.listdir(dir1)), ['a', 'file2'])  # pylint: disable=g-generic-assert
     self.assertEqual(    # pylint: disable=g-generic-assert
         sorted(file_system.listdir(dir1, fullpath=True)),
-        ['/tmp/dir1/a', '/tmp/dir1/file2']
+        [os.path.join(dir1, 'a'), os.path.join(dir1, 'file2')]
     )
     file_system.rmdir(os.path.join(dir1, 'a/b/c'))
     file_system.rmdirs(os.path.join(dir1, 'a/b'))

pyglove/core/symbolic/functor.py

@@ -88,15 +88,14 @@ def _call(self) -> int:
   #
 
   @classmethod
-  @property
   def is_subclassed_functor(cls) -> bool:
     """Returns True if this class is a subclassed Functor."""
     return cls.auto_schema
 
   @classmethod
   def _update_signatures_based_on_schema(cls):
     # Update the return value of subclassed functors.
-    if cls.is_subclassed_functor:  # pylint: disable=using-constant-test
+    if cls.is_subclassed_functor():  # pylint: disable=using-constant-test
       private_call_signature = pg_typing.Signature.from_callable(
           cls._call, auto_typing=True, auto_doc=True,
       )
@@ -235,7 +234,7 @@ def __init__(
 
     # For subclassed Functor, we use thread-local storage for storing temporary
     # member overrides from the arguments during functor call.
-    self._tls = threading.local() if self.is_subclassed_functor else None
+    self._tls = threading.local() if self.is_subclassed_functor() else None
 
   def _sym_inferred(self, key: str, **kwargs: Any) -> Any:
     """Overrides method to allow member overrides during call."""
@@ -361,7 +360,7 @@ def __call__(self, *args, **kwargs) -> Any:
     args, kwargs = self._parse_call_time_overrides(*args, **kwargs)
     signature = self.__signature__
 
-    if self.is_subclassed_functor:
+    if self.is_subclassed_functor():
       for arg_spec, arg_value in zip(signature.args, args):
         kwargs[arg_spec.name] = arg_value
 

pyglove/core/utils/docstr_utils_test.py

@@ -111,7 +111,6 @@ class Foo:
       pass
 
     self.assertIsNone(docstr_utils.docstr(Foo))
-    self.assertIsNone(docstr_utils.docstr(None))
 
     class Bar:
       """bar."""

pyglove/core/utils/json_conversion.py

@@ -624,6 +624,7 @@ def _method_to_json(f: types.MethodType) -> Dict[str, str]:
 
 
 _SUPPORTED_ANNOTATIONS = {
+    typing.Annotated: 'typing.Annotated',
     typing.Any: 'typing.Any',
     typing.Sequence: 'typing.Sequence',
     collections.abc.Sequence: 'typing.Sequence',

pyglove/core/utils/timing_test.py

@@ -29,7 +29,7 @@ def test_basics(self):
 
     tc.start()
     self.assertTrue(tc.has_started)
-    self.assertGreater(tc.elapse, 0)
+    self.assertGreaterEqual(tc.elapse, 0)
 
     self.assertTrue(tc.end())
     self.assertTrue(tc.has_ended)