Andreas Tille pushed to branch master at Debian Med / pyode
Commits:
9d57ecdc by Andreas Tille at 2024-04-05T08:42:29+02:00
Add support for Cython 3
- - - - -
5f48a257 by Andreas Tille at 2024-04-05T08:43:13+02:00
routine-update: Standards-Version: 4.6.2
- - - - -
978c2a8d by Andreas Tille at 2024-04-05T08:43:20+02:00
routine-update: Remove trailing whitespace in debian/changelog
- - - - -
84feabd1 by Andreas Tille at 2024-04-05T08:43:20+02:00
routine-update: Build-Depends: s/dh-python/dh-sequence-python3/
- - - - -
a6517818 by Andreas Tille at 2024-04-05T08:46:11+02:00
routine-update: Ready to upload to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/control
- + debian/patches/Add-support-for-Cython-3.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+pyode (1.2.0.dev15-5) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Benjamin Drung ]
+ * Add support for Cython 3
+ Closes: #1068428
+
+ [ Andreas Tille ]
+ * Standards-Version: 4.6.2 (routine-update)
+ * Remove trailing whitespace in debian/changelog (routine-update)
+ * Build-Depends: s/dh-python/dh-sequence-python3/ (routine-update)
+
+ -- Andreas Tille <tille at debian.org> Fri, 05 Apr 2024 08:43:30 +0200
+
pyode (1.2.0.dev15-4) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -7,12 +7,12 @@ Section: python
Priority: optional
Testsuite: autopkgtest-pkg-python
Build-Depends: debhelper-compat (= 13),
- dh-python,
+ dh-sequence-python3,
python3-all-dev,
libode-dev,
cython3,
python3-setuptools
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/med-team/pyode
Vcs-Git: https://salsa.debian.org/med-team/pyode.git
Homepage: https://github.com/filipeabperes/Py3ODE
=====================================
debian/patches/Add-support-for-Cython-3.patch
=====================================
@@ -0,0 +1,36 @@
+From: Benjamin Drung <benjamin.drung at canonical.com>
+Date: Fri, 5 Apr 2024 02:21:21 +0200
+Subject: Add support for Cython 3
+Bug-Debian: https://bugs.debian.org/1068428
+
+See https://cython.readthedocs.io/en/latest/src/userguide/migrating_to_cy30.html
+
+Signed-off-by: Benjamin Drung <benjamin.drung at canonical.com>
+---
+ src/declarations.pyx | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/declarations.pyx b/src/declarations.pyx
+index b69a0e1..f274ad6 100755
+--- a/src/declarations.pyx
++++ b/src/declarations.pyx
+@@ -80,8 +80,8 @@ cdef extern from "ode/ode.h":
+ dVector3 f2
+ dVector3 t2
+
+- ctypedef void dNearCallback(void* data, dGeomID o1, dGeomID o2)
+- ctypedef dReal dHeightfieldGetHeight( void* p_user_data, int x, int z )
++ ctypedef void dNearCallback(void* data, dGeomID o1, dGeomID o2) except *
++ ctypedef dReal dHeightfieldGetHeight( void* p_user_data, int x, int z ) except *
+
+ ctypedef void dGetAABBFn (dGeomID, dReal aabb[6])
+ ctypedef int dColliderFn (dGeomID o1, dGeomID o2, int flags, dContactGeom *contact, int skip)
+@@ -322,7 +322,7 @@ cdef extern from "ode/ode.h":
+ void dBodySetGravityMode (dBodyID b, int mode)
+ int dBodyGetGravityMode (dBodyID b)
+
+- void dBodySetMovedCallback(dBodyID b, void (*callback)(dBodyID))
++ void dBodySetMovedCallback(dBodyID b, void (*callback)(dBodyID) except *)
+
+ dGeomID dBodyGetFirstGeom (dBodyID b)
+ dGeomID dBodyGetNextGeom (dGeomID g)
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
01_fix_setup.patch
02_add_shebang.patch
03_spellings.patch
+Add-support-for-Cython-3.patch
=====================================
debian/rules
=====================================
@@ -5,4 +5,4 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export PYBUILD_NAME = pyode
%:
- dh $@ --with python3 --buildsystem=pybuild
+ dh $@ --buildsystem=pybuild
View it on GitLab: https://salsa.debian.org/med-team/pyode/-/compare/1e56c15533040559154f03f79df13453bd55928d...a651781838f9ed7baf44ee260f6367d8f1b07edc
--
View it on GitLab: https://salsa.debian.org/med-team/pyode/-/compare/1e56c15533040559154f03f79df13453bd55928d...a651781838f9ed7baf44ee260f6367d8f1b07edc
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20240405/57c85db1/attachment-0001.htm>