add CN translation for adding python2 deprecation warning(MR 11115)

components/xtensa/trax/traceparse.py

@@ -1,343 +0,0 @@
-#!/usr/bin/env python
-# coding=utf-8
-#
-# This script decodes Xtensa CPU trace dumps. It allows tracing the program
-# execution at instruction level.
-#
-# Some trivia about the Xtensa CPU trace (TRAX):
-# TRAX format mostly follows the IEEE-ISTO 5001-2003 (Nexus) standard.
-# The following Nexus Program Trace messages are implemented by TRAX:
-# - Indirect Branch Message
-# - Syncronization Message
-# - Indirect Branch with Synchronization Message
-# - Correlation Message
-# TRAX outputs compressed traces with 2 MSEO bits (LSB) and 6 MDO bits (MSB),
-# packed into a byte. MSEO bits are used to split the stream into packets and messages,
-# and MDO bits carry the actual data of the messages. Each message may contain multiple packets.
-#
-# This script can be used standalone, or loaded into GDB.
-# When used standalone, it dumps the list of trace messages to stdout.
-# When used from GDB, it also invokes GDB command to dump the list of assembly
-# instructions corresponding to each of the messages.
-#
-# Standalone usage:
-#   traceparse.py <dump_file>
-#
-# Usage from GDB:
-#   xtensa-esp32-elf-gdb -n --batch program.elf -x gdbinit
-# with the following gdbinit script:
-#   set pagination off
-#   set confirm off
-#   add-symbol-file rom.elf <address of ROM .text section>
-#   source traceparse.py
-#   python parse_and_dump("/path/to/dump_file")
-#
-# Loading the ROM code is optional; if not loaded, disassembly for ROM sections of code
-# will be missing.
-#
-###
-# Copyright 2020 Espressif Systems (Shanghai) PTE LTD
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-from __future__ import print_function
-import sys
-
-# Check if loaded into GDB
-try:
-    assert gdb.__name__ == "gdb"
-    WITH_GDB = True
-except NameError:
-    WITH_GDB = False
-
-# MSEO bit masks:
-MSEO_PKTEND = 1 << 0    # bit 0: indicates the last byte of a packet
-MSEO_MSGEND = 1 << 1    # bit 1: indicates the last byte of the message
-
-# Message types. The type is stored in the first 6 MDO bits or the first packet.
-TVAL_INDBR = 4	        # Indirect branch
-TVAL_INDBRSYNC = 12	    # Indirect branch w/ synchronisation
-TVAL_SYNC = 9	        # Synchronisation msg
-TVAL_CORR = 33	        # Correlation message
-
-
-class TraxPacket(object):
-    def __init__(self, data, truncated=False):
-        self.data = data
-        self.size_bytes = len(data)
-        self.truncated = truncated
-
-    def get_bits(self, start, count=0):
-        """
-        Extract data bits from the packet
-        :param start: offset, in bits, of the part to be extracted
-        :param count: number of bits to extract; if omitted or zero,
-                      extracts until the end of the packet
-        :return: integer containing the extracted bits
-        """
-        start_byte = start // 6
-        if count <= 0:
-            # all remaining bits
-            count = len(self.data) * 6 - start
-        bits_remaining = count
-        result = 0
-        shift = 0
-        for i, b in enumerate(self.data[start_byte:]):
-            # which bit in the byte is the starting bit
-            if i == 0:
-                # at start_byte: take the offset into account
-                start_bit = 2 + (start % 6)
-            else:
-                # every other byte: start after MSEO bits
-                start_bit = 2
-            # how many bits do we need to copy from this byte
-            cnt_bits = min(bits_remaining, 8 - start_bit)
-            mask = (2 ** cnt_bits) - 1
-            # take this many bits after the start_bit
-            bits = (b >> start_bit) & mask
-            # add these bits to the result
-            result |= bits << shift
-            # update the remaining bit count
-            shift += cnt_bits
-            bits_remaining -= cnt_bits
-            if bits_remaining == 0:
-                break
-        return result
-
-    def __str__(self):
-        return "%d byte packet%s" % (self.size_bytes, " (truncated)" if self.truncated else "")
-
-
-class TraxMessage(object):
-    def __init__(self, packets, truncated=False):
-        """
-        Create and parse a TRAX message from packets
-        :param packets: list of TraxPacket objects, must not be empty
-        :param truncated: whether the message was truncated in the stream
-        """
-        assert len(packets) > 0
-        self.packets = packets
-        self.truncated = truncated
-        if truncated:
-            self.msg_type = None
-        else:
-            self.msg_type = self._get_type()
-
-        # Start and end of the instruction range corresponding to this message
-        self.pc_start = 0   # inclusive
-        self.pc_end = 0     # not inclusive
-        self.pc_target = 0      # PC of the next range
-        self.is_exception = False   # whether the message indicates an exception
-        self.is_correlation = False     # whether this is a correlation message
-
-        # message-specific fields
-        self.icnt = 0
-        self.uaddr = 0
-        self.dcont = 0
-
-        # decode the fields
-        if not truncated:
-            self._decode()
-
-    def _get_type(self):
-        """
-        :return: Message type, one of TVAL_XXX values
-        """
-        return self.packets[0].get_bits(0, 6)
-
-    def _decode(self):
-        """ Parse the packets and fill in the message-specific fields """
-        if self.msg_type == TVAL_INDBR:
-            self.icnt = self.packets[0].get_bits(7, -1)
-            self.btype = self.packets[0].get_bits(6, 1)
-            self.uaddr = self.packets[1].get_bits(0)
-            self.is_exception = self.btype > 0
-        elif self.msg_type == TVAL_INDBRSYNC:
-            self.icnt = self.packets[0].get_bits(8, -1)
-            self.btype = self.packets[0].get_bits(7, 1)
-            self.pc_target = self.packets[1].get_bits(0)
-            self.dcont = self.packets[0].get_bits(6, 1)
-            self.is_exception = self.btype > 0
-        elif self.msg_type == TVAL_SYNC:
-            self.icnt = self.packets[0].get_bits(7, -1)
-            self.dcont = self.packets[0].get_bits(6, 1)
-            self.pc_target = self.packets[1].get_bits(0)
-        elif self.msg_type == TVAL_CORR:
-            self.icnt = self.packets[0].get_bits(12, -1)
-            self.is_correlation = True
-        else:
-            raise NotImplementedError("Unknown message type (%d)" % self.msg_type)
-
-    def process_forward(self, cur_pc):
-        """
-        Given the target PC known from the previous message, determine
-        the PC range corresponding to the current message.
-        :param cur_pc: previous known PC
-        :return: target PC after the current message
-        """
-        assert not self.truncated
-
-        next_pc = cur_pc
-        if self.msg_type == TVAL_INDBR:
-            next_pc = cur_pc ^ self.uaddr
-            self.pc_target = next_pc
-            self.pc_start = cur_pc
-            self.pc_end = self.pc_start + self.icnt + 1
-        if self.msg_type == TVAL_INDBRSYNC:
-            next_pc = self.pc_target
-            self.pc_start = cur_pc
-            self.pc_end = cur_pc + self.icnt + 1
-        if self.msg_type == TVAL_SYNC:
-            next_pc = self.pc_target
-            self.pc_start = next_pc - self.icnt
-            self.pc_end = next_pc + 1
-        if self.msg_type == TVAL_CORR:
-            pass
-        return next_pc
-
-    def process_backward(self, cur_pc):
-        """
-        Given the address of the PC known from the _next_ message, determine
-        the PC range corresponding to the current message.
-        :param cur_pc: next known PC
-        :return: target PC of the _previous_ message
-        """
-        assert not self.truncated
-        # Backward pass is only used to resolve addresses of messages
-        # up to the first SYNC/INDBRSYNC message.
-        # SYNC/INDBRSYNC messages are only handled in the forward pass.
-        assert self.msg_type != TVAL_INDBRSYNC
-        assert self.msg_type != TVAL_SYNC
-
-        prev_pc = cur_pc
-        self.pc_target = cur_pc
-        if self.msg_type == TVAL_INDBR:
-            prev_pc ^= self.uaddr
-            self.pc_start = prev_pc
-            self.pc_end = prev_pc + self.icnt + 1
-        if self.msg_type == TVAL_CORR:
-            pass
-        return prev_pc
-
-    def __str__(self):
-        desc = "Unknown (%d)" % self.msg_type
-        extra = ""
-        if self.truncated:
-            desc = "Truncated"
-        if self.msg_type == TVAL_INDBR:
-            desc = "Indirect branch"
-            extra = ", icnt=%d, uaddr=0x%x, exc=%d" % (self.icnt, self.uaddr, self.is_exception)
-        if self.msg_type == TVAL_INDBRSYNC:
-            desc = "Indirect branch w/sync"
-            extra = ", icnt=%d, dcont=%d, exc=%d" % (self.icnt, self.dcont, self.is_exception)
-        if self.msg_type == TVAL_SYNC:
-            desc = "Synchronization"
-            extra = ", icnt=%d, dcont=%d" % (self.icnt, self.dcont)
-        if self.msg_type == TVAL_CORR:
-            desc = "Correlation"
-            extra = ", icnt=%d" % self.icnt
-        return "%s message, %d packets, PC range 0x%08x - 0x%08x, target PC 0x%08x" % (
-            desc, len(self.packets), self.pc_start, self.pc_end, self.pc_target) + extra
-
-
-def load_messages(data):
-    """
-    Decodes TRAX data and resolves PC ranges.
-    :param data: input data, bytes
-    :return: list of TraxMessage objects
-    """
-    messages = []
-    packets = []
-    packet_start = 0
-    msg_cnt = 0
-    pkt_cnt = 0
-
-    # Iterate over the input data, splitting bytes into packets and messages
-    for i, b in enumerate(data):
-        if (b & MSEO_MSGEND) and not (b & MSEO_PKTEND):
-            raise AssertionError("Invalid MSEO bits in b=0x%x. Not a TRAX dump?" % b)
-
-        if b & MSEO_PKTEND:
-            pkt_cnt += 1
-            packets.append(TraxPacket(data[packet_start:i + 1], packet_start == 0))
-            packet_start = i + 1
-
-        if b & MSEO_MSGEND:
-            msg_cnt += 1
-            try:
-                messages.append(TraxMessage(packets, len(messages) == 0))
-            except NotImplementedError as e:
-                sys.stderr.write("Failed to parse message #%03d (at %d bytes): %s\n" % (msg_cnt, i, str(e)))
-            packets = []
-
-    # Resolve PC ranges of messages.
-    # Forward pass: skip messages until a message with known PC,
-    # i.e. a SYNC/INDBRSYNC message. Process all messages following it.
-    pc = 0
-    first_sync_index = -1
-    for i, m in enumerate(messages):
-        if pc == 0 and m.pc_target == 0:
-            continue
-        if first_sync_index < 0:
-            first_sync_index = i
-        pc = m.process_forward(pc)
-
-    # Now process the skipped messages in the reverse direction,
-    # starting from the first message with known PC.
-    pc = messages[first_sync_index].pc_start
-    for m in reversed(messages[0:first_sync_index]):
-        if m.truncated:
-            break
-        pc = m.process_backward(pc)
-
-    return messages
-
-
-def parse_and_dump(filename, disassemble=WITH_GDB):
-    """
-    Decode TRAX data from a file, print out the messages.
-    :param filename: file to load the dump from
-    :param disassemble: if True, print disassembly of PC ranges
-    """
-    with open(filename, 'rb') as f:
-        data = f.read()
-
-    messages = load_messages(data)
-    sys.stderr.write("Loaded %d messages in %d bytes\n" % (len(messages), len(data)))
-
-    for i, m in enumerate(messages):
-        if m.truncated:
-            continue
-        print("%04d: %s" % (i, str(m)))
-        if m.is_exception:
-            print("*** Exception occurred ***")
-        if disassemble and WITH_GDB:
-            try:
-                gdb.execute("disassemble 0x%08x, 0x%08x" % (m.pc_start, m.pc_end))  # noqa: F821
-            except gdb.MemoryError:  # noqa: F821
-                print("Failed to disassemble from 0x%08x to 0x%08x" % (m.pc_start, m.pc_end))
-
-
-def main():
-    if sys.version_info[0] < 3:
-        print("WARNING: Support for Python 2 is deprecated and will be removed in future versions.", file=sys.stderr)
-    elif sys.version_info[0] == 3 and sys.version_info[1] < 6:
-        print("WARNING: Python 3 versions older than 3.6 are not supported.", file=sys.stderr)
-    if len(sys.argv) < 2:
-        sys.stderr.write("Usage: %s <dump_file>\n")
-        raise SystemExit(1)
-
-    parse_and_dump(sys.argv[1])
-
-
-if __name__ == "__main__" and not WITH_GDB:
-    main()

