Merge branch 'master' into pymunk7

viblo · viblo · commit ad572a9573fd · 2025-02-14T22:17:54.000+01:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,21 +5,30 @@ Changelog
    Breaking: At least one of the two bodies attached to constraint/join must be dynamic. 
 
 
-.. Pymunk 6.12?????
-   Changes....
+Pymunk 6.11.1 (2025-02-09)
+--------------------------
+
+**Python 3.13 GC issue fix**
+
+This is a patch update to Pymunk that removes debug logging. This should an 
+issue with GC on Python 3.13.
+
+Changes:
+ - Remove debug logging
+
 
 Pymunk 6.11.0 (2025-01-18)
 --------------------------
 
 **Debug draw for Pyglet 2.1**
 
-This is a minor update to Pymunk that update the pyglet debug draw code to 
+This is a minor update to Pymunk that update the Pyglet debug draw code to 
 work with the newly released Pyglet 2.1. Note that this means Pyglet 2.0.x 
 does not work anymore. The release also adds back pre-built wheels for Pypy 
 with a workaround until Pypy make a new release.
 
 Changes:
-  - Support pyglet 2.1.x (this means Pyglet 2.0.x wont work)
+  - Support Pyglet 2.1.x (this means Pyglet 2.0.x wont work)
   - Readded Pypy pre-built wheels
 
 
diff --git a/CITATION.cff b/CITATION.cff
@@ -5,6 +5,6 @@ authors:
     given-names: "Victor"
 title: "Pymunk"
 abstract: "A easy-to-use pythonic rigid body 2d physics library"
-version: 6.11.0
-date-released: 2025-01-18
+version: 6.11.1
+date-released: 2025-02-09
 url: "https://pymunk.org"
diff --git a/README.rst b/README.rst
@@ -18,7 +18,7 @@ the Pymunk webpage for some examples.
 
 2007 - 2025, Victor Blomqvist - vb@viblo.se, MIT License
 
-This release is based on the latest Pymunk release (6.11.0), 
+This release is based on the latest Pymunk release (6.11.1), 
 using Chipmunk2D 7 rev dfc2fb8ca023ce6376fa2cf4a7f91c92ee08a970.
 
 
@@ -138,7 +138,7 @@ possible, usually `pip install` will take care of everything for you.
 
 * GCC and friends (optional, you need it to compile Pymunk from source. On 
   windows Visual Studio is required to compile)
-* Pygame (optional, you need it to run the Pygame based demos)
+* Pygame or Pygame-CE (optional, you need it to run the Pygame based demos)
 * Pyglet (optional, you need it to run the Pyglet based demos)
 * Matplotlib & Jupyter Notebook (optional, you need it to run the Matplotlib 
   based demos)
diff --git a/docs/src/conf.py b/docs/src/conf.py
@@ -10,7 +10,7 @@
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
 project = "Pymunk"
-copyright = "2013-2022, Victor Blomqvist"
+copyright = "2013-2025, Victor Blomqvist"
 author = "Victor Blomqvist"
 
 # -- General configuration ---------------------------------------------------
diff --git a/docs/src/showcase.rst b/docs/src/showcase.rst
@@ -350,6 +350,18 @@ List of papers which has used or mentioned Pymunk:
 
 .. (list made using "Chicago" style citation)
 
+#. Liu, Daochang, Junyu Zhang, Anh-Dung Dinh, Eunbyung Park, Shichao Zhang, and Chang Xu. 
+   "Generative Physical AI in Vision: A Survey." 
+   arXiv preprint arXiv:2501.10928 (2025).
+
+#. Liu, Shaowei, Zhongzheng Ren, Saurabh Gupta, and Shenlong Wang. 
+   "Physgen: Rigid-body physics-grounded image-to-video generation." 
+   In European Conference on Computer Vision, pp. 360-378. Springer, Cham, 2025.
+
+#. Gu, Feida, Hongrui Sang, Yanmin Zhou, Jiajun Ma, Rong Jiang, Zhipeng Wang, and Bin He. 
+   "Learning Graph Dynamics with Interaction Effects Propagation for Deformable Linear Objects Shape Control." 
+   IEEE Transactions on Automation Science and Engineering (2025).
+
 #. Zhong, Ninghan, Alessandro Potenza, and Stephen L. Smith. 
    "Autonomous Navigation in Ice-Covered Waters with Learned Predictions on Ship-Ice Interactions." 
    arXiv preprint arXiv:2409.11326 (2024).
