Merge branch 'bugfix/ci_py2_warnings_fix_v4.0' into 'release/v4.0'

ci: Python 2 warnings fix (v4.0)

See merge request espressif/esp-idf!11619
This commit is contained in:
Anton Maklakov 2020-12-15 19:06:33 +08:00
commit a987a8ade6
4 changed files with 8 additions and 5 deletions

View File

@ -250,9 +250,9 @@ def _erase_ota_partition(target, ota_id):
def main():
if sys.version_info[0] < 3:
print("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.", 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.")
print("WARNING: Python 3 versions older than 3.6 are not supported.", file=sys.stderr)
global quiet
parser = argparse.ArgumentParser("ESP-IDF OTA Partitions Tool")

View File

@ -453,9 +453,9 @@ class SpiffsFS():
def main():
if sys.version_info[0] < 3:
print("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.", 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.")
print("WARNING: Python 3 versions older than 3.6 are not supported.", file=sys.stderr)
parser = argparse.ArgumentParser(description="SPIFFS Image Generator",
formatter_class=argparse.ArgumentDefaultsHelpFormatter)

View File

@ -187,6 +187,8 @@ library/error\.o\
\|changes choice state\
\|Compiler version is not supported\
\|Toolchain version is not supported\
\|Python 3 versions older than 3\.6 are not supported\.\
\|Support for Python 2 is deprecated and will be removed in future versions\.\
"
sort -u "${LOG_SUSPECTED}" | grep -v "${IGNORE_WARNS}" \

View File

@ -30,7 +30,8 @@ IGNORE_WARNS = [
r"changes choice state",
r"crosstool_version_check\.cmake",
r"CryptographyDeprecationWarning",
r"Python 3 versions older than 3.6 are not supported."
r"Python 3 versions older than 3.6 are not supported.",
r"Support for Python 2 is deprecated and will be removed in future versions.",
]
]