docs/en/get-started/macos-setup.rst

@@ -37,7 +37,7 @@ ESP-IDF will use the version of Python installed by default on macOS.
 Installing and setting up Python 3 as default
 ---------------------------------------------
 
-Basing on macOS `Catalina 10.15 release notes`_, use of Python 2.7 is not recommended and Python will not be included by default in future versions of macOS. Check what Python you currently have::
+Basing on macOS `Catalina 10.15 release notes`_, use of Python 2.7 is not recommended and Python 2.7 will not be included by default in future versions of macOS. Check what Python you currently have::
 
   python --version
 
@@ -54,7 +54,7 @@ Below is an overview of steps to install Python 3 and making it default interpre
       brew install python3
       ln -s /usr/local/bin/python3.8 /usr/local/bin/python
 
-    Adjust above directory name ``/usr/local/bin/python3.8`` to point where Python 3 has been installed. To check this directory you can run  ``which -a python``.
+    Adjust above directory name ``/usr/local/bin/python3.8`` to point where Python 3 has been installed. To check this directory you can run  ``which -a python3``.
 
   - If you have MacPorts_, you can run::
 
@@ -77,6 +77,7 @@ Python 2 deprecation
 
 Python 2 reached its `end of life <https://www.python.org/doc/sunset-python-2/>`_ and support for it in ESP-IDF will be removed soon. Please install Python 3.6 or higher. Instructions for macOS are listed above.
 
