From patchwork Mon Sep 21 11:46:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78161 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7A4DBA04CC; Mon, 21 Sep 2020 13:50:40 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AA38E1C1A3; Mon, 21 Sep 2020 13:50:39 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 8741F1C1A2 for ; Mon, 21 Sep 2020 13:50:38 +0200 (CEST) IronPort-SDR: 97H6o6BzJCCEI35MhLblcPdzSGGidF3XPJG36575kgKx5Zh5a0zYCjlVY/+R6I272gK5C6BCqe JCWWI050WGqw== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="224504276" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="224504276" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 04:50:37 -0700 IronPort-SDR: puyLPbncAeI++z+UH1PIHXHCq5ZIAsuUjQF7359X6P72uKGfwqQ5KxuWDS1OlzpP/udQ5nwg3C wkKBNE++m5QA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="348060173" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by orsmga007.jf.intel.com with ESMTP; 21 Sep 2020 04:50:35 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchard@redhat.com, Louise Kilheeney , Kevin Laatz Date: Mon, 21 Sep 2020 12:46:25 +0100 Message-Id: <20200921114634.220328-2-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921114634.220328-1-kevin.laatz@intel.com> References: <20200821091452.2482-1-louise.kilheeney@intel.com> <20200921114634.220328-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 01/10] usertools/dpdk-telemetry-client: support python3 only X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Louise Kilheeney Changed script to explicitly use python3 only to avoid maintaining python 2 and removed deprecation notice. Cc: Kevin Laatz Signed-off-by: Louise Kilheeney Acked-by: Bruce Richardson --- usertools/dpdk-telemetry-client.py | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/usertools/dpdk-telemetry-client.py b/usertools/dpdk-telemetry-client.py index 98d28fa89b..fa599046a4 100755 --- a/usertools/dpdk-telemetry-client.py +++ b/usertools/dpdk-telemetry-client.py @@ -1,10 +1,7 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -from __future__ import print_function -from __future__ import unicode_literals - import socket import os import sys @@ -18,15 +15,6 @@ GLOBAL_METRICS_REQ = "{\"action\":0,\"command\":\"global_stat_values\",\"data\":null}" DEFAULT_FP = "/var/run/dpdk/default_client" -try: - raw_input # Python 2 -except NameError: - raw_input = input # Python 3 - -if sys.version_info.major < 3: - print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr) - print("Please use Python 3 instead", file=sys.stderr) - class Socket: def __init__(self): @@ -53,7 +41,7 @@ def __init__(self): # Creates a client instance def __del__(self): try: if self.unregistered == 0: - self.unregister(); + self.unregister() except: print("Error - Client could not be destroyed") @@ -86,7 +74,7 @@ def requestMetrics(self): # Requests metrics for given client def repeatedlyRequestMetrics(self, sleep_time): # Recursively requests metrics for given client print("\nPlease enter the number of times you'd like to continuously request Metrics:") - n_requests = int(raw_input("\n:")) + n_requests = int(input("\n:")) print("\033[F") #Removes the user input from screen, cleans it up print("\033[K") for i in range(n_requests): @@ -107,7 +95,7 @@ def interactiveMenu(self, sleep_time): # Creates Interactive menu within the scr print("[4] Unregister client") try: - self.choice = int(raw_input("\n:")) + self.choice = int(input("\n:")) print("\033[F") #Removes the user input for screen, cleans it up print("\033[K") if self.choice == 1: From patchwork Mon Sep 21 11:46:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78163 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0637FA04CC; Mon, 21 Sep 2020 13:50:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6DF6E1D94C; Mon, 21 Sep 2020 13:50:45 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id C511C1D703 for ; Mon, 21 Sep 2020 13:50:39 +0200 (CEST) IronPort-SDR: 6jC4XJVYi7z11LYom64OgqkG/SiA7Y6H/vHRNmt7jTb+3wzB1Bv6AYL/rG1OOTqO86bMmdAVG6 +0XTdrO7NiNg== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="224504278" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="224504278" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 04:50:39 -0700 IronPort-SDR: fzx2BUHc4h7x8xdm8TD+tzxLxznuiwHr+4aZJr5HEeRY0v00uBxI6vAWfWdLO/r80mUPNy6g4W 0BgmTY0iLqPg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="348060181" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by orsmga007.jf.intel.com with ESMTP; 21 Sep 2020 04:50:37 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchard@redhat.com, Louise Kilheeney Date: Mon, 21 Sep 2020 12:46:26 +0100 Message-Id: <20200921114634.220328-3-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921114634.220328-1-kevin.laatz@intel.com> References: <20200821091452.2482-1-louise.kilheeney@intel.com> <20200921114634.220328-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 02/10] usertools/dpdk-devbind: support python3 only X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Louise Kilheeney Changed script to explicitly use python3 only to avoid maintaining python 2 and removed deprecation notice. Signed-off-by: Louise Kilheeney Reviewed-by: Bruce Richardson --- usertools/dpdk-devbind.py | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py index 094c2ffc8b..8278a748d4 100755 --- a/usertools/dpdk-devbind.py +++ b/usertools/dpdk-devbind.py @@ -1,9 +1,8 @@ -#! /usr/bin/env python +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation # -from __future__ import print_function import sys import os import getopt @@ -12,10 +11,6 @@ from os.path import exists, abspath, dirname, basename from os.path import join as path_join -if sys.version_info.major < 3: - print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr) - print("Please use Python 3 instead", file=sys.stderr) - # The PCI base class for all devices network_class = {'Class': '02', 'Vendor': None, 'Device': None, 'SVendor': None, 'SDevice': None} @@ -154,14 +149,6 @@ def usage(): """ % locals()) # replace items from local variables - -# This is roughly compatible with check_output function in subprocess module -# which is only available in python 2.7. -def check_output(args, stderr=None): - '''Run a command and capture its output''' - return subprocess.Popen(args, stdout=subprocess.PIPE, - stderr=stderr).communicate()[0] - # check if a specific kernel module is loaded def module_is_loaded(module): global loaded_modules @@ -218,8 +205,7 @@ def get_pci_device_details(dev_id, probe_lspci): device = {} if probe_lspci: - extra_info = check_output(["lspci", "-vmmks", dev_id]).splitlines() - + extra_info = subprocess.check_output(["lspci", "-vmmks", dev_id]).splitlines() # parse lspci details for line in extra_info: if len(line) == 0: @@ -255,7 +241,7 @@ def get_device_details(devices_type): # first loop through and read details for all devices # request machine readable format, with numeric IDs and String dev = {} - dev_lines = check_output(["lspci", "-Dvmmnnk"]).splitlines() + dev_lines = subprocess.check_output(["lspci", "-Dvmmnnk"]).splitlines() for dev_line in dev_lines: if len(dev_line) == 0: if device_type_match(dev, devices_type): @@ -283,7 +269,7 @@ def get_device_details(devices_type): # check what is the interface if any for an ssh connection if # any to this host, so we can mark it later. ssh_if = [] - route = check_output(["ip", "-o", "route"]) + route = subprocess.check_output(["ip", "-o", "route"]) # filter out all lines for 169.254 routes route = "\n".join(filter(lambda ln: not ln.startswith("169.254"), route.decode().splitlines())) From patchwork Mon Sep 21 11:46:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78164 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 416CAA04CC; Mon, 21 Sep 2020 13:51:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1D8B61D988; Mon, 21 Sep 2020 13:50:47 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 4ED071D72B for ; Mon, 21 Sep 2020 13:50:41 +0200 (CEST) IronPort-SDR: M/xiJvWmTO9JAwc1ErTG8mIKcJF3vOnZelbrwz6axPwMOCHWwvDTJPbEpI70EFGV7/QQOIPlBZ RdiEFsjtBbPg== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="224504287" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="224504287" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 04:50:40 -0700 IronPort-SDR: ji7U6+chaE+jpPTmu9Obcmvz8kVc/VrdJOU2sSWWPvwUcIFeVxvJUgd37i6+9EUqFxzcAovsH5 y3LEUe6EhjiQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="348060189" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by orsmga007.jf.intel.com with ESMTP; 21 Sep 2020 04:50:39 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchard@redhat.com, Louise Kilheeney , Neil Horman Date: Mon, 21 Sep 2020 12:46:27 +0100 Message-Id: <20200921114634.220328-4-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921114634.220328-1-kevin.laatz@intel.com> References: <20200821091452.2482-1-louise.kilheeney@intel.com> <20200921114634.220328-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 03/10] usertools/dpdk-pmdinfo: support python3 only X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Louise Kilheeney Changed script to explicitly use python3 only to avoid maintaining python 2 and removed deprecation notice. Cc: Neil Horman Signed-off-by: Louise Kilheeney Reviewed-by: Bruce Richardson Acked-by: Neil Horman --- usertools/dpdk-pmdinfo.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/usertools/dpdk-pmdinfo.py b/usertools/dpdk-pmdinfo.py index f9ed755176..1661982791 100755 --- a/usertools/dpdk-pmdinfo.py +++ b/usertools/dpdk-pmdinfo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2016 Neil Horman @@ -7,8 +7,6 @@ # Utility to dump PMD_INFO_STRING support from an object file # # ------------------------------------------------------------------------- -from __future__ import print_function -from __future__ import unicode_literals import json import io import os @@ -28,9 +26,6 @@ pcidb = None # =========================================== -if sys.version_info.major < 3: - print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr) - print("Please use Python 3 instead", file=sys.stderr) class Vendor: """ From patchwork Mon Sep 21 11:46:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78165 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A81F7A04CC; Mon, 21 Sep 2020 13:51:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4368C1D995; Mon, 21 Sep 2020 13:50:49 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id E948D1D72B for ; Mon, 21 Sep 2020 13:50:42 +0200 (CEST) IronPort-SDR: q/4lx0IdsdKGHL64qllgU8Rjf7jUVybsiqEznoQ24oMQIKwD43EBLfWXwZ4a2BkJBRLn6O+mDU u3rtAqAPrHEQ== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="224504296" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="224504296" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 04:50:42 -0700 IronPort-SDR: A151wFuZ5IZ8K4QA3OzeVHfaBVcTbpERgdPxHt/kOov+Z6elQr74Gd+QzVlAIG+83aTVia7ObF S1Ya2AqSviIw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="348060199" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by orsmga007.jf.intel.com with ESMTP; 21 Sep 2020 04:50:41 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchard@redhat.com, Louise Kilheeney Date: Mon, 21 Sep 2020 12:46:28 +0100 Message-Id: <20200921114634.220328-5-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921114634.220328-1-kevin.laatz@intel.com> References: <20200821091452.2482-1-louise.kilheeney@intel.com> <20200921114634.220328-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 04/10] usertools/cpu_layout: support python3 only X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Louise Kilheeney Changed script to explicitly use python3 only to avoid maintaining python 2 and removed deprecation notice. Signed-off-by: Louise Kilheeney Reviewed-by: Bruce Richardson --- usertools/cpu_layout.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py index 5423c7965f..89a48cec46 100755 --- a/usertools/cpu_layout.py +++ b/usertools/cpu_layout.py @@ -1,18 +1,9 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation # Copyright(c) 2017 Cavium, Inc. All rights reserved. -from __future__ import print_function import sys -try: - xrange # Python 2 -except NameError: - xrange = range # Python 3 - -if sys.version_info.major < 3: - print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr) - print("Please use Python 3 instead", file=sys.stderr) sockets = [] cores = [] @@ -21,7 +12,7 @@ fd = open("{}/kernel_max".format(base_path)) max_cpus = int(fd.read()) fd.close() -for cpu in xrange(max_cpus + 1): +for cpu in range(max_cpus + 1): try: fd = open("{}/cpu{}/topology/core_id".format(base_path, cpu)) except IOError: From patchwork Mon Sep 21 11:46:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78166 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 36F88A04CC; Mon, 21 Sep 2020 13:51:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EEC181D9AA; Mon, 21 Sep 2020 13:50:50 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 77F061D917 for ; Mon, 21 Sep 2020 13:50:44 +0200 (CEST) IronPort-SDR: /TFr5xgayPEaU9gvq+N4PEN+nLteKwFdzfVfQt9wqhPGxE+2OqYov42yG3tXSoaMq9Z2qNje2G nGXelHMgzQ9w== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="224504302" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="224504302" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 04:50:44 -0700 IronPort-SDR: SxWjXO6lsz7shgwDJv3+Jh2L0wkri0YbkH/qMzxpX6Q937bcSyIfz2cKwWyA3FWaAQCDEDcLml vQ9tX8+dfQmA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="348060204" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by orsmga007.jf.intel.com with ESMTP; 21 Sep 2020 04:50:42 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchard@redhat.com, Kevin Laatz , Olivier Matz , Louise Kilheeney Date: Mon, 21 Sep 2020 12:46:29 +0100 Message-Id: <20200921114634.220328-6-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921114634.220328-1-kevin.laatz@intel.com> References: <20200821091452.2482-1-louise.kilheeney@intel.com> <20200921114634.220328-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 05/10] app/test-cmdline: support python3 only X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Changed script to explicitly use python3 only to avoid maintaining python 2 and removed deprecation notice. Cc: Olivier Matz Signed-off-by: Louise Kilheeney Signed-off-by: Kevin Laatz Reviewed-by: Bruce Richardson --- v5: - fixed python3 issue causing script to fail. Divisions without the typecast lead to a floating point result, which was messing up the loop. v6: - Removed changes to mk/rte.sdktest.mk since it no longer exists. --- app/test-cmdline/cmdline_test.py | 9 ++------- app/test-cmdline/cmdline_test_data.py | 1 + 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/test-cmdline/cmdline_test.py b/app/test-cmdline/cmdline_test.py index 954428e2bf..074fed7e7f 100755 --- a/app/test-cmdline/cmdline_test.py +++ b/app/test-cmdline/cmdline_test.py @@ -1,9 +1,8 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation # Script that runs cmdline_test app and feeds keystrokes into it. -from __future__ import print_function import cmdline_test_data import os import pexpect @@ -19,10 +18,6 @@ def runTest(child, test): return 0 child.expect(test["Result"], 1) -if sys.version_info.major < 3: - print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr) - print("Please use Python 3 instead", file=sys.stderr) - # # history test is a special case # @@ -43,7 +38,7 @@ def runHistoryTest(child): i = 0 # fill the history with numbers - while i < history_size / 10: + while i < int(history_size / 10): # add 1 to prevent from parsing as octals child.send("1" + str(i).zfill(8) + cmdline_test_data.ENTER) # the app will simply print out the number diff --git a/app/test-cmdline/cmdline_test_data.py b/app/test-cmdline/cmdline_test_data.py index 114d2cb6a0..2d9b3262a6 100644 --- a/app/test-cmdline/cmdline_test_data.py +++ b/app/test-cmdline/cmdline_test_data.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation From patchwork Mon Sep 21 11:46:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78167 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 05E70A04CC; Mon, 21 Sep 2020 13:51:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 821731D9CA; Mon, 21 Sep 2020 13:50:52 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 31ED31D96C for ; Mon, 21 Sep 2020 13:50:46 +0200 (CEST) IronPort-SDR: LUPYuG/AUeha/e5e7FeF0ASQWa6mTiC00TWkMHpnPYsXGtxT84RG33/iwicDDcSAJodfzQrHLw 5bV9nYDAXbuA== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="224504306" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="224504306" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 04:50:45 -0700 IronPort-SDR: RG+H3Z0BxHeRwOjkOuluo9KFxPdLNz2UNtLQR3U+HDqrJEdmyDYvXrbz2yrs1Th7Biz81ChWGK WrO6CLEUma4g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="348060212" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by orsmga007.jf.intel.com with ESMTP; 21 Sep 2020 04:50:44 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchard@redhat.com, Kevin Laatz , Louise Kilheeney Date: Mon, 21 Sep 2020 12:46:30 +0100 Message-Id: <20200921114634.220328-7-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921114634.220328-1-kevin.laatz@intel.com> References: <20200821091452.2482-1-louise.kilheeney@intel.com> <20200921114634.220328-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 06/10] app/test: support python3 only X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Changed script to explicitly use python3 only to avoid maintaining python 2 and removed deprecation notice. Signed-off-by: Louise Kilheeney Signed-off-by: Kevin Laatz --- v6: - Removed changes to mk/rte.sdktest.mk since the file no longer exists --- app/test/autotest.py | 7 +------ app/test/autotest_data.py | 1 + app/test/autotest_runner.py | 21 ++++++++------------- app/test/autotest_test_funcs.py | 1 + 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/app/test/autotest.py b/app/test/autotest.py index cf7584ccd7..9eef1efbe5 100644 --- a/app/test/autotest.py +++ b/app/test/autotest.py @@ -1,9 +1,8 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation # Script that uses either test app or qemu controlled by python-pexpect -from __future__ import print_function import autotest_data import autotest_runner import sys @@ -17,10 +16,6 @@ def usage(): usage() sys.exit(1) -if sys.version_info.major < 3: - print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr) - print("Please use Python 3 instead", file=sys.stderr) - target = sys.argv[2] test_whitelist = None diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py index 4b7da45e09..097638941f 100644 --- a/app/test/autotest_data.py +++ b/app/test/autotest_data.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation diff --git a/app/test/autotest_runner.py b/app/test/autotest_runner.py index 95e74c760d..998fe57a55 100644 --- a/app/test/autotest_runner.py +++ b/app/test/autotest_runner.py @@ -1,10 +1,10 @@ +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation # The main logic behind running autotests in parallel -from __future__ import print_function -import StringIO +import io import csv from multiprocessing import Pool, Queue import pexpect @@ -50,11 +50,7 @@ def first_cpu_on_node(node_nr): map(os.path.basename, cpu_path) ) ) - # for compatibility between python 3 and 2 we need to make interable out - # of filter return as it returns list in python 2 and a generator in 3 - m = next(iter(cpu_name)) - return int(m.group(1)) - + return int(next(cpu_name).group(1)) pool_child = None # per-process child @@ -78,7 +74,7 @@ def pool_init(queue, result_queue): cmdline = "%s %s" % (cmdline, prefix_cmdline) # prepare logging of init - startuplog = StringIO.StringIO() + startuplog = io.StringIO() # run test app try: @@ -86,8 +82,7 @@ def pool_init(queue, result_queue): print("\n%s %s\n" % ("=" * 20, prefix), file=startuplog) print("\ncmdline=%s" % cmdline, file=startuplog) - pool_child = pexpect.spawn(cmdline, logfile=startuplog) - + pool_child = pexpect.spawn(cmdline, logfile=startuplog, encoding='utf-8') # wait for target to boot if not wait_prompt(pool_child): pool_child.close() @@ -138,7 +133,7 @@ def run_test(target, test): # create log buffer for each test # in multiprocessing environment, the logging would be # interleaved and will create a mess, hence the buffering - logfile = StringIO.StringIO() + logfile = io.StringIO() pool_child.logfile = logfile # make a note when the test started @@ -210,9 +205,9 @@ def __init__(self, cmdline, target, blacklist, whitelist, n_processes): # parse the binary for available test commands binary = cmdline.split()[0] stripped = 'not stripped' not in \ - subprocess.check_output(['file', binary]) + subprocess.check_output(['file', binary]).decode() if not stripped: - symbols = subprocess.check_output(['nm', binary]).decode('utf-8') + symbols = subprocess.check_output(['nm', binary]).decode() self.avail_cmds = re.findall('test_register_(\w+)', symbols) else: self.avail_cmds = None diff --git a/app/test/autotest_test_funcs.py b/app/test/autotest_test_funcs.py index 26688b7132..775dfd1dc5 100644 --- a/app/test/autotest_test_funcs.py +++ b/app/test/autotest_test_funcs.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation From patchwork Mon Sep 21 11:46:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78168 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D0E60A04CC; Mon, 21 Sep 2020 13:51:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 331761D9E4; Mon, 21 Sep 2020 13:50:54 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 1D9FF1D96C for ; Mon, 21 Sep 2020 13:50:47 +0200 (CEST) IronPort-SDR: VcKkQfNoVNJHC7itCfxhlRquUhK+jGTAUkZfbpJSCFEFUBfrmPy/kyj9OZzAZFmRORhtDw4a9N CIEzSRO24WSg== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="224504313" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="224504313" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 04:50:47 -0700 IronPort-SDR: aPF22JLRJAQj9YgM/jaCL7/tDHwfyHmTv/0Fl2c0OwzD+F1RN96NjUt5+J0erySPiJ91vf1t+y EUn1bYRtS4YA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="348060223" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by orsmga007.jf.intel.com with ESMTP; 21 Sep 2020 04:50:46 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchard@redhat.com, Louise Kilheeney , Neil Horman , Ray Kinsella Date: Mon, 21 Sep 2020 12:46:31 +0100 Message-Id: <20200921114634.220328-8-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921114634.220328-1-kevin.laatz@intel.com> References: <20200821091452.2482-1-louise.kilheeney@intel.com> <20200921114634.220328-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 07/10] devtools: support python3 only X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Louise Kilheeney Changed script to explicitly use python3 only to avoid maintaining python 2 and removed deprecation notice. Cc: Neil Horman Cc: Ray Kinsella Signed-off-by: Louise Kilheeney Acked-by: Ray Kinsella Acked-by: Neil Horman --- devtools/update_version_map_abi.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/devtools/update_version_map_abi.py b/devtools/update_version_map_abi.py index 10c3bc8098..3536a54b44 100755 --- a/devtools/update_version_map_abi.py +++ b/devtools/update_version_map_abi.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Intel Corporation @@ -9,7 +9,6 @@ from the devtools/update-abi.sh utility. """ -from __future__ import print_function import argparse import sys import re @@ -160,10 +159,6 @@ def __generate_internal_abi(f_out, lines): print("};", file=f_out) def __main(): - if sys.version_info.major < 3: - print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr) - print("Please use Python 3 instead", file=sys.stderr) - arg_parser = argparse.ArgumentParser( description='Merge versions in linker version script.') From patchwork Mon Sep 21 11:46:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78169 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 30C44A04CC; Mon, 21 Sep 2020 13:51:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A4F421DA19; Mon, 21 Sep 2020 13:50:55 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 165CA1D998 for ; Mon, 21 Sep 2020 13:50:49 +0200 (CEST) IronPort-SDR: cBj7N9/mrbQ+HH+DKHQcIdfGudVDz58v9TukuTQFRwXXA2B58P5WLWfq0ziGCyf7LoJSYLx4fJ VFBbyYaaIwIg== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="224504317" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="224504317" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 04:50:49 -0700 IronPort-SDR: hrIEgl4+ae16JG3KWYmp3HPnnqZ/RVe1UkGuxVP9afvRZhwzwHktz3xsG7U0PGKq1Ma1wzlVY2 P3oy1NClsQdw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="348060233" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by orsmga007.jf.intel.com with ESMTP; 21 Sep 2020 04:50:47 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchard@redhat.com, Louise Kilheeney , Thomas Monjalon Date: Mon, 21 Sep 2020 12:46:32 +0100 Message-Id: <20200921114634.220328-9-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921114634.220328-1-kevin.laatz@intel.com> References: <20200821091452.2482-1-louise.kilheeney@intel.com> <20200921114634.220328-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 08/10] config/arm: support python3 only X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Louise Kilheeney Changed script to explicitly use python3 only to avoid maintaining python 2. Cc: Thomas Monjalon Signed-off-by: Louise Kilheeney --- config/arm/armv8_machine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/arm/armv8_machine.py b/config/arm/armv8_machine.py index 404866d2f8..1f689d9a83 100755 --- a/config/arm/armv8_machine.py +++ b/config/arm/armv8_machine.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Cavium, Inc From patchwork Mon Sep 21 11:46:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78170 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id DE58EA04CC; Mon, 21 Sep 2020 13:52:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1E71D1DA27; Mon, 21 Sep 2020 13:50:57 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 84CBB1D9AF for ; Mon, 21 Sep 2020 13:50:51 +0200 (CEST) IronPort-SDR: TFWZ4F/oAlqEHJ/UNcq1XXqHgMoimBKevW/KXlb8+3NbP46lvJIHB5RNz6JN2Dgjy2e0h5zhpB F8MaEWz7TzRw== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="224504321" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="224504321" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 04:50:51 -0700 IronPort-SDR: Emp5tktTAAMdpRSfFkrKblfxHU3jAoFHSXscUdRXXbvXn5YagMdwnMtlwVefDJr0QUCPCzd40v xyrW9+7DKaXw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="348060246" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by orsmga007.jf.intel.com with ESMTP; 21 Sep 2020 04:50:49 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchard@redhat.com, Louise Kilheeney , Nicolas Chautru Date: Mon, 21 Sep 2020 12:46:33 +0100 Message-Id: <20200921114634.220328-10-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921114634.220328-1-kevin.laatz@intel.com> References: <20200821091452.2482-1-louise.kilheeney@intel.com> <20200921114634.220328-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 09/10] app/test-bbdev: support python3 only X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Louise Kilheeney Changed script to explicitly use python3 only to avoid maintaining python 2 and removed deprecation notice. Cc: Nicolas Chautru Signed-off-by: Louise Kilheeney --- app/test-bbdev/test-bbdev.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/test-bbdev/test-bbdev.py b/app/test-bbdev/test-bbdev.py index 5ae2dc6c49..7d67dbe30a 100755 --- a/app/test-bbdev/test-bbdev.py +++ b/app/test-bbdev/test-bbdev.py @@ -1,9 +1,8 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -from __future__ import print_function import sys import os import argparse @@ -16,10 +15,6 @@ def kill(process): print("ERROR: Test app timed out") process.kill() -if sys.version_info.major < 3: - print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr) - print("Please use Python 3 instead", file=sys.stderr) - if "RTE_SDK" in os.environ: dpdk_path = os.environ["RTE_SDK"] else: From patchwork Mon Sep 21 11:46:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78171 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 71220A04CC; Mon, 21 Sep 2020 13:52:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 743FD1DA35; Mon, 21 Sep 2020 13:50:58 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id BD0341D9D1 for ; Mon, 21 Sep 2020 13:50:52 +0200 (CEST) IronPort-SDR: Il7Bi3wzVrDe5JN4CBkqfNDRfe7m8pLdFkqBdMdZSzkgYgmf2VRYPNY8Ia76HNavnGVseVwrqA 5S3wWjxWhPsQ== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="224504326" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="224504326" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 04:50:52 -0700 IronPort-SDR: aLuLrWbbWzfqmvRAVbK3vjS6KYlEHrChT6iLrJe0x/xn7NeYzDFc183FUyhThQ6fWzvQDlNjAt /fXv8k9CXWTQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="348060252" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by orsmga007.jf.intel.com with ESMTP; 21 Sep 2020 04:50:51 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchard@redhat.com, Kevin Laatz Date: Mon, 21 Sep 2020 12:46:34 +0100 Message-Id: <20200921114634.220328-11-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921114634.220328-1-kevin.laatz@intel.com> References: <20200821091452.2482-1-louise.kilheeney@intel.com> <20200921114634.220328-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 10/10] buildtools: support python3 only X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Changed script to explicitly use python3 only to avoid maintaining python 2 and removed deprecation notice. Signed-off-by: Kevin Laatz --- buildtools/map_to_win.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/buildtools/map_to_win.py b/buildtools/map_to_win.py index 2990b58634..2a6cb88605 100644 --- a/buildtools/map_to_win.py +++ b/buildtools/map_to_win.py @@ -1,8 +1,7 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Intel Corporation -from __future__ import print_function import sys from os.path import dirname, basename, join, exists