From ce00bf4721f13a1fa0ffa5c908dc29c92b9d7a19 Mon Sep 17 00:00:00 2001 From: Marcelo Saguas Iacovone Date: Sat, 10 Feb 2024 13:00:38 -0800 Subject: [PATCH 1/4] Fixes GitHub actions --- .github/workflows/code_quality.yml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml index 051d9d7b..34ecb443 100644 --- a/.github/workflows/code_quality.yml +++ b/.github/workflows/code_quality.yml @@ -10,7 +10,6 @@ on: jobs: build: - runs-on: ubuntu-latest # runs-on: self-hosted strategy: @@ -19,10 +18,12 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} + - name: Install dependencies run: | python -m pip install --upgrade pip @@ -30,11 +31,27 @@ jobs: pip install flake8 pip install flake8-polyfill if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + + - name: Get all Python changed and modified files + id: changed-python-files + uses: tj-actions/changed-files@v42 + with: + since_last_remote_commit: true + files: | + **.py + - name: Code complexity + if: steps.changed-python-files.outputs.any_changed == 'true' + env: + ALL_CHANGED_PYTHON_FILES: ${{ steps.changed-python-files.outputs.all_changed_files }} run: | # Runs Radon quality check - radon cc python --total-average --show-complexity + radon cc --total-average --show-complexity ${ALL_CHANGED_PYTHON_FILES[@]/#/} + - name: Code quality with flake8 + if: steps.changed-python-files.outputs.any_changed == 'true' + env: + ALL_CHANGED_PYTHON_FILES: ${{ steps.changed-python-files.outputs.all_changed_files }} run: | # Runs code quality check - flake8 python --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + flake8 --count --max-complexity=10 --max-line-length=127 --statistics ${ALL_CHANGED_PYTHON_FILES[@]/#/} From 752705aaedcfa660043b6b1571452f108a124103 Mon Sep 17 00:00:00 2001 From: Marcelo Saguas Iacovone Date: Sat, 10 Feb 2024 13:02:33 -0800 Subject: [PATCH 2/4] Test for the new code_quality action --- .github/workflows/code_quality.yml | 2 +- test_file_a.py | 8 ++++++++ test_folder/test_file_b.py | 9 +++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 test_file_a.py create mode 100644 test_folder/test_file_b.py diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml index 34ecb443..35303644 100644 --- a/.github/workflows/code_quality.yml +++ b/.github/workflows/code_quality.yml @@ -4,7 +4,7 @@ name: Code Quality on: push: - branches: [ master ] + branches: [ master, github-action-fixes ] pull_request: branches: [ master ] diff --git a/test_file_a.py b/test_file_a.py new file mode 100644 index 00000000..00c342dd --- /dev/null +++ b/test_file_a.py @@ -0,0 +1,8 @@ +def aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(): + return + +def main(): + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa() + +if __name__ == '__main__': + main() \ No newline at end of file diff --git a/test_folder/test_file_b.py b/test_folder/test_file_b.py new file mode 100644 index 00000000..07751766 --- /dev/null +++ b/test_folder/test_file_b.py @@ -0,0 +1,9 @@ +def bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb(): + return + + +def main(): + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb() + +if __name__ == '__main__': + main() \ No newline at end of file From e777d46009f0d884aa46f99b667573eb336791a1 Mon Sep 17 00:00:00 2001 From: Marcelo Saguas Iacovone Date: Sat, 10 Feb 2024 13:04:39 -0800 Subject: [PATCH 3/4] Test fixing files so action passes --- test_file_a.py | 9 ++++++--- test_folder/test_file_b.py | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/test_file_a.py b/test_file_a.py index 00c342dd..f68707f6 100644 --- a/test_file_a.py +++ b/test_file_a.py @@ -1,8 +1,11 @@ -def aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(): + +def aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(): return + def main(): - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa() + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa() + if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/test_folder/test_file_b.py b/test_folder/test_file_b.py index 07751766..3ea70a44 100644 --- a/test_folder/test_file_b.py +++ b/test_folder/test_file_b.py @@ -1,3 +1,4 @@ + def bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb(): return @@ -5,5 +6,6 @@ def bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb(): def main(): bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb() + if __name__ == '__main__': - main() \ No newline at end of file + main() From c8f08bb4dd6f0deb6495d66ae0810c5db9e03867 Mon Sep 17 00:00:00 2001 From: Marcelo Saguas Iacovone Date: Sat, 10 Feb 2024 13:06:30 -0800 Subject: [PATCH 4/4] Tests cleanup --- .github/workflows/code_quality.yml | 2 +- test_file_a.py | 11 ----------- test_folder/test_file_b.py | 11 ----------- 3 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 test_file_a.py delete mode 100644 test_folder/test_file_b.py diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml index 35303644..34ecb443 100644 --- a/.github/workflows/code_quality.yml +++ b/.github/workflows/code_quality.yml @@ -4,7 +4,7 @@ name: Code Quality on: push: - branches: [ master, github-action-fixes ] + branches: [ master ] pull_request: branches: [ master ] diff --git a/test_file_a.py b/test_file_a.py deleted file mode 100644 index f68707f6..00000000 --- a/test_file_a.py +++ /dev/null @@ -1,11 +0,0 @@ - -def aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(): - return - - -def main(): - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa() - - -if __name__ == '__main__': - main() diff --git a/test_folder/test_file_b.py b/test_folder/test_file_b.py deleted file mode 100644 index 3ea70a44..00000000 --- a/test_folder/test_file_b.py +++ /dev/null @@ -1,11 +0,0 @@ - -def bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb(): - return - - -def main(): - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb() - - -if __name__ == '__main__': - main()