+
 Next Steps
 ==========
 

docs/zh_CN/get-started/linux-setup-scratch.rst

@@ -13,19 +13,21 @@
 
 - CentOS 7::
 
-    sudo yum install git wget ncurses-devel flex bison gperf python pyserial python-pyelftools cmake ninja-build ccache
+    sudo yum -y update && sudo yum install git wget ncurses-devel flex bison gperf python3 python3-pip cmake ninja-build ccache
+
+目前仍然支持 CentOS 7，但为了更好的用户体验，建议使用 CentOS 8。
 
 - Ubuntu and Debian::
 
-    sudo apt-get install git wget libncurses-dev flex bison gperf python python-pip python-setuptools python-serial python-click python-cryptography python-future python-pyparsing python-pyelftools cmake ninja-build ccache libffi-dev libssl-dev
+    sudo apt-get install git wget libncurses-dev flex bison gperf python3 python3-pip python3-setuptools python3-serial python3-cryptography python3-future python3-pyparsing python3-pyelftools cmake ninja-build ccache libffi-dev libssl-dev dfu-util
 
 - Arch::
 
-    sudo pacman -S --needed gcc git make ncurses flex bison gperf python-pyserial python-click python-cryptography python-future python-pyparsing python-pyelftools cmake ninja ccache
+    sudo pacman -Sy --needed gcc git make ncurses flex bison gperf python-pyserial python-cryptography python-future python-pyparsing python-pyelftools cmake ninja ccache dfu-util
+
+.. 注解::
 
