Merge remote-tracking branch 'upstream/main' into issue-2722

Author: kaori-seasons

.github/workflows/ci.yml

@@ -288,7 +288,7 @@ jobs:
     name: Rust CI
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-13, macos-14]  # macos-13: x86, macos-14: arm64
+        os: [ubuntu-latest, macos-14, macos-latest]  # macos-14: arm64
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
     steps:
@@ -316,7 +316,7 @@ jobs:
     name: C++ CI
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-13, macos-14, windows-2022]  # macos-13: x86, macos-14: arm64
+        os: [ubuntu-latest, macos-14, macos-latest, windows-2022]  # macos-13: x86, macos-14: arm64
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v5

AGENTS.md

@@ -389,14 +389,14 @@ Fory python has two implementations for the protocol:
 
 Code structure:
 
-- `python/pyfory/_serialization.pyx`: Core serialization logic and entry point for cython mode based on `xlang serialization format`
+- `python/pyfory/serialization.pyx`: Core serialization logic and entry point for cython mode based on `xlang serialization format`
 - `python/pyfory/_fory.py`: Serialization entry point for pure python mode based on `xlang serialization format`
 - `python/pyfory/_registry.py`: Type registry, resolution and serializer dispatch for pure python mode, which is also used by cython mode. Cython mode use a cache to reduce invocations to this module.
 - `python/pyfory/serializer.py`: Serializers for non-internal types
 - `python/pyfory/includes`: Cython headers for `c++` functions and classes.
 - `python/pyfory/resolver.py`: resolving shared/circular references when ref tracking is enabled in pure python mode
 - `python/pyfory/format`: Fory row format encoding and decoding, arrow columnar format interoperation
-- `python/pyfory/_util.pyx`: Buffer for reading/writing data, string utilities. Used by `_serialization.pyx` and `python/pyfory/format` at the same time.
+- `python/pyfory/_util.pyx`: Buffer for reading/writing data, string utilities. Used by `serialization.pyx` and `python/pyfory/format` at the same time.
 
 #### Go
 

BUILD

@@ -51,11 +51,11 @@ pyx_library(
 )
 
 pyx_library(
-    name = "_serialization",
+    name = "serialization",
     srcs = glob([
         "python/pyfory/includes/*.pxd",
         "python/pyfory/_util.pxd",
-        "python/pyfory/_serialization.pyx",
+        "python/pyfory/serialization.pyx",
         "python/pyfory/__init__.py",
     ]),
     cc_kwargs = dict(
@@ -96,7 +96,7 @@ genrule(
         ":python/pyfory/_util.so",
         ":python/pyfory/lib/mmh3/mmh3.so",
         ":python/pyfory/format/_format.so",
-        ":python/pyfory/_serialization.so",
+        ":python/pyfory/serialization.so",
     ],
     outs = [
         "cp_fory_py_generated.out",
@@ -111,12 +111,12 @@ genrule(
             cp -f $(location python/pyfory/_util.so) "$$WORK_DIR/python/pyfory/_util.pyd"
             cp -f $(location python/pyfory/lib/mmh3/mmh3.so) "$$WORK_DIR/python/pyfory/lib/mmh3/mmh3.pyd"
             cp -f $(location python/pyfory/format/_format.so) "$$WORK_DIR/python/pyfory/format/_format.pyd"
-            cp -f $(location python/pyfory/_serialization.so) "$$WORK_DIR/python/pyfory/_serialization.pyd"
+            cp -f $(location python/pyfory/serialization.so) "$$WORK_DIR/python/pyfory/serialization.pyd"
         else
             cp -f $(location python/pyfory/_util.so) "$$WORK_DIR/python/pyfory"
             cp -f $(location python/pyfory/lib/mmh3/mmh3.so) "$$WORK_DIR/python/pyfory/lib/mmh3"
             cp -f $(location python/pyfory/format/_format.so) "$$WORK_DIR/python/pyfory/format"
-            cp -f $(location python/pyfory/_serialization.so) "$$WORK_DIR/python/pyfory"
+            cp -f $(location python/pyfory/serialization.so) "$$WORK_DIR/python/pyfory"
         fi
         echo $$(date) > $@
     """,

CONTRIBUTING.md

@@ -155,7 +155,7 @@ cd python
 python setup.py develop
 ```
 
-- Use `cython --cplus -a  pyfory/_serialization.pyx` to produce an annotated HTML file of the source code. Then you can analyze interaction between Python objects and Python's C API.
+- Use `cython --cplus -a  pyfory/serialization.pyx` to produce an annotated HTML file of the source code. Then you can analyze interaction between Python objects and Python's C API.
 - Read more: https://cython.readthedocs.io/en/latest/src/userguide/debugging.html
 
 ```bash

integration_tests/graalvm_tests/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.fory</groupId>
     <artifactId>fory-parent</artifactId>
-    <version>0.13.0</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath>../../java</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

integration_tests/jdk_compatibility_tests/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.fory</groupId>
     <artifactId>fory-parent</artifactId>
-    <version>0.13.0</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath>../../java</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

integration_tests/jpms_tests/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.fory</groupId>
     <artifactId>fory-parent</artifactId>
-    <version>0.13.0</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath>../../java</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

integration_tests/latest_jdk_tests/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.fory</groupId>
     <artifactId>fory-parent</artifactId>
-    <version>0.13.0</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath>../../java</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

java/benchmark/pom.xml

@@ -26,7 +26,7 @@
   <parent>
     <artifactId>fory-parent</artifactId>
     <groupId>org.apache.fory</groupId>
-    <version>0.13.0</version>
+    <version>0.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>benchmark</artifactId>

java/fory-core/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.fory</groupId>
     <artifactId>fory-parent</artifactId>
-    <version>0.13.0</version>
+    <version>0.13.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>