[med-svn] [Git][med-team/ariba][master] 3 commits: Fix Python3.12 syntax warnings Closes: #1085332

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / ariba


Commits:
6ea87fc3 by Andreas Tille at 2024-12-04T17:24:55+01:00
Fix Python3.12 syntax warnings Closes: #1085332

- - - - -
02b72909 by Andreas Tille at 2024-12-04T17:25:11+01:00
Standards-Version: 4.7.0 (routine-update)

- - - - -
e5f9cbe6 by Andreas Tille at 2024-12-04T17:31:25+01:00
routine-update: Ready to upload to unstable

- - - - -


4 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+ariba (2.14.7+ds-5) unstable; urgency=medium
+
+  * Team upload.
+  * Fix Python3.12 syntax warnings
+    Closes: #1085332
+  * Standards-Version: 4.7.0 (routine-update)
+
+ -- Andreas Tille <tille at debian.org>  Wed, 04 Dec 2024 17:25:45 +0100
+
 ariba (2.14.7+ds-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -26,7 +26,7 @@ Build-Depends: debhelper-compat (= 13),
                help2man,
                asciidoctor,
                spades [amd64] <!nocheck>
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Vcs-Browser: https://salsa.debian.org/med-team/ariba
 Vcs-Git: https://salsa.debian.org/med-team/ariba.git
 Homepage: https://github.com/sanger-pathogens/ariba


=====================================
debian/patches/python3.12_syntax_warning.patch
=====================================
@@ -0,0 +1,22 @@
+Description: Fix Python3.12 syntax warnings
+Bug-Debian: https://bugs.debian.org/1085332
+Author: Andreas Tille <tille at debian.org>
+Last-Update: 2024-12-04
+
+--- a/ariba/external_progs.py
++++ b/ariba/external_progs.py
+@@ -30,10 +30,10 @@ prog_to_env_var = {x: 'ARIBA_' + x.upper
+ # ... make the regex permissive and hope things
+ # still work for later versions
+ prog_to_version_cmd = {
+-    'bowtie2': ('--version', re.compile('.*bowtie2.*version (.*)$')),
+-    'cdhit': ('', re.compile('CD-HIT version ([0-9\.]+) \(')),
+-    'nucmer': ('--version', re.compile('([0-9]+\.[0-9\.]+.*$)')),
+-    'spades': ('--version', re.compile('SPAdes.*v([0-9\.]+)'))
++    'bowtie2': ('--version', re.compile(r'.*bowtie2.*version (.*)$')),
++    'cdhit': ('', re.compile(r'CD-HIT version ([0-9\.]+) \(')),
++    'nucmer': ('--version', re.compile(r'([0-9]+\.[0-9\.]+.*$)')),
++    'spades': ('--version', re.compile(r'SPAdes.*v([0-9\.]+)'))
+ }
+ 
+ 


=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ disable-tests-with-internet-access.patch
 support-pymummer-0.11.patch
 run-debian-spades-wrapper.patch
 python3.12.patch
+python3.12_syntax_warning.patch



View it on GitLab: https://salsa.debian.org/med-team/ariba/-/compare/d37cbabb96fe081d8969ffd7dd40239633619ef7...e5f9cbe60bcfe900d4aff1f684c18992406b106a

-- 
View it on GitLab: https://salsa.debian.org/med-team/ariba/-/compare/d37cbabb96fe081d8969ffd7dd40239633619ef7...e5f9cbe60bcfe900d4aff1f684c18992406b106a
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/20241204/8b1869c6/attachment-0001.htm>