[med-svn] [Git][med-team/python-freecontact][master] 4 commits: d/s/options: delete: make dgit and quilt behavior more consistent.

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch master at Debian Med / python-freecontact


Commits:
226c56b5 by Étienne Mollier at 2024-09-13T19:58:13+02:00
d/s/options: delete: make dgit and quilt behavior more consistent.

The change involves also removal of .gitignore file tailored for
Debian packaging work, better seated in ~/.config/git/ignore.

- - - - -
9b239b06 by Étienne Mollier at 2024-09-13T20:39:19+02:00
d/{rules,clean}: workaround failure to link against boost_python.

- - - - -
1a40ea01 by Yue Gui at 2024-09-13T20:41:12+02:00
fix_test_failed.patch: new: fix failed tests.

modify the relevant parts in test/test01.py to be compatible with
Python 3.12

Signed-off-by: Étienne Mollier <emollier at debian.org>
Closes: #1081639

- - - - -
ef1a8ad8 by Étienne Mollier at 2024-09-13T20:45:03+02:00
Ready for upload to unstable.

- - - - -


8 changed files:

- − .gitignore
- debian/changelog
- + debian/clean
- − debian/patches/debian-changes
- + debian/patches/fix_test_failed.patch
- debian/patches/series
- debian/rules
- − debian/source/options


Changes:

=====================================
.gitignore deleted
=====================================
@@ -1,7 +0,0 @@
-build
-*.swp
-files
-*.debhelper.log
-*.substvars
-python-freecontact
-.pc


=====================================
debian/changelog
=====================================
@@ -1,3 +1,20 @@
+python-freecontact (1.1-8) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Étienne Mollier ]
+  * d/s/options: delete: make dgit and quilt behavior more consistent.
+    The change involves also removal of .gitignore file tailored for
+    Debian packaging work, better seated in ~/.config/git/ignore.
+  * d/{rules,clean}: workaround failure to link against boost_python.
+
+  [ Yue Gui ]
+  * fix_test_failed.patch: new: fix failed tests.
+    modify the relevant parts in test/test01.py to be compatible with
+    Python 3.12 (Closes: #1081639)
+
+ -- Étienne Mollier <emollier at debian.org>  Fri, 13 Sep 2024 20:42:27 +0200
+
 python-freecontact (1.1-7) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+libboost_python.so


=====================================
debian/patches/debian-changes deleted
=====================================
@@ -1,17 +0,0 @@
-Description: Autogenerated patch header for a single-debian-patch file.
- The delta against upstream is either kept as a single patch, or maintained
- in some VCS, and exported as a single patch instead of more manageable
- atomic patches.
-Forwarded: not-needed
-
----
---- /dev/null
-+++ python-freecontact-1.1/.gitignore
-@@ -0,0 +1,7 @@
-+build
-+*.swp
-+files
-+*.debhelper.log
-+*.substvars
-+python-freecontact
-+.pc


=====================================
debian/patches/fix_test_failed.patch
=====================================
@@ -0,0 +1,43 @@
+Description: fix test failed
+ modify the relevant parts in test/test01.py to be compatible with
+ Python 3.12
+Author: Yue Gui <yuemeng.gui at gmail.com>
+Bug-Debian: https://bugs.debian.org/1081639
+Forwarded: no
+Reviewed-by: Étienne Mollier <emollier at debian.org>
+Last-Update: 2024-09-13
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- python-freecontact.orig/test/test01.py
++++ python-freecontact/test/test01.py
+@@ -17,7 +17,6 @@
+ # 
+ import freecontact
+ import unittest
+-from test import test_support
+ 
+ class MyTestCase1(unittest.TestCase):
+ 
+@@ -43,9 +42,9 @@
+         assert fcp.dbg == True
+ 
+     def test3(self):
+-        EXAMPLE = open('examples/demo_1000.aln', 'r')
+-        aln = EXAMPLE.readlines(); aln = map(lambda s: s.rstrip(), aln)
+-        EXAMPLE.close()
++        with open('examples/demo_1000.aln') as EXAMPLE:
++            aln = EXAMPLE.readlines()
++        aln = list(map(lambda s: s.rstrip(), aln))
+ 
+         num_threads = 1
+         evfold_24_42 = 0.0129471030086279 # 0-based indices
+@@ -80,8 +79,7 @@
+         assert abs(res['fro'][2741][2] - evfold_24_42) / evfold_24_42 < prec_threshold
+ 
+ def test_main():
+-    test_support.run_unittest(MyTestCase1
+-                             )
++    unittest.main()
+ 
+ if __name__ == '__main__':
+     test_main()


=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-debian-changes
+fix_test_failed.patch


=====================================
debian/rules
=====================================
@@ -5,6 +5,14 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 export PYBUILD_NAME = freecontact
 
+export PY3SO = $(shell py3versions --default --version | sed 's/\.//')
+
+# Workaround linker error, failing to locate -lboost_python.
+export LIBRARY_PATH = $(CURDIR)
+execute_before_dh_auto_build:
+	ln -sv /usr/lib/$(DEB_HOST_MULTIARCH)/libboost_python$(PY3SO).so \
+		$(CURDIR)/libboost_python.so
+
 %:
 	dh $@ --with python3 --buildsystem=pybuild --builddirectory=$(CURDIR)/builddir
 


=====================================
debian/source/options deleted
=====================================
@@ -1 +0,0 @@
-single-debian-patch



View it on GitLab: https://salsa.debian.org/med-team/python-freecontact/-/compare/64efa8beefbfa02255b3e3bff1bce124832dc63d...ef1a8ad80682ba984a80e301ace021b26134e3d1

-- 
View it on GitLab: https://salsa.debian.org/med-team/python-freecontact/-/compare/64efa8beefbfa02255b3e3bff1bce124832dc63d...ef1a8ad80682ba984a80e301ace021b26134e3d1
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/20240913/cd251fba/attachment-0001.htm>