Merge branch 'bugfix/ci_py2_warnings_fix' into 'master'

ci: Python 2 warnings fix

See merge request espressif/esp-idf!11615
pull/6365/head
Anton Maklakov 2020-12-15 18:32:38 +08:00
commit 8ef3100fd9
3 zmienionych plików z 6 dodań i 5 usunięć

Wyświetl plik

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

Wyświetl plik

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

Wyświetl plik

@ -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.",
]
]