Просмотр исходного кода

Merge branch 'bugfix/gh_python_lint' into 'master'

gh-action:fix python lint

See merge request espressif/esp-idf!7149
Angus Gratton 6 лет назад
Родитель
Сommit
2cb7534bc5

+ 1 - 1
.github/workflows/python_lint.yml

@@ -4,7 +4,7 @@ name: Python CI
 on:
   pull_request:
     paths:
-      - "*.py"
+      - "**.py"
       - "requirements.txt"
 
 jobs:

+ 1 - 2
tools/ci/config/pre_check.yml

@@ -42,8 +42,7 @@ check_python_style:
       - flake8_output.txt
     expire_in: 1 week
   script:
-    # run it only under Python 3 (it is very slow under Python 2)
-    - ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 3.4.8 python -m flake8 --config=$IDF_PATH/.flake8 --output-file=flake8_output.txt --tee --benchmark $IDF_PATH
+    - ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh python -m flake8 --config=$IDF_PATH/.flake8 --output-file=flake8_output.txt --tee --benchmark $IDF_PATH
 
 check_kconfigs:
   extends: .check_job_template_with_filter

+ 1 - 1
tools/ci/config/target-test.yml

@@ -454,7 +454,7 @@ UT_034:
 
 UT_035:
   extends: .unit_test_template
-  parallel: 22
+  parallel: 23
   tags:
     - ESP32S2BETA_IDF
     - UT_T1_1

+ 1 - 1
tools/ci/python_packages/ttfw_idf/IDFApp.py

@@ -248,7 +248,7 @@ class IDFApp(App.BaseApp):
         flash_settings["encrypt"] = "CONFIG_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT" in sdkconfig_dict
 
         # make file offsets into integers, make paths absolute
-        flash_files = [(int(offs, 0), os.path.join(self.binary_path, path.strip())) for (offs, path) in flash_files]
+        flash_files = [(int(offs, 0), os.path.join(self.binary_path, file_path.strip())) for (offs, file_path) in flash_files]
 
         return flash_files, flash_settings