[med-svn] [Git][med-team/toil][master] 2 commits: Fix Python3.12 string syntax

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / toil


Commits:
508536dd by Andreas Tille at 2024-12-12T11:04:57+01:00
Fix Python3.12 string syntax

- - - - -
b35adc32 by Andreas Tille at 2024-12-12T11:05:18+01:00
Standards-Version: 4.7.0 (routine-update)

- - - - -


4 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
 toil (7.0.0-1) UNRELEASED; urgency=medium
 
+  [ Michael R. Crusoe ]
   * New upstream version
   * Refresh patches
   * d/patches/allow_newer_requests: added
@@ -11,6 +12,11 @@ toil (7.0.0-1) UNRELEASED; urgency=medium
   * d/rules: skip online tests
   * d/patches/setting_version.patch: update for Python 3.12
 
+  [ Andreas Tille ]
+  * Fix Python3.12 string syntax
+    Closes: #1087116
+  * Standards-Version: 4.7.0 (routine-update)
+
  -- Michael R. Crusoe <crusoe at debian.org>  Mon, 27 May 2024 08:45:55 +0200
 
 toil (6.1.0-4) unstable; urgency=medium


=====================================
debian/control
=====================================
@@ -31,7 +31,7 @@ Build-Depends: debhelper-compat (= 13),
                python3-pubsub <!nodoc>,
                python3-doc <!nodoc>,
                python3-tz <!nodoc> <!nocheck>
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Vcs-Browser: https://salsa.debian.org/med-team/toil
 Vcs-Git: https://salsa.debian.org/med-team/toil.git
 Homepage: https://github.com/BD2KGenomics/toil


=====================================
debian/patches/python3.12-syntax.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Fix Python3.12 string syntax
+Bug-Debian: https://bugs.debian.org/1087116
+Author: Andreas Tille <tille at debian.org>
+Last-Update: 2024-06-12
+
+--- a/src/toil/wdl/wdltoil.py
++++ b/src/toil/wdl/wdltoil.py
+@@ -3129,7 +3129,7 @@ def main() -> None:
+             inputs_search_path = []
+             if options.inputs_uri:
+                 inputs_search_path.append(options.inputs_uri)
+-                match = re.match('https://raw\.githubusercontent\.com/[^/]*/[^/]*/[^/]*/', options.inputs_uri)
++                match = re.match(r'https://raw\.githubusercontent\.com/[^/]*/[^/]*/[^/]*/', options.inputs_uri)
+                 if match:
+                     # Special magic for Github repos to make e.g.
+                     # https://raw.githubusercontent.com/vgteam/vg_wdl/44a03d9664db3f6d041a2f4a69bbc4f65c79533f/params/giraffe.json


=====================================
debian/patches/series
=====================================
@@ -11,3 +11,4 @@ atomic_copy_as_alternative.patch
 soften-cwltool-dep.patch
 accept_debian_packaged_docker_version.patch
 allow_newer_requests
+python3.12-syntax.patch



View it on GitLab: https://salsa.debian.org/med-team/toil/-/compare/26e4087ef6787c28061336c77ed51ac6b36d36ce...b35adc32e07d3f1cd8abadf043611edb22ca0977

-- 
View it on GitLab: https://salsa.debian.org/med-team/toil/-/compare/26e4087ef6787c28061336c77ed51ac6b36d36ce...b35adc32e07d3f1cd8abadf043611edb22ca0977
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/20241212/71917ae1/attachment-0001.htm>