merge: resolve PR #1966 conflicts with main

This commit is contained in:
Xubin Ren
2026-03-14 15:32:19 +00:00
38 changed files with 2163 additions and 320 deletions
-1
View File
@@ -5,7 +5,6 @@
*.pyc
dist/
build/
docs/
*.egg-info/
*.egg
*.pycs