Browse Source

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

ci: Python 2 warnings fix (v4.1)

See merge request espressif/esp-idf!11618
He Yin Ling 5 years ago
parent
commit
592645f0c0

+ 2 - 2
components/app_update/otatool.py

@@ -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")

+ 2 - 2
components/spiffs/spiffsgen.py

@@ -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)
 

+ 2 - 0
tools/ci/build_examples.sh

@@ -191,6 +191,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}" \

+ 1 - 1
tools/ci/check_build_warnings.py

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