From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 802B0A04B5; Wed, 30 Sep 2020 13:48:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 977741DB78; Wed, 30 Sep 2020 13:45:55 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 59C8D1DA02 for ; Wed, 30 Sep 2020 13:45:44 +0200 (CEST) IronPort-SDR: E9GH5cuux4Na1NCY0qPw1DmcbM2BX+ENoenVe/smwgUSRYTvEYMN80gqY5gzO1MjIHurjWoYCD Ld3ESN+d1WlA== X-IronPort-AV: E=McAfee;i="6000,8403,9759"; a="224022675" X-IronPort-AV: E=Sophos;i="5.77,322,1596524400"; d="scan'208";a="224022675" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2020 04:45:43 -0700 IronPort-SDR: 3NSVY4qXiDuAxswA66/d+c8bY89XyWMz9YmhZozrMucUiSCneyHzYfxHpsFHOgNlucbafZLO5Y T5JNuxnwERbg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,322,1596524400"; d="scan'208";a="350647883" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by FMSMGA003.fm.intel.com with ESMTP; 30 Sep 2020 04:45:41 -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, stephen@networkplumber.org, Kevin Laatz , Ray Kinsella , Neil Horman , John McNamara , Marko Kovacevic Date: Wed, 30 Sep 2020 12:40:24 +0100 Message-Id: <20200930114024.446473-12-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200930114024.446473-1-kevin.laatz@intel.com> References: <20200929102224.440322-1-kevin.laatz@intel.com> <20200930114024.446473-1-kevin.laatz@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v10 11/11] doc: 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 references to python 2 from the documentation. The deprecation notice for python 2 support has been removed. A section was added to the rel_notes for this patchset. Cc: Ray Kinsella Cc: Neil Horman Cc: John McNamara Cc: Marko Kovacevic Signed-off-by: Kevin Laatz --- v10: - changes to doc/guides/conf.py to only support python3 --- doc/guides/conf.py | 9 ++------- doc/guides/contributing/coding_style.rst | 2 +- doc/guides/linux_gsg/sys_reqs.rst | 2 +- doc/guides/rel_notes/deprecation.rst | 6 ------ doc/guides/rel_notes/release_20_11.rst | 2 ++ 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/doc/guides/conf.py b/doc/guides/conf.py index 9ebc26ed3f..ef550f68c0 100644 --- a/doc/guides/conf.py +++ b/doc/guides/conf.py @@ -1,7 +1,7 @@ +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2015 Intel Corporation -from __future__ import print_function from docutils import nodes from distutils.version import LooseVersion from sphinx import __version__ as sphinx_version @@ -13,12 +13,7 @@ from os.path import dirname from os.path import join as path_join -try: - # Python 2. - import ConfigParser as configparser -except: - # Python 3. - import configparser +import configparser try: import sphinx_rtd_theme diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst index 0be9546a6a..4fc010ca49 100644 --- a/doc/guides/contributing/coding_style.rst +++ b/doc/guides/contributing/coding_style.rst @@ -765,7 +765,7 @@ specializations, run the ``app/test`` binary, and use the ``dump_log_types`` Python Code ----------- -All Python code should work with Python 2.7+ and 3.2+ and be compliant with +All Python code should work with 3.2+ and be compliant with `PEP8 (Style Guide for Python Code) `_. The ``pep8`` tool can be used for testing compliance with the guidelines. diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst index 6b9f573fce..66d9723dd6 100644 --- a/doc/guides/linux_gsg/sys_reqs.rst +++ b/doc/guides/linux_gsg/sys_reqs.rst @@ -47,7 +47,7 @@ Compilation of the DPDK * Python v3.5+ is needed to build DPDK using meson and ninja - * Python 2.7+ or 3.2+, to use various helper scripts included in the DPDK package. + * Python 3.2+, to use various helper scripts included in the DPDK package. * Meson (version 0.47.1+) and ninja diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 1f888fa90e..0a7e874b2c 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -308,12 +308,6 @@ Deprecation Notices In this case the function will return -1 unless the environment is unset first (using ``rte_power_unset_env``). Other function usage scenarios will not change. -* python: Since the beginning of 2020, Python 2 has officially reached - end-of-support: https://www.python.org/doc/sunset-python-2/. - Python 2 support will be completely removed in 20.11. - In 20.08, explicit deprecation warnings will be displayed when running - scripts with Python 2. - * dpdk-setup.sh: This old script relies on deprecated stuff, and especially ``make``. Given environments are too much variables for such a simple script, it will be removed in DPDK 20.11. diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst index cc726095a7..2eb83c8137 100644 --- a/doc/guides/rel_notes/release_20_11.rst +++ b/doc/guides/rel_notes/release_20_11.rst @@ -68,6 +68,8 @@ Removed Items Also, make sure to start the actual text at the margin. ======================================================= +* Removed python 2 support since it was EOL'd in January 2020. + API Changes ----------- -- 2.25.1