Étienne Mollier pushed to branch master at Debian Med / uncalled
Commits: e42e812b by Étienne Mollier at 2024-12-03T20:10:19+01:00 debian_toml11.patch: normalize last-update timestamp. - - - - - 15bc9b7b by Étienne Mollier at 2024-12-03T20:12:36+01:00 skip_read_until: unfuzz patch. - - - - - 818560bc by Étienne Mollier at 2024-12-03T20:44:11+01:00 syntax-warning.patch: new: fix SyntaxWarnings. Closes: #1087156 - - - - - 5a13f1b3 by Étienne Mollier at 2024-12-03T21:20:32+01:00 d/changelog: ready for upload to unstable. - - - - - 5 changed files: - debian/changelog - debian/patches/debian_toml11.patch - debian/patches/series - debian/patches/skip_read_until - + debian/patches/syntax-warning.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +uncalled (2.3+ds-3) unstable; urgency=medium + + * Team upload + * debian_toml11.patch: normalize last-update timestamp. + * skip_read_until: unfuzz patch. + * syntax-warning.patch: new: fix SyntaxWarnings. (Closes: #1087156) + + -- Étienne Mollier <[email protected]> Tue, 03 Dec 2024 20:44:38 +0100 + uncalled (2.3+ds-2) unstable; urgency=medium * Team upload ===================================== debian/patches/debian_toml11.patch ===================================== @@ -1,6 +1,6 @@ Description: Use Debian packaged toml11 Author: Andreas Tille <[email protected]> -Last-Update: Wed, 16 Feb 2022 15:39:15 +0100 +Last-Update: 2022-02-16 --- a/Makefile +++ b/Makefile ===================================== debian/patches/series ===================================== @@ -5,3 +5,4 @@ debian_pybind11 skip_read_until debian_pdqsort debian_toml11.patch +syntax-warning.patch ===================================== debian/patches/skip_read_until ===================================== @@ -1,9 +1,9 @@ Author: Michael R. Crusoe <[email protected]> Description: Skip unpackaged (and optional) read-util Python module Forwarded: not-needed ---- a/setup.py -+++ b/setup.py -@@ -140,7 +140,6 @@ setup( +--- uncalled.orig/setup.py ++++ uncalled/setup.py +@@ -141,7 +141,6 @@ ], install_requires=[ ===================================== debian/patches/syntax-warning.patch ===================================== @@ -0,0 +1,57 @@ +Description: Address a couple of Python SyntaxWarnings. + Running uncalled with Python 3.13 raises a couple of syntax warning, + reproducible for instance by running the example script: + . + $ cd example + $ ./run_example.sh + /usr/bin/uncalled:307: SyntaxWarning: invalid escape sequence '\-' + log_re = re.compile("^([0-9\-]+ [0-9:]+).+ :.+instance_started.+") + /usr/bin/uncalled:308: SyntaxWarning: invalid escape sequence '\d' + port_re = re.compile("grpc_port = (\d+)") + /usr/bin/uncalled:309: SyntaxWarning: invalid escape sequence '\s' + device_re = re.compile("(device_id|instance) = ([^\s,]+)") + […] + . + In addition, Debian bug #1087156 reported also another instance of the + issue in the debug.py script: + + Setting up uncalled (2.3+ds-2) ... + /usr/lib/python3/dist-packages/uncalled/debug.py:23: SyntaxWarning: invalid escape sequence '\d' + CIG_RE = re.compile("(\d+)(["+CIG_OPS_STR+"])") + . + This change adjusts strings to become raw strings, in order to spare + Python further attempts to interpret backslashed characters as escape + sequences that are invalid. + +Author: Étienne Mollier <[email protected]> +Bug-Debian: https://bugs.debian.org/1087156 +Forwarded: https://github.com/skovaka/UNCALLED/pull/61 +Last-Update: 2024-12-03 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- uncalled.orig/uncalled/debug.py ++++ uncalled/uncalled/debug.py +@@ -20,7 +20,7 @@ + + #Cigar parsing + CIG_OPS_STR = "MIDNSHP=X" +-CIG_RE = re.compile("(\d+)(["+CIG_OPS_STR+"])") ++CIG_RE = re.compile(r"(\d+)(["+CIG_OPS_STR+"])") + CIG_OPS = set(CIG_OPS_STR) + CIG_INCR_ALL = {'M','=', 'X'} + CIG_INCR_RD = CIG_INCR_ALL | {'I','S'} +--- uncalled.orig/scripts/uncalled ++++ uncalled/scripts/uncalled +@@ -304,9 +304,9 @@ + + #TODO fix + def list_ports_cmd(args): +- log_re = re.compile("^([0-9\-]+ [0-9:]+).+ :.+instance_started.+") +- port_re = re.compile("grpc_port = (\d+)") +- device_re = re.compile("(device_id|instance) = ([^\s,]+)") ++ log_re = re.compile(r"^([0-9\-]+ [0-9:]+).+ :.+instance_started.+") ++ port_re = re.compile(r"grpc_port = (\d+)") ++ device_re = re.compile(r"(device_id|instance) = ([^\s,]+)") + + fnames = os.listdir(args.log_dir) + log_fnames = list(sorted( (f for f in fnames if f.startswith("mk_manager_svc")) )) View it on GitLab: https://salsa.debian.org/med-team/uncalled/-/compare/82418142d6ffea293b3a2dc375bc3bc86e9a9bec...5a13f1b3128c0f04559a3719d82921bded8923af -- View it on GitLab: https://salsa.debian.org/med-team/uncalled/-/compare/82418142d6ffea293b3a2dc375bc3bc86e9a9bec...5a13f1b3128c0f04559a3719d82921bded8923af You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
