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 82C0246211 for ; Thu, 13 Feb 2025 11:01:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7D7CD40287; Thu, 13 Feb 2025 11:01:53 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id E4BD042EF1 for ; Thu, 13 Feb 2025 11:01:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9rrtb5XElrHED+o/Pd3V4WdjPjoL6AHi615FfqKH0kM=; b=PTNCwa+1UI+671m63gKFvqk73deJ6C9dS+vLJ5vUQrASrpMl8cY4i5oiQvW+FJPOF+0Oct pWNmX3UQsuKE4awG0YrgfDwh3J3MPYnzwffjmtAkkD1LiliHNqTfU4LX1hAOT4G3mDJ7Dg QJsiHTbahnGkgbLnngzP8/GQAIM+Rh4= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-452-VZNu4hVVOCeDUv1pW2pzAA-1; Thu, 13 Feb 2025 05:01:48 -0500 X-MC-Unique: VZNu4hVVOCeDUv1pW2pzAA-1 X-Mimecast-MFC-AGG-ID: VZNu4hVVOCeDUv1pW2pzAA Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 41B61180087A; Thu, 13 Feb 2025 10:01:47 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7CC741800360; Thu, 13 Feb 2025 10:01:45 +0000 (UTC) From: Kevin Traynor To: Ariel Otilibili Cc: Robin Jarry , Luca Vizzarro , dpdk stable Subject: patch 'use Python raw string notation' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:21 +0000 Message-ID: <20250213095933.362078-54-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: UCHixgHoFDp5nXimbpKJxHJLAwR0q4WwCJ9RZ0XFyyI_1739440907 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.2 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/17/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/1e055d1d2cab5a3536482a0b15eed045225ca9d1 Thanks. Kevin --- >From 1e055d1d2cab5a3536482a0b15eed045225ca9d1 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 +- dts/framework/testbed_model/traffic_generator/scapy.py | 2 +- dts/tests/TestSuite_smoke_tests.py | 2 +- 4 files changed, 4 insertions(+), 4 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 @@ -12,5 +12,5 @@ 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: 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 @@ -52,5 +52,5 @@ def check_indentation(filename, contents): 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('): diff --git a/dts/framework/testbed_model/traffic_generator/scapy.py b/dts/framework/testbed_model/traffic_generator/scapy.py index 1251ca65a0..f9f3d24f9c 100644 --- a/dts/framework/testbed_model/traffic_generator/scapy.py +++ b/dts/framework/testbed_model/traffic_generator/scapy.py @@ -235,5 +235,5 @@ 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 @@ -137,5 +137,5 @@ class TestSmokeTests(TestSuite): # 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, ) -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:40.271243646 +0000 +++ 0054-use-Python-raw-string-notation.patch 2025-02-12 17:29:34.359945983 +0000 @@ -1 +1 @@ -From d3e90e5e37872f1040f37a08b056102c1a302bb3 Mon Sep 17 00:00:00 2001 +From 1e055d1d2cab5a3536482a0b15eed045225ca9d1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d3e90e5e37872f1040f37a08b056102c1a302bb3 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -50 +51 @@ -index d24efc44e6..a16cdf6758 100644 +index 1251ca65a0..f9f3d24f9c 100644 @@ -53 +54 @@ -@@ -238,5 +238,5 @@ class ScapyTrafficGenerator(PythonShell, CapturingTrafficGenerator): +@@ -235,5 +235,5 @@ class ScapyTrafficGenerator(PythonShell, CapturingTrafficGenerator):