From patchwork Mon Sep 21 12:03:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78172 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 B7D0EA04CC; Mon, 21 Sep 2020 14:08:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 530E11D993; Mon, 21 Sep 2020 14:08:09 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 8941E1D97C for ; Mon, 21 Sep 2020 14:08:06 +0200 (CEST) IronPort-SDR: NA5mJQIYVGqtQ3m0OnI28nYMsEjxF4EEUwHKG4fXO5f0AblucYXMID+AmVlCOv0N4tX/GkNavy W5GPJuXRvDUw== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="157742877" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="157742877" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 05:08:03 -0700 IronPort-SDR: fbyZeYxInAnHtw4Ry+55Hp8DYKVvOeLZ1IcrCU9jlWnk7Kvn0qMk2T0zbm4r1Hr4pBeRraPu30 ugMqaowIHklQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="289925377" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by fmsmga007.fm.intel.com with ESMTP; 21 Sep 2020 05:08:01 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchand@redhat.com, Louise Kilheeney , Kevin Laatz Date: Mon, 21 Sep 2020 13:03:48 +0100 Message-Id: <20200921120357.220588-2-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921120357.220588-1-kevin.laatz@intel.com> References: <20200921114634.220328-1-kevin.laatz@intel.com> <20200921120357.220588-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v7 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 12:03:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78173 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 E153AA04CC; Mon, 21 Sep 2020 14:08:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1B5E81D9AC; Mon, 21 Sep 2020 14:08:13 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id F29011D97C for ; Mon, 21 Sep 2020 14:08:08 +0200 (CEST) IronPort-SDR: aSU36ZIeK+Uj56nZm7tAKJhF0FFC61XAa3p3rrVqdlvV7EKtVI4TvkhurryEBf+Dn860WkKdDr Zc/vw+7nMz5Q== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="157742879" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="157742879" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 05:08:05 -0700 IronPort-SDR: wjEPQ5lbupfpOn2v5tUS7fEcjjLuLAegnEhZz+HsAVD106QT6BkPdD9SKKhqk/A6Xelj+0oSuj +6uScC0Nsq4Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="289925393" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by fmsmga007.fm.intel.com with ESMTP; 21 Sep 2020 05:08:03 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchand@redhat.com, Louise Kilheeney Date: Mon, 21 Sep 2020 13:03:49 +0100 Message-Id: <20200921120357.220588-3-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921120357.220588-1-kevin.laatz@intel.com> References: <20200921114634.220328-1-kevin.laatz@intel.com> <20200921120357.220588-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v7 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 Acked-by: Robin Jarry --- 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 12:03:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78175 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 6A6D3A04CC; Mon, 21 Sep 2020 14:08:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0D05F1DA17; Mon, 21 Sep 2020 14:08:16 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 977F81D997 for ; Mon, 21 Sep 2020 14:08:09 +0200 (CEST) IronPort-SDR: kXL465kL5LiZb4KxcVlLod/LZ0BYewoQI5SJncj4XweiHGy2cjdiSrXyP14oU7783RaDjdlBuv AM0o15QLMahg== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="157742885" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="157742885" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 05:08:08 -0700 IronPort-SDR: J/FAf8utE6Q5uXLti/I6s50+sbmnGtY7D1FI+XYyaTlgmOAEcJGDWaHjQ9TCc9dN1wE7l6S+2W hGZznV/a06eQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="289925400" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by fmsmga007.fm.intel.com with ESMTP; 21 Sep 2020 05:08:05 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchand@redhat.com, Louise Kilheeney , Neil Horman Date: Mon, 21 Sep 2020 13:03:50 +0100 Message-Id: <20200921120357.220588-4-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921120357.220588-1-kevin.laatz@intel.com> References: <20200921114634.220328-1-kevin.laatz@intel.com> <20200921120357.220588-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v7 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 Acked-by: Robin Jarry --- 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 12:03:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78176 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 70CB2A04CC; Mon, 21 Sep 2020 14:08:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8DD451DA2A; Mon, 21 Sep 2020 14:08:17 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id ECF3F1D988 for ; Mon, 21 Sep 2020 14:08:09 +0200 (CEST) IronPort-SDR: EfIwbzyTEp//5p0EhG9qG0r7d70b9xJNsLL/zKlF6AA+6FDBmK6e16J2ra3RmDu5fD3aoMS1uJ DGY47yq5FmrQ== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="157742888" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="157742888" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 05:08:09 -0700 IronPort-SDR: MHGoxrHCIrhMdXgtU1eyEqbdsKqoyV1IqpXJ7CgiolX6R9U6scUEHtX0mqiIDxwZ8MJAShIBt2 26nAULUaptXQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="289925407" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by fmsmga007.fm.intel.com with ESMTP; 21 Sep 2020 05:08:08 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchand@redhat.com, Louise Kilheeney Date: Mon, 21 Sep 2020 13:03:51 +0100 Message-Id: <20200921120357.220588-5-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921120357.220588-1-kevin.laatz@intel.com> References: <20200921114634.220328-1-kevin.laatz@intel.com> <20200921120357.220588-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v7 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 Acked-by: Robin Jarry --- 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 12:03:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78177 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 1175AA04CC; Mon, 21 Sep 2020 14:08:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6AC651DA4E; Mon, 21 Sep 2020 14:08:19 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 548BC1D9AA for ; Mon, 21 Sep 2020 14:08:12 +0200 (CEST) IronPort-SDR: 0y4Nvln2x+Tzdb4RysdMBhGPFLXSP5Vcp4cGEz2JJ1NBaYVt9Fxhevwd+HWrx+491mjV44VUIu 8LFggRApfAuQ== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="157742892" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="157742892" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 05:08:11 -0700 IronPort-SDR: yf3OwTA/5JgtqIS3vhbwF9UpHog1gCx/DxIUXsGCqAQLoKqzpgnOkInrNx9ri2ajNJWv3E2Vhy QXrQnAUJgxgw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="289925420" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by fmsmga007.fm.intel.com with ESMTP; 21 Sep 2020 05:08:09 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchand@redhat.com, Kevin Laatz , Olivier Matz , Louise Kilheeney Date: Mon, 21 Sep 2020 13:03:52 +0100 Message-Id: <20200921120357.220588-6-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921120357.220588-1-kevin.laatz@intel.com> References: <20200921114634.220328-1-kevin.laatz@intel.com> <20200921120357.220588-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v7 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 12:03:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78178 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 26499A04CC; Mon, 21 Sep 2020 14:09:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ABF661DA57; Mon, 21 Sep 2020 14:08:20 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id BDEF11D9D0 for ; Mon, 21 Sep 2020 14:08:13 +0200 (CEST) IronPort-SDR: wnDJ40+KBJ+19/a+wgWS8Lt2yFg5Nxjix4ZxIsTg1MxOAjq1adCyj9n4YbjgXUxAuOJX7TUmp0 Lm8HPpCp2TGg== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="157742896" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="157742896" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 05:08:13 -0700 IronPort-SDR: qhBnskrS9KXm6o/ePvNwQZVpTflElnS8LNvFP8LTtVupiQBue2a5pZrNOy70AeXN0iaCLdnCC0 jEjlUOC+qq/Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="289925435" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by fmsmga007.fm.intel.com with ESMTP; 21 Sep 2020 05:08:11 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchand@redhat.com, Kevin Laatz , Louise Kilheeney Date: Mon, 21 Sep 2020 13:03:53 +0100 Message-Id: <20200921120357.220588-7-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921120357.220588-1-kevin.laatz@intel.com> References: <20200921114634.220328-1-kevin.laatz@intel.com> <20200921120357.220588-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v7 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 Acked-by: Robin Jarry --- 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 12:03:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78179 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 0A4A4A04CC; Mon, 21 Sep 2020 14:09:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1AEF51DA5B; Mon, 21 Sep 2020 14:08:22 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id C6E531DA05 for ; Mon, 21 Sep 2020 14:08:15 +0200 (CEST) IronPort-SDR: 8YAtEm7RnzVVcNvYJwO7h8RM6UQt3FxirFejePvTnaLhV14P+cFaPpfikuY17Mm0ykDDwvkJfG ZoWecXmVfFTw== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="157742900" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="157742900" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 05:08:15 -0700 IronPort-SDR: lpQNDoKXTy5e21O97/79jjES7gH/agUZet9mabVH6qDnOcB0KFxkTYqN0Xok9nuXFQZlRVo1Z5 qMBB5NeII/3w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="289925444" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by fmsmga007.fm.intel.com with ESMTP; 21 Sep 2020 05:08:13 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchand@redhat.com, Louise Kilheeney , Neil Horman , Ray Kinsella Date: Mon, 21 Sep 2020 13:03:54 +0100 Message-Id: <20200921120357.220588-8-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921120357.220588-1-kevin.laatz@intel.com> References: <20200921114634.220328-1-kevin.laatz@intel.com> <20200921120357.220588-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v7 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 Acked-by: Robin Jarry --- 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 12:03:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78180 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 3E00CA04CC; Mon, 21 Sep 2020 14:09:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7A0E01DA63; Mon, 21 Sep 2020 14:08:23 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 7AE9E1DA27 for ; Mon, 21 Sep 2020 14:08:17 +0200 (CEST) IronPort-SDR: 7M9V2jbss6QrIyIMFdOfw+DqtkKbwGfYK+tOZTgAJTxoIM8DsUc6YpxGz287xpnvFONAGXWd8C yR/xaLYeuwUQ== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="157742902" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="157742902" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 05:08:17 -0700 IronPort-SDR: FX5cO0VAK7x8KRGwMCXeAYqL3qK6wOnAjwUmFDSrQaq+DuYTNbd0in9hDMZidfi8ggxWWZ7cJe K4EszHE7ajgg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="289925453" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by fmsmga007.fm.intel.com with ESMTP; 21 Sep 2020 05:08:15 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchand@redhat.com, Louise Kilheeney , Thomas Monjalon Date: Mon, 21 Sep 2020 13:03:55 +0100 Message-Id: <20200921120357.220588-9-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921120357.220588-1-kevin.laatz@intel.com> References: <20200921114634.220328-1-kevin.laatz@intel.com> <20200921120357.220588-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v7 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 Acked-by: Robin Jarry --- 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 12:03:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78181 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 80B42A04CC; Mon, 21 Sep 2020 14:09:29 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C9DA21DA6C; Mon, 21 Sep 2020 14:08:25 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id E77501DA5B for ; Mon, 21 Sep 2020 14:08:20 +0200 (CEST) IronPort-SDR: ZR+kfCVJjT6t6CNVmgSL66jlk2ZqDFcA7rOXFxZwWhmLUJozNx20DZy1A8BH5GAEqSqwR820t5 0IDGmye1G+NA== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="157742912" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="157742912" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 05:08:20 -0700 IronPort-SDR: GbJWDDKg3OGUdOOzKQotvPgl8RJ60MJXAG/5Nl28Poy9Et6vXhY9D1fen9r2lfn7o5v5qqri5i i5qtqCF0emdA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="289925463" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by fmsmga007.fm.intel.com with ESMTP; 21 Sep 2020 05:08:17 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchand@redhat.com, Louise Kilheeney , Nicolas Chautru Date: Mon, 21 Sep 2020 13:03:56 +0100 Message-Id: <20200921120357.220588-10-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921120357.220588-1-kevin.laatz@intel.com> References: <20200921114634.220328-1-kevin.laatz@intel.com> <20200921120357.220588-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v7 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 Acked-by: Robin Jarry --- 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 12:03:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78182 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 ED1D5A04CC; Mon, 21 Sep 2020 14:09:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 382F61DA73; Mon, 21 Sep 2020 14:08:27 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 96AC61DA60 for ; Mon, 21 Sep 2020 14:08:22 +0200 (CEST) IronPort-SDR: /VRfxOidvrCZGVfFttvi1PbExYchUQD6ZUhNO9OCRjjk7PiHEXknYd00IE5bl9vE3LbMNjqE5h ubGcCY6w6WsA== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="157742916" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="157742916" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 05:08:22 -0700 IronPort-SDR: +2LO2OmRIRdE1Kxh/RRlzNZbCUM7OEL/0ozxdLKvNKsukEG49BF/PgMQg4X4JalFVZB0iRonLA kUKogPRznlYQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="289925469" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by fmsmga007.fm.intel.com with ESMTP; 21 Sep 2020 05:08:20 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchand@redhat.com, Kevin Laatz , Dmitry Kozlyuk , Narcisa Ana Maria Vasile , Dmitry Malloy , Pallavi Kadam Date: Mon, 21 Sep 2020 13:03:57 +0100 Message-Id: <20200921120357.220588-11-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921120357.220588-1-kevin.laatz@intel.com> References: <20200921114634.220328-1-kevin.laatz@intel.com> <20200921120357.220588-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v7 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. Cc: Dmitry Kozlyuk Cc: Narcisa Ana Maria Vasile Cc: Dmitry Malloy Cc: Pallavi Kadam Signed-off-by: Kevin Laatz Acked-by: Robin Jarry --- v7: - Cc Maintainers --- 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