-.. note::
-    
-    使用 ESP-IDF 需要 CMake 3.5 或以上版本。较早版本的 Linux 可能需要升级才能向后移植仓库，或安装 "cmake3" 软件包，而不是安装 "cmake"。
+    使用 ESP-IDF 需要 CMake 3.5 或以上版本。较早的 Linux 发行版可能需要升级自身的软件源仓库，或开启 backports 套件库，或安装 "cmake3" 软件包（不是安装 "cmake")。
 
 从源代码编译工具链
 =================================
@@ -34,7 +36,7 @@
 
 - CentOS 7::
 
-    sudo yum install gawk gperf grep gettext ncurses-devel python python-devel automake bison flex texinfo help2man libtool make
+    sudo yum install gawk gperf grep gettext ncurses-devel python3 python3-devel automake bison flex texinfo help2man libtool make
 
 - Ubuntu pre-16.04::
 
@@ -50,7 +52,7 @@
 
 - Arch::
 
-    TODO
+    sudo pacman -Sy --needed python-pip
 
 创建工作目录，并进入该目录::
 
@@ -70,8 +72,16 @@
 编译得到的工具链会被保存到 ``~/esp/crosstool-NG/builds/xtensa-esp32-elf``。请按照 `标准设置指南 <setup-linux-toolchain-add-it-to-path>`_ 的介绍，将工具链添加到 ``PATH``。
 
 