@@ -426,9 +438,9 @@ List of papers which has used or mentioned Pymunk:
    "Deep Reinforcement Learning for 2D Physics-Based Object Manipulation in Clutter." 
    arXiv preprint arXiv:2312.04570 (2023).
 
-#. Sosa, Felix, Samuel J. Gershman, and Tomer D. Ullman. 
-   "Blending simulation and abstraction for physical reasoning."
-   (2023).
+#. Sosa, Felix A., Samuel J. Gershman, and Tomer D. Ullman. 
+   "Blending simulation and abstraction for physical reasoning." 
+   Cognition 254 (2025): 105995..
 
 #. Li, Shiqian, Kewen Wu, Chi Zhang, and Yixin Zhu. 
    "I-PHYRE: Interactive Physical Reasoning." 
@@ -761,7 +773,7 @@ List of papers which has used or mentioned Pymunk:
    "Dynamic Robot Path Planning Among Crowds in Emergency Situations."
 
   
-List last updated 2024-11-28. If something is missing or wrong, please contact 
+List last updated 2025-01-26. If something is missing or wrong, please contact 
 me!
 
 
diff --git a/pymunk/_callbacks.py b/pymunk/_callbacks.py
@@ -299,7 +299,6 @@ def ext_cpBodyArbiterIteratorFunc(
 def ext_cpBodyConstraintIteratorFunc(
     cp_body: ffi.CData, cp_constraint: ffi.CData, _: ffi.CData
 ) -> None:
-    _logger.debug("bodyfree remove constraint %s %s", cp_body, cp_constraint)
     cp_space = lib.cpConstraintGetSpace(cp_constraint)
     if cp_space != ffi.NULL:
         lib.cpSpaceRemoveConstraint(cp_space, cp_constraint)
@@ -309,7 +308,6 @@ def ext_cpBodyConstraintIteratorFunc(
 def ext_cpBodyShapeIteratorFunc(
     cp_body: ffi.CData, cp_shape: ffi.CData, _: ffi.CData
 ) -> None:
-    _logger.debug("bodyfree remove shape %s %s", cp_body, cp_shape)
     cp_space = lib.cpShapeGetSpace(cp_shape)
     if cp_space != ffi.NULL:
         lib.cpSpaceRemoveShape(cp_space, cp_shape)
diff --git a/pymunk/_pyglet15_util.py b/pymunk/_pyglet15_util.py
@@ -61,7 +61,7 @@ def __init__(self, **kwargs: Any) -> None:
         Typical usage::
 
         >>> import pymunk
-        >>> import pymunk.pygame_util
+        >>> import pymunk.pyglet_util
         >>> s = pymunk.Space()
         >>> options = pymunk.pyglet_util.DrawOptions()
         >>> s.debug_draw(options)
diff --git a/pymunk/_version.py b/pymunk/_version.py
@@ -32,7 +32,7 @@
 cp = _chipmunk_cffi.lib
 ffi = _chipmunk_cffi.ffi
 
-version = "6.11.0"
+version = "6.11.1"
 
 chipmunk_version = "%s-%s" % (
     ffi.string(cp.cpVersionString).decode("utf-8"),
diff --git a/pymunk/body.py b/pymunk/body.py
@@ -1,6 +1,5 @@
 __docformat__ = "reStructuredText"
 
-import logging
 from typing import (  # Literal,
     TYPE_CHECKING,
     Any,
@@ -31,8 +30,6 @@
 _PositionFunc = Callable[["Body", float], None]
 _VelocityFunc = Callable[["Body", Vec2d, float, float], None]
 
-_logger = logging.getLogger(__name__)
-
 
 class Body(PickleMixin, TypingAttrMixing, object):
     """A rigid body
@@ -199,8 +196,6 @@ def __init__(
         """
 
         def freebody(cp_body: ffi.CData) -> None:
-            _logger.debug("bodyfree start %s", cp_body)
-
             # remove all shapes on this body from the space
             lib.cpBodyEachShape(cp_body, lib.ext_cpBodyShapeIteratorFunc, ffi.NULL)
 
@@ -210,13 +205,9 @@ def freebody(cp_body: ffi.CData) -> None:
             )
 
             cp_space = lib.cpBodyGetSpace(cp_body)
-            _logger.debug("bodyfree space %s", cp_space)
             # print(cp_space, cp_space == ffi.NULL)
             if cp_space != ffi.NULL:
-                _logger.debug("bodyfree space remove body %s %s", cp_space, cp_body)
                 lib.cpSpaceRemoveBody(cp_space, cp_body)
-
-            _logger.debug("bodyfree free %s", cp_body)
             lib.cpBodyFree(cp_body)
 
         if body_type == Body.DYNAMIC:
diff --git a/pymunk/constraints.py b/pymunk/constraints.py
@@ -68,7 +68,6 @@
     "SimpleMotor",
 ]
 
-import logging
 from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Tuple, Union
 
 if TYPE_CHECKING:
@@ -80,8 +79,6 @@
 from ._typing_attr import TypingAttrMixing
 from .vec2d import Vec2d
 
-_logger = logging.getLogger(__name__)
-
 _TorqueFunc = Callable[["DampedRotarySpring", float], float]
 _ForceFunc = Callable[["DampedSpring", float], float]
 
@@ -114,7 +111,6 @@ def constraintfree(cp_constraint: ffi.CData) -> None:
             if cp_space != ffi.NULL:
                 lib.cpSpaceRemoveConstraint(cp_space, cp_constraint)
 
-            _logger.debug("constraintfree %s", cp_constraint)
             lib.cpConstraintFree(cp_constraint)
 
         self._constraint = ffi.gc(_constraint, constraintfree)
@@ -453,7 +449,7 @@ def __init__(
         b: "Body",
         *args: Union[
             Tuple[float, float], Tuple[Tuple[float, float], Tuple[float, float]]
-        ]
+        ],
     ) -> None:
         """a and b are the two bodies to connect, and pivot is the point in
         world coordinates of the pivot.
diff --git a/pymunk/pyglet_util.py b/pymunk/pyglet_util.py
@@ -52,7 +52,7 @@ def __init__(self, **kwargs: Any) -> None:
         Typical usage::
 
         >>> import pymunk
-        >>> import pymunk.pygame_util
+        >>> import pymunk.pyglet_util
         >>> s = pymunk.Space()
         >>> options = pymunk.pyglet_util.DrawOptions()
         >>> s.debug_draw(options)
diff --git a/pymunk/shapes.py b/pymunk/shapes.py
@@ -1,6 +1,5 @@
 __docformat__ = "reStructuredText"
 
-import logging
 from typing import TYPE_CHECKING, List, Optional, Sequence, Tuple
 
 if TYPE_CHECKING:
@@ -18,8 +17,6 @@
 from .transform import Transform
 from .vec2d import Vec2d
 
-_logger = logging.getLogger(__name__)
-
 
 class Shape(PickleMixin, TypingAttrMixing, object):
     """Base class for all the shapes.
@@ -59,19 +56,13 @@ def _init(self, body: Optional["Body"], _shape: ffi.CData) -> None:
             body._shapes.add(self)
 
         def shapefree(cp_shape: ffi.CData) -> None:
-            _logger.debug("shapefree start %s", cp_shape)
             cp_space = cp.cpShapeGetSpace(cp_shape)
             if cp_space != ffi.NULL:
-                _logger.debug("shapefree remove from space %s %s", cp_space, cp_shape)
                 cp.cpSpaceRemoveShape(cp_space, cp_shape)
 
-            _logger.debug("shapefree get body %s", cp_shape)
             cp_body = cp.cpShapeGetBody(cp_shape)
             if cp_body != ffi.NULL:
-                _logger.debug("shapefree set body %s", cp_shape)
-                # print(cp.cpShapeActive2(cp_shape))
                 cp.cpShapeSetBody(cp_shape, ffi.NULL)
-            _logger.debug("shapefree free %s", cp_shape)
             cp.cpShapeFree(cp_shape)
 
         self._shape = ffi.gc(_shape, shapefree)
diff --git a/pymunk/space.py b/pymunk/space.py
@@ -1,6 +1,5 @@
 __docformat__ = "reStructuredText"
 
-import logging
 import platform
 import weakref
 from typing import (
@@ -39,8 +38,6 @@
 
 _AddableObjects = Union[Body, Shape, Constraint]
 
-_logger = logging.getLogger(__name__)
-
 
 class Space(PickleMixin, object):
     """Spaces are the basic unit of simulation. You add rigid bodies, shapes
@@ -100,15 +97,12 @@ def __init__(self, threaded: bool = False) -> None:
             freefunc = cp.cpSpaceFree
 
         def spacefree(cp_space: ffi.CData) -> None:
-            _logger.debug("spacefree start %s", cp_space)
-
             cp_shapes: List[Shape] = []
             cp_shapes_h = ffi.new_handle(cp_shapes)
             cp.cpSpaceEachShape(cp_space, lib.ext_cpSpaceShapeIteratorFunc, cp_shapes_h)
 
             for cp_shape in cp_shapes:
                 cp_space = lib.cpShapeGetSpace(cp_shape)
-                _logger.debug("spacefree remove shape %s %s", cp_space, cp_shape)
 
                 lib.cpSpaceRemoveShape(cp_space, cp_shape)
                 lib.cpShapeSetBody(cp_shape, ffi.NULL)
@@ -120,20 +114,15 @@ def spacefree(cp_space: ffi.CData) -> None:
             )
             for cp_constraint in cp_constraints:
                 cp_space = lib.cpConstraintGetSpace(cp_constraint)
-                _logger.debug(
-                    "spacefree remove constraint %s %s", cp_space, cp_constraint
-                )
                 lib.cpSpaceRemoveConstraint(cp_space, cp_constraint)
 
             cp_bodys: List[Body] = []
             cp_bodys_h = ffi.new_handle(cp_bodys)
             cp.cpSpaceEachBody(cp_space, lib.ext_cpSpaceBodyIteratorFunc, cp_bodys_h)
             for cp_body in cp_bodys:
                 cp_space = lib.cpBodyGetSpace(cp_body)
-                _logger.debug("spacefree remove body %s %s", cp_space, cp_body)
                 lib.cpSpaceRemoveBody(cp_space, cp_body)
 
-            _logger.debug("spacefree free %s", cp_space)
             freefunc(cp_space)
 
         self._space = ffi.gc(cp_space, spacefree)
diff --git a/pymunk/tests/__init__.py b/pymunk/tests/__init__.py
@@ -65,7 +65,7 @@ def run_tests(filter: str = "", with_dependencies: List[str] = []) -> bool:
         )
     except:
         pass
-    print("")
+    print()
 
     def list_of_tests_gen(s: Any) -> Iterator[Any]:
         for test in s:
diff --git a/pymunk/tests/test_batch.py b/pymunk/tests/test_batch.py
@@ -214,7 +214,6 @@ def check_arb_data(arb: pymunk.Arbiter) -> None:
                 # When using each_arbiter a mirror of each arbiter will be
                 # returned as well. These we ignore.
                 return
-            # print(a_id, b_id, idx, arb.total_impulse)
             # Assert int values
             self.assertEqual(arb.is_first_contact, ints[idx * 4 + 2])
             self.assertEqual(len(arb.contact_point_set.points), ints[idx * 4 + 3])
diff --git a/pymunk/tests/test_common.py b/pymunk/tests/test_common.py
diff --git a/pyproject.toml b/pyproject.toml
