From d199619af8a9fedd8caa5113af469a01001a8fb3 Mon Sep 17 00:00:00 2001 From: Rafal Jankowski Date: Fri, 9 Dec 2022 18:37:01 +0100 Subject: [PATCH 1/7] Use of author main repository instead of a personal fork --- .github/actions/test-e2e/action.yml | 2 +- .github/actions/test-unit/action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/test-e2e/action.yml b/.github/actions/test-e2e/action.yml index ccfc18769..4467a449c 100644 --- a/.github/actions/test-e2e/action.yml +++ b/.github/actions/test-e2e/action.yml @@ -44,7 +44,7 @@ runs: path: ./.coverage* - name: Report - uses: Raalsky/action-junit-report@main + uses: mikepenz/action-junit-report@v3.6.2 if: always() with: report_paths: './test-results/test-e2e-*.xml' diff --git a/.github/actions/test-unit/action.yml b/.github/actions/test-unit/action.yml index 5a50f1d96..43a3dd726 100644 --- a/.github/actions/test-unit/action.yml +++ b/.github/actions/test-unit/action.yml @@ -43,7 +43,7 @@ runs: path: ./test-results - name: Report - uses: Raalsky/action-junit-report@main + uses: mikepenz/action-junit-report@v3.6.2 if: always() with: report_paths: './test-results/test-unit-*.xml' From 70887a47167eb74745010d1c7b31bb999da9b914 Mon Sep 17 00:00:00 2001 From: Rafal Jankowski Date: Fri, 9 Dec 2022 22:25:19 +0100 Subject: [PATCH 2/7] Test --- .github/workflows/unit-in-pull-request.yml | 2 +- pyproject.toml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/unit-in-pull-request.yml b/.github/workflows/unit-in-pull-request.yml index 111ea36a2..6849ce99d 100644 --- a/.github/workflows/unit-in-pull-request.yml +++ b/.github/workflows/unit-in-pull-request.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] + os: [ubuntu-latest, windows-latest] python-version: ["3.7"] name: 'test (${{ matrix.os }} - py${{ matrix.python-version }})' runs-on: ${{ matrix.os }} diff --git a/pyproject.toml b/pyproject.toml index 42be51e67..2dab8748e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -192,9 +192,7 @@ force_grid_wrap = 2 max-line-length = 120 extend-ignore = "E203" -[tool.coverage] -source = 'src/' - [tool.coverage.run] +source = ['src'] branch = true relative_files = true From 957b5e68a41375ad0e5662899737fe60dd67a580 Mon Sep 17 00:00:00 2001 From: Rafal Jankowski Date: Fri, 9 Dec 2022 22:44:13 +0100 Subject: [PATCH 3/7] source packages --- pyproject.toml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2dab8748e..e84ffd172 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -193,6 +193,12 @@ max-line-length = 120 extend-ignore = "E203" [tool.coverage.run] -source = ['src'] +source_pkgs = ['neptune'] branch = true relative_files = true + +[tool.coverage.paths] +source = [ + 'src/neptune', + 'src\neptune' +] From 86cae07756b78da08d9cf7c22836e9e8c0c20949 Mon Sep 17 00:00:00 2001 From: Rafal Jankowski Date: Fri, 9 Dec 2022 23:18:11 +0100 Subject: [PATCH 4/7] Non relative paths --- pyproject.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e84ffd172..2a42e91a3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -194,11 +194,12 @@ extend-ignore = "E203" [tool.coverage.run] source_pkgs = ['neptune'] -branch = true -relative_files = true +branch = false +relative_files = false [tool.coverage.paths] source = [ 'src/neptune', - 'src\neptune' + '/opt/hostedtoolcache/Python/*/x64/lib/python*/site-packages/neptune', + 'C:\hostedtoolcache\windows\Python\*\x64\Lib\site-packages\neptune' ] From 8ecc4094e39aea3eb8603ba0faf2d33dbc2e4d6e Mon Sep 17 00:00:00 2001 From: Rafal Jankowski Date: Fri, 9 Dec 2022 23:32:55 +0100 Subject: [PATCH 5/7] Show coverage report --- .github/actions/coverage/action.yml | 4 ++++ .github/workflows/unit-in-pull-request.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/actions/coverage/action.yml b/.github/actions/coverage/action.yml index b6fd21ce6..218564482 100644 --- a/.github/actions/coverage/action.yml +++ b/.github/actions/coverage/action.yml @@ -31,6 +31,10 @@ runs: run: coverage combine shell: bash + - name: Show coverage report + run: coverage report -m + shell: bash + - name: Prepare coverage report run: coverage xml shell: bash diff --git a/.github/workflows/unit-in-pull-request.yml b/.github/workflows/unit-in-pull-request.yml index 6849ce99d..6c2e14e15 100644 --- a/.github/workflows/unit-in-pull-request.yml +++ b/.github/workflows/unit-in-pull-request.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-latest, macos-latest] python-version: ["3.7"] name: 'test (${{ matrix.os }} - py${{ matrix.python-version }})' runs-on: ${{ matrix.os }} From 562689a51b6405f7faa7ee47d930e65dc263fb83 Mon Sep 17 00:00:00 2001 From: Rafal Jankowski Date: Sat, 10 Dec 2022 08:58:48 +0100 Subject: [PATCH 6/7] Including macos --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 2a42e91a3..2fbf9d3e1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -201,5 +201,6 @@ relative_files = false source = [ 'src/neptune', '/opt/hostedtoolcache/Python/*/x64/lib/python*/site-packages/neptune', + '/Users/runner/hostedtoolcache/Python/*/x64/lib/python*/site-packages/neptune', 'C:\hostedtoolcache\windows\Python\*\x64\Lib\site-packages\neptune' ] From 52d109f4d0989a1cc95a433f88b4dfb5f524d9ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Jankowski?= Date: Sat, 10 Dec 2022 16:56:19 +0100 Subject: [PATCH 7/7] Update unit-in-pull-request.yml --- .github/workflows/unit-in-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-in-pull-request.yml b/.github/workflows/unit-in-pull-request.yml index 6c2e14e15..111ea36a2 100644 --- a/.github/workflows/unit-in-pull-request.yml +++ b/.github/workflows/unit-in-pull-request.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest] python-version: ["3.7"] name: 'test (${{ matrix.os }} - py${{ matrix.python-version }})' runs-on: ${{ matrix.os }}