+
+停用 Python 2 
+====================
+
+Python 2 已经 `结束生命周期 <https://www.python.org/doc/sunset-python-2/>`_，ESP-IDF 很快将不再支持 Python 2。请安装 Python 3.6 或以上版本。可参考上面列出的目前主流 Linux 发行版的安装说明。
+
+
 后续步骤
 ========
 
 继续设置开发环境，请前往 :ref:`get-started-get-esp-idf` 章节。
 
+请前往 :ref:`get-started-get-esp-idf` 章节继续设置开发环境。

docs/zh_CN/get-started/linux-setup.rst

@@ -11,11 +11,13 @@ Linux 平台工具链的标准设置
 
 - CentOS 7::
 
-	sudo yum install git wget ncurses-devel flex bison gperf python cmake ninja-build ccache
+	sudo yum -y update && sudo yum install git wget flex bison gperf python3 cmake ninja-build ccache
+
+目前仍然支持 CentOS 7，但为了更好的用户体验，建议使用 CentOS 8。
 
 - Ubuntu and Debian::
 
-	sudo apt-get install git wget libncurses-dev flex bison gperf python python-pip python-setuptools cmake ninja-build ccache libffi-dev libssl-dev
+	sudo apt-get install git wget flex bison gperf python3 python3-pip python3-setuptools cmake ninja-build ccache libffi-dev libssl-dev
 
 - Arch::
 
@@ -47,20 +49,48 @@ Arch Linux 用户
 
 此外，您也可以使用 crosstool-NG 编译一个链接到 ncurses 6 的 gdb。
 
-设置 Ubuntu 和 Debian 默认使用 Python 3
-------------------------------------------------
+设置 Python 3 为 CentOS 默认 Python 版本
+----------------------------------------------------
+
+CentOS 7 及更早的版本提供 Python 2.7 作为默认解释器。但这里推荐使用 Python 3，您可以运行下方命令安装 Python 3。或者查看当前所用系统的相关文档，按照文档推荐的其它方法安装 Python 3::
+
+    sudo yum -y update && sudo yum install python3 python3-pip python3-setuptools
+
+设置 Python 3 为默认 Python 版本::
+
+    sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 10 && alias pip=pip3
 
-目前，Ubuntu 和 Debian 仍使用 Python 2.7 为默认编译器。Python3 可通过以下方式安装::
+
+设置 Python 3 为 Ubuntu 和 Debian 默认 Python 版本
+----------------------------------------------------
+
+
+Ubuntu（v18.04 及之前的版本）和 Debian（v9 及之前的版本）的默认解释器为 Python 2.7，但这里推荐使用 Python 3，您可以运行下方命令安装 Python 3。或者查看当前所用系统的相关文档，按照文档推荐的其它方法安装 Python 3::
 
 	sudo apt-get install python3 python3-pip python3-setuptools
 
-运行以下指令，设置 Python 3 为默认编译器::
+设置 Python 3 为默认 Python 版本::
+
+	sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 10 && alias pip=pip3
+
+
+.. 注解::
+    上述设置为全局设置，同时会影响到其它应用。
+
+修复 Ubuntu 16.04 损坏的 pip 
+=================================
+
+``python3-pip`` 包可能已损坏无法升级。需使用脚本 `get-pip.py <https://bootstrap.pypa.io/get-pip.py>`_ 手动删除并安装该包::
+
+    apt remove python3-pip python3-virtualenv; rm -r ~/.local
+    rm -r ~/.espressif/python_env && python get-pip.py
+
+停用 Python 2 
+====================
+
+Python 2 已经 `结束生命周期 <https://www.python.org/doc/sunset-python-2/>`_，ESP-IDF 很快将不再支持 Python 2。请安装 Python 3.6 或以上版本。可参考上面列出的目前主流 Linux 发行版的安装说明。
 
-	sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 10
 
-.. note::
-	
-	此改动将影响系统中的所有应用。
 
 后续步骤
 ========

docs/zh_CN/get-started/macos-setup-scratch.rst

@@ -1,5 +1,5 @@
 ***********************************************
-从零开始设置 MacOS 环境下的工具链
+从零开始设置 macOS 环境下的工具链
 ***********************************************
 
 :link_to_translation:`en:[English]`
@@ -78,6 +78,12 @@ MacPorts 需要完整的 XCode 软件，而 homebrew 只需要安装 XCode 命
 
 编译得到的工具链会被保存到 ``~/esp/ctng-volume/crosstool-NG/builds/xtensa-esp32-elf``。使用工具链前，请将 ``~/esp/ctng-volume/crosstool-NG/builds/xtensa-esp32-elf/bin`` 添加至 ``PATH`` 环境变量。
 
+停用 Python 2 
+====================
+
+Python 2 已经 `结束生命周期 <https://www.python.org/doc/sunset-python-2/>`_，ESP-IDF 很快将不再支持 Python 2。请安装 Python 3.6 或以上版本。可参考上面列出的 macOS 安装说明。
+
+
 后续步骤
 ========
 

docs/zh_CN/get-started/macos-setup.rst

@@ -31,9 +31,54 @@ ESP-IDF 将使用 Mac OS 上默认安装的 Python 版本。
     
     如您在上述任何步骤中遇到以下错误::
 
-        xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools), missing xcrun at: /Library/Developer/CommandLineTools/usr/bin/xcrun
-    
-    则必须安装 XCode 命令行工具，具体可运行 xcode-select --install。
+    ``xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools), missing xcrun at:/Library/Developer/CommandLineTools/usr/bin/xcrun``
+
+    则必须安装 XCode 命令行工具，具体可运行 ``xcode-select --install``。
+
+安装并设置 Python 3 为默认版本
+---------------------------------------------
+
+`Catalina 10.15 发布说明`_ 中表示不推荐使用 Python 2.7 版本，在未来的 macOS 版本中也不会默认包含 Python 2.7。执行以下命令来检查您当前使用的 Python 版本::
+
+  python --version
+
+如果输出结果是 ``Python 2.7.17``，则代表您的默认解析器是 Python 2.7。这时需要您运行以下命令检查电脑上是否已经安装过 Python 3::
+
+  python3 --version
+
+如果运行上述命令出现错误，则代表电脑上没有安装 Python 3。
+
+请根据以下步骤安装 Python 3 并使其成为默认解释器：
+
+  - 使用 HomeBrew_ 进行安装的方法如下::
+
+      brew install python3
+      ln -s /usr/local/bin/python3.8 /usr/local/bin/python
+
+    将上述的目录名 ``/usr/local/bin/python3.8`` 修改为 Python 3 所在的目录。您可以运行 ``which -a python3`` 来查看 Python 3 所在的目录。
+
+  - 使用 MacPorts_ 进行安装的方法如下::
+
+      sudo port install python38
+      sudo port select --set python python38
+
+现在您可以打开终端窗口验证默认运行的 Python 版本::
+
+  python --version
+
+如果输出结果类似于 ``Python 3.8.5`` 则代表安装成功。
+
+.. 注解::
+
+    上述设置为全局设置，同时会影响到其它应用。
+
+
+
+停用 Python 2 
+====================
+
+Python 2 已经 `结束生命周期 <https://www.python.org/doc/sunset-python-2/>`_，ESP-IDF 很快将不再支持 Python 2。请安装 Python 3.6 或以上版本。可参考上面列出的 macOS 安装说明。
+
 
 后续步骤
 ========
@@ -45,3 +90,4 @@ ESP-IDF 将使用 Mac OS 上默认安装的 Python 版本。
 .. _ccache: https://ccache.samba.org/
 .. _homebrew: https://brew.sh/
 .. _MacPorts: https://www.macports.org/install.php
+.. _Catalina 10.15 发布说明: https://developer.apple.com/documentation/macos-release-notes/macos-catalina-10_15-release-notes

tools/ci/config/build.yml

@@ -77,7 +77,6 @@ build_ssc:
     - cd SSC
     - MAKEFLAGS= ./ci_build_ssc.sh
 
-<<<<<<< HEAD
 build_esp_idf_tests_make:
   extends: .build_esp_idf_unit_test_template
   variables:

tools/idf.py

@@ -135,9 +135,9 @@ def check_environment():
 
     # check Python version
     if sys.version_info[0] < 3:
-        print_warning("WARNING: Support for Python 2 is deprecated and will be removed in future versions.")
+        print("WARNING: Support for Python 2 is deprecated and will be removed in future versions.")
     elif sys.version_info[0] == 3 and sys.version_info[1] < 6:
-        print_warning("WARNING: Python 3 versions older than 3.6 are not supported.")
+        print("WARNING: Python 3 versions older than 3.6 are not supported.")
 
     # check Python dependencies
     print("Checking Python dependencies...")