From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EC5A14624E for ; Mon, 17 Feb 2025 18:06:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E6EC0400D6; Mon, 17 Feb 2025 18:06:09 +0100 (CET) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id 7FF9640289 for ; Mon, 17 Feb 2025 18:06:08 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-38f286b5281so2124852f8f.1 for ; Mon, 17 Feb 2025 09:06:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739811968; x=1740416768; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hC4iwxTo8DMByhe/t5lvRXne3Rz201vuYHZS0NKz7rE=; b=WlOSDlQn6/RpqkIk7c1sJtKmYuuqkPh1tkYMClFa7URyBW/cgUVyWRVKYQ/r+iOI3D MeNZUewTaYQve7GMQqcOsWjrw/m/wmN53x5pZQqah5LWAU7Y5LM2WfpW5+XZ+5QhKA9w QggUGp9Zj/geut1uQMyiLP1ccAwBNFg36TGmdOq2yrpf8GIIt7fRYwtNR+LUTcDSzbxn QzRYQH/AtKuir7gF/FJM5YhbDv6C51syx3YoZTkM1jU7yKfT7UrCW90Yop7fnz5LUogw KfaYPU609/pKqTVcCxC07COtETYxujUU8iOCKyGTdDc75jaM1IGXk5uVTAfv9KwvogTN RbyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739811968; x=1740416768; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hC4iwxTo8DMByhe/t5lvRXne3Rz201vuYHZS0NKz7rE=; b=OwBy+5pq/h6O7Xq2raBTQZnxIEpFH0qoK+cWP0n/pZ70XyVfRF9qwTR1ttIlS0USgp /NmBv/Jyw2wyXDy5kiXIgwrBXdaSPaAcHrvjUkOwO8jaluCDACwnfj06UVkhmjNDTL2J dg/QAl+R6af35u7ESH6ujZTI7dHBV5yTYmG8IJGvNQbnPD6IVYjHlbvWJ63NTTikaNj/ IWR/qzbPxBDr2J/dD2HcxoA1Roh1Qhk5A55E4zLwNEsaOTfAlkv/QKFOqKZU0rpdc7ix PHobXrwLI6TGiw7a6fT9ZCo2xFi0Asu4i1yqtEbTAp4jqJojL5qEnNmePPUqhd+sLP6y TEUA== X-Forwarded-Encrypted: i=1; AJvYcCXBuJ064URot8dUvWcrtdRQdK3Ql67cJI1o+8hXpyMDeZLg217HiQfWeexfWQeLgVp6D+gtzX4=@dpdk.org X-Gm-Message-State: AOJu0YxS72r9leQ712LauMlPCvU6Z6NYDPlOBSeeXR9BfNCm25OKqCje /mKXoRrM68spgb22mNuW0YHx31RmwMZD4KS+6wIPlGi3xJS2ZCpyH99/fG5QS5dfJQ== X-Gm-Gg: ASbGncsV4oiVfcDm8lyomBzeeUaqAVVZtMOkVyzUdAwLPc2nbpK8mA0+LOO9vjpVMzB F6yArvm5tL/YsgPMrydsLfVYZ9TVWp8uNuU73aQqr8eHwXzWqnriAaobTLj44ZluoOmHLteGPHe 7etEd75BjV+yi4aFnDW6KaEvxXADHijVgyYmn/Sk8lGkAGO11C25lp9GrHBVP/oaFq/I84iX6U3 yR9ORDWv6ApMlJ7hjtV9udL9v7DsDdqQDO1DHvDOJYqAMyPsc2uyk/PxUfYSH2fBoNiJFCf1Ulh 8zxrV9W01/GkUhbS9xD6nw== X-Google-Smtp-Source: AGHT+IHU7FmdaVtusNmtAMlsGgQP569bQXfLBpbT4/LlhaZojDxKqebVj8bP+aCj+5ReD8dIfSVyuQ== X-Received: by 2002:a5d:47ce:0:b0:38f:3a89:fdae with SMTP id ffacd0b85a97d-38f3a8a019emr7425774f8f.46.1739811967890; Mon, 17 Feb 2025 09:06:07 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38f259f7fe6sm12543126f8f.86.2025.02.17.09.06.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:06:07 -0800 (PST) From: luca.boccassi@gmail.com To: Ariel Otilibili Cc: Robin Jarry , Luca Vizzarro , dpdk stable Subject: patch 'use Python raw string notation' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:03:56 +0000 Message-ID: <20250217170456.1068278-23-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/19/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/36f4323ab38a21028cb1d41c253f815031ef4915 Thanks. Luca Boccassi --- >From 36f4323ab38a21028cb1d41c253f815031ef4915 Mon Sep 17 00:00:00 2001 From: Ariel Otilibili Date: Sat, 14 Dec 2024 11:36:35 +0100 Subject: [PATCH] use Python raw string notation [ upstream commit d3e90e5e37872f1040f37a08b056102c1a302bb3 ] * follow up of a discussion with Robin Jarry * since 3.12 invalid escape sequences generate SyntaxWarning * in the future, these invalid sequences will generate SyntaxError * therefore changed syntax to raw string notation. Link: https://inbox.dpdk.org/dev/D6AMQXRSG8E7.33BAORRHRHV9A@redhat.com/ Link: https://docs.python.org/3/whatsnew/3.12.html#other-language-changes Fixes: 9d4efc5cc6f9 ("buildtools: fix NUMA nodes count") Fixes: f88b0b892204 ("devtools: forbid indent with tabs in Meson") Suggested-by: Robin Jarry Signed-off-by: Ariel Otilibili Reviewed-by: Luca Vizzarro --- buildtools/get-numa-count.py | 2 +- devtools/check-meson.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/get-numa-count.py b/buildtools/get-numa-count.py index 2f243886cd..f8bea5b58e 100644 --- a/buildtools/get-numa-count.py +++ b/buildtools/get-numa-count.py @@ -11,7 +11,7 @@ import re if os.name == 'posix': if os.path.isdir('/sys/devices/system/node'): numa_nodes = glob.glob('/sys/devices/system/node/node*') - numa_nodes.sort(key=lambda l: int(re.findall('\d+', l)[0])) + numa_nodes.sort(key=lambda l: int(re.findall(r'\d+', l)[0])) print(int(os.path.basename(numa_nodes[-1])[4:]) + 1) else: subprocess.run(['sysctl', '-n', 'vm.ndomains'], check=False) diff --git a/devtools/check-meson.py b/devtools/check-meson.py index 4b2338828d..9a33d8b036 100755 --- a/devtools/check-meson.py +++ b/devtools/check-meson.py @@ -51,7 +51,7 @@ def check_indentation(filename, contents): code, comments = split_code_comments(line) if not code.strip(): continue - if re.match('^ *\t', code): + if re.match(r'^ *\t', code): print(f'Error parsing {filename}:{lineno}, got some tabulation') if code.endswith('files('): if infiles: -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:17.684389318 +0000 +++ 0023-use-Python-raw-string-notation.patch 2025-02-17 16:13:16.806441593 +0000 @@ -1 +1 @@ -From d3e90e5e37872f1040f37a08b056102c1a302bb3 Mon Sep 17 00:00:00 2001 +From 36f4323ab38a21028cb1d41c253f815031ef4915 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d3e90e5e37872f1040f37a08b056102c1a302bb3 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -21,5 +22,3 @@ - buildtools/get-numa-count.py | 2 +- - devtools/check-meson.py | 2 +- - dts/framework/testbed_model/traffic_generator/scapy.py | 2 +- - dts/tests/TestSuite_smoke_tests.py | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + buildtools/get-numa-count.py | 2 +- + devtools/check-meson.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) @@ -53,25 +51,0 @@ -diff --git a/dts/framework/testbed_model/traffic_generator/scapy.py b/dts/framework/testbed_model/traffic_generator/scapy.py -index d24efc44e6..a16cdf6758 100644 ---- a/dts/framework/testbed_model/traffic_generator/scapy.py -+++ b/dts/framework/testbed_model/traffic_generator/scapy.py -@@ -237,6 +237,6 @@ class ScapyTrafficGenerator(PythonShell, CapturingTrafficGenerator): - ) - # In the string of bytes "b'XXXX'", we only want the contents ("XXXX") - list_of_packets_base64 = re.findall( -- f"^b'({REGEX_FOR_BASE64_ENCODING})'", packet_strs, re.MULTILINE -+ rf"^b'({REGEX_FOR_BASE64_ENCODING})'", packet_strs, re.MULTILINE - ) - return [Ether(base64_bytes(pakt)) for pakt in list_of_packets_base64] -diff --git a/dts/tests/TestSuite_smoke_tests.py b/dts/tests/TestSuite_smoke_tests.py -index bc3a2a6bf9..ab5ad44850 100644 ---- a/dts/tests/TestSuite_smoke_tests.py -+++ b/dts/tests/TestSuite_smoke_tests.py -@@ -136,7 +136,7 @@ class TestSmokeTests(TestSuite): - # with the address for the nic we are on in the loop and then captures the - # name of the driver in a group - devbind_info_for_nic = re.search( -- f"{nic.pci}[^\\n]*drv=([\\d\\w-]*) [^\\n]*", -+ rf"{nic.pci}[^\\n]*drv=([\\d\\w-]*) [^\\n]*", - all_nics_in_dpdk_devbind, - ) - self.verify(