From 6f098041a8c4c9657b94b04e9ad99466b249ed74 Mon Sep 17 00:00:00 2001 From: shenxianpeng Date: Thu, 28 Jul 2022 14:30:48 +0800 Subject: [PATCH 1/5] Update workflow --- .github/workflows/python-test.yml | 16 ++++++---------- requirements-dev.txt | 1 + 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index fe83306..c4c7891 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -10,14 +10,8 @@ on: - '**.py' pull_request: branches: [ "main" ] - paths: - - '**.py' workflow_dispatch: - # inputs: - # branch_name: - # description: 'Test against to branch' - # required: true - # default: 'main' + permissions: contents: read @@ -36,9 +30,11 @@ jobs: python -m pip install --upgrade pip pip install . pip install -r requirements-dev.txt - - name: Lint with flake8 - run: flake8 --max-line-length=120 - - name: Run tests and collect coverage + - name: Run pre-commit + run: | + pre-commit install + pre-commit run --all-files + - name: Collect coverage run: | coverage run --source=tests,clang_tools -m pytest coverage report -m diff --git a/requirements-dev.txt b/requirements-dev.txt index 8fa8b2f..14db2d8 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,3 +1,4 @@ coverage flake8 +pre-commit pytest From 6e7a94ca28c4feb44f04412da16a5be90e66ab90 Mon Sep 17 00:00:00 2001 From: shenxianpeng Date: Fri, 29 Jul 2022 13:11:42 +0800 Subject: [PATCH 2/5] Update unit test --- tests/test_install.py | 5 +---- tests/test_main.py | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/test_install.py b/tests/test_install.py index 02e007f..f6f579c 100644 --- a/tests/test_install.py +++ b/tests/test_install.py @@ -18,7 +18,4 @@ def test_clang_tools_binary_url(): os = check_install_os() for tool in tools: ret = clang_tools_binary_url(tool, version) - if os == 'windows': - assert(f"{tool}-{version}_{os}-amd64.exe" in ret) - else: - assert(f"{tool}-{version}_{os}-amd64" in ret) + assert(f"{tool}-{version}_{os}-amd64" in ret) diff --git a/tests/test_main.py b/tests/test_main.py index 06b374e..d71aa6b 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -11,5 +11,3 @@ def test_main_install(argv, called, response): if called and not response: with pytest.raises(SystemExit): main() - else: - main() From 3fa67ee86a6d408be47ddb2837f8cc2bb9d36749 Mon Sep 17 00:00:00 2001 From: shenxianpeng Date: Fri, 29 Jul 2022 13:17:42 +0800 Subject: [PATCH 3/5] Update test workflow --- .github/workflows/python-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index c4c7891..b91e103 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -27,7 +27,7 @@ jobs: python-version: "3.10" - name: Install dependencies run: | - python -m pip install --upgrade pip + python3 -m pip install --upgrade pip pip install . pip install -r requirements-dev.txt - name: Run pre-commit From b16fa3ffe9cdc835e2776c6373d4e4b19a9df7fe Mon Sep 17 00:00:00 2001 From: shenxianpeng Date: Fri, 29 Jul 2022 13:26:24 +0800 Subject: [PATCH 4/5] Update unit test --- tests/test_install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_install.py b/tests/test_install.py index f6f579c..c3a2ac4 100644 --- a/tests/test_install.py +++ b/tests/test_install.py @@ -6,7 +6,7 @@ from clang_tools.install import clang_tools_binary_url -@pytest.mark.parametrize(('version', 'expected'), (('12', True), ('100', False))) +@pytest.mark.parametrize(('version', 'expected'), (('', True), ('100', False))) def test_clang_tools_exist(version, expected): assert clang_format_exist(version) == expected assert clang_tidy_exist(version) == expected From be0fbbe9d3d4af1e151cdb48bd5f97c390843f2e Mon Sep 17 00:00:00 2001 From: shenxianpeng Date: Fri, 29 Jul 2022 13:28:31 +0800 Subject: [PATCH 5/5] Remove pre-commit run --- .github/workflows/python-test.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index b91e103..dddf9cf 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -30,10 +30,6 @@ jobs: python3 -m pip install --upgrade pip pip install . pip install -r requirements-dev.txt - - name: Run pre-commit - run: | - pre-commit install - pre-commit run --all-files - name: Collect coverage run: | coverage run --source=tests,clang_tools -m pytest