[med-svn] [Git][med-team/python-ete3][master] 3 commits: Initialize changelog.

Étienne Mollier (@emollier) gitlab at salsa.debian.org
Thu Dec 14 17:34:05 GMT 2023



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


Commits:
f425ef68 by Étienne Mollier at 2023-12-14T16:38:37+01:00
Initialize changelog.

- - - - -
11f45073 by Étienne Mollier at 2023-12-14T18:28:44+01:00
python3.12.patch: new: fix test failures.

Closes: #1058334

- - - - -
666f77f0 by Étienne Mollier at 2023-12-14T18:33:34+01:00
ready to upload to unstable.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/python3.12.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+python-ete3 (3.1.3+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * python3.12.patch: new: fix test failures. (Closes: #1058334)
+
+ -- Étienne Mollier <emollier at debian.org>  Thu, 14 Dec 2023 18:33:02 +0100
+
 python-ete3 (3.1.3+dfsg-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/python3.12.patch
=====================================
@@ -0,0 +1,85 @@
+Description: fix deprecated assertions in python 3.12
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1058334
+Forwarded: https://github.com/etetoolkit/ete/pull/737
+Last-Update: 2023-12-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- python-ete3.orig/ete3/test/test_arraytable.py
++++ python-ete3/ete3/test/test_arraytable.py
+@@ -33,7 +33,7 @@
+                                   0.23000000000000001, -0.29999999999999999])
+ 
+         A.remove_column("col4")
+-        self.assert_(A.get_column_vector("col4") is None )
++        self.assertIs(A.get_column_vector("col4"), None )
+ 
+         Abis = A.merge_columns({"merged1": \
+                                     ["col1", "col2"],\
+@@ -41,7 +41,7 @@
+                                     ["col5", "col6"]}, \
+                                    "mean")
+ 
+-        #self.assert_((Abis.get_column_vector("merged1")==numpy.array([-1.02, -1.35, -1.03, -1.1, -1.15, -1.075, -1.37, -1.39, ])).all()==True )
++        #self.assertTrue((Abis.get_column_vector("merged1")==numpy.array([-1.02, -1.35, -1.03, -1.1, -1.15, -1.075, -1.37, -1.39, ])).all())
+ 
+         # Continue this......
+ 
+--- python-ete3.orig/ete3/test/test_evol.py
++++ python-ete3/ete3/test/test_evol.py
+@@ -111,10 +111,10 @@
+                          sorted(['fb', 'M1', 'M2', 'M7', 'M8']))
+         self.assertEqual(len (tree.get_evol_model('M2').branches), 194)
+         self.assertEqual(tree.get_evol_model('fb').lnL, -3265.316569)
+-        self.assert_('proportions' in str(tree.get_evol_model('M2')))
+-        self.assert_('p2=' in str(tree.get_evol_model('M2')))
+-        self.assert_('proportions' not in str(tree.get_evol_model('fb')))
+-        self.assert_(' #193' in str(tree.get_evol_model('fb')))
++        self.assertIn('proportions', str(tree.get_evol_model('M2')))
++        self.assertIn('p2=', str(tree.get_evol_model('M2')))
++        self.assertNotIn('proportions', str(tree.get_evol_model('fb')))
++        self.assertIn(' #193', str(tree.get_evol_model('fb')))
+ 
+     def test_get_most_likely(self):
+         tree = EvolTree (WRKDIR + 'tree.nw')
+@@ -129,7 +129,7 @@
+         tree.workdir = 'protamine/PRM1/paml/'
+         random_swap(tree)
+         tree.link_to_evol_model (WRKDIR + 'paml/fb/fb.out', 'fb')
+-        self.assert_(check_annotation (tree))
++        self.assertTrue(check_annotation (tree))
+ 
+     def test_deep_copy(self):
+         tree = EvolTree (WRKDIR + 'tree.nw')
+@@ -173,11 +173,11 @@
+             tree = EvolTree('((seq1,seq2),seq3);')
+             tree.link_to_alignment('>seq1\nATGCTG\n>seq2\nATGCTG\n>seq3\nTTGATG\n')
+             tree.run_model('fb')
+-            self.assert_('CODONML' in tree.get_evol_model('fb').run)
+-            self.assert_('Time used:' in tree.get_evol_model('fb').run)
+-            self.assert_('end of tree file' in tree.get_evol_model('fb').run)
+-            self.assert_('lnL' in tree.get_evol_model('fb').run)
+-            self.assert_(tree.get_descendants()[0].w > 0)
++            self.assertIn('CODONML', tree.get_evol_model('fb').run)
++            self.assertIn('Time used:', tree.get_evol_model('fb').run)
++            self.assertIn('end of tree file', tree.get_evol_model('fb').run)
++            self.assertIn('lnL', tree.get_evol_model('fb').run)
++            self.assertTrue(tree.get_descendants()[0].w > 0)
+ 
+     def test_run_slr(self):
+         if which('Slr'):
+@@ -185,10 +185,10 @@
+             tree.link_to_alignment('>seq1\nCTGATTCTT\n>seq2\nCTGATTCTT\n>seq3\nATGATTCTT\n')
+             tree.run_model('SLR')
+             print(tree.get_evol_model('SLR').run)
+-            self.assert_('Sitewise Likelihood R' in tree.get_evol_model('SLR').run)
+-            self.assert_('Positively selected s' in tree.get_evol_model('SLR').run)
+-            self.assert_('Conserved sites' in tree.get_evol_model('SLR').run)
+-            self.assert_('lnL' in tree.get_evol_model('SLR').run)
++            self.assertIn('Sitewise Likelihood R', tree.get_evol_model('SLR').run)
++            self.assertIn('Positively selected s', tree.get_evol_model('SLR').run)
++            self.assertIn('Conserved sites', tree.get_evol_model('SLR').run)
++            self.assertIn('lnL', tree.get_evol_model('SLR').run)
+ 
+     def test_marking_trees(self):
+         TREE_PATH = DATAPATH + '/S_example/'


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 syntax_fixes.patch
 pmodeltest_executable.patch
+python3.12.patch



View it on GitLab: https://salsa.debian.org/med-team/python-ete3/-/compare/fe52ec8644b7dec36539cf763370fea3f9be8ed3...666f77f0412a14d3489ea5590c247b4bf64c5415

-- 
View it on GitLab: https://salsa.debian.org/med-team/python-ete3/-/compare/fe52ec8644b7dec36539cf763370fea3f9be8ed3...666f77f0412a14d3489ea5590c247b4bf64c5415
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/20231214/8b1aa315/attachment-0001.htm>


More information about the debian-med-commit mailing list