From dd5232c0a3717638f0d41060023de7f0c8c6a3f2 Mon Sep 17 00:00:00 2001 From: Stefan Antonelli Date: Thu, 17 Feb 2022 17:21:56 +0100 Subject: [PATCH 1/4] fix coverage --- .github/workflows/build.yml | 13 ++++++++----- coverage.json | 1 + setup.py | 2 ++ 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 coverage.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a88f8b3f..d9fd200b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: plone-version: - - 'Plone52' + - 'Plone 5.2' python-version: [3.7, 3.8, 3.9] steps: - uses: actions/checkout@v2 @@ -46,8 +46,11 @@ jobs: - name: Run tests run: | bin/test - - name: "Upload coverage to Codecov" - uses: "codecov/codecov-action@v1" + - name: Create coverage + run: | + bin/createcoverage + bin/coverage json -i + - name: Coveralls + uses: coverallsapp/github-action@master with: - fail_ci_if_error: false - if: matrix.python-version == '3.7' + github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/coverage.json b/coverage.json new file mode 100644 index 00000000..520ab468 --- /dev/null +++ b/coverage.json @@ -0,0 +1 @@ +{"meta": {"version": "5.5", "timestamp": "2022-02-17T17:17:11.656505", "branch_coverage": false, "show_contexts": false}, "files": {"src/plonetheme/__init__.py": {"executed_lines": [3], "summary": {"covered_lines": 1, "num_statements": 1, "percent_covered": 100.0, "missing_lines": 0, "excluded_lines": 0}, "missing_lines": [], "excluded_lines": []}, "src/plonetheme/tokyo/__init__.py": {"executed_lines": [2, 4, 7], "summary": {"covered_lines": 3, "num_statements": 3, "percent_covered": 100.0, "missing_lines": 0, "excluded_lines": 0}, "missing_lines": [], "excluded_lines": []}, "src/plonetheme/tokyo/browser/__init__.py": {"executed_lines": [1], "summary": {"covered_lines": 0, "num_statements": 0, "percent_covered": 100.0, "missing_lines": 0, "excluded_lines": 0}, "missing_lines": [], "excluded_lines": []}, "src/plonetheme/tokyo/browser/header.py": {"executed_lines": [3, 4, 5, 8, 9], "summary": {"covered_lines": 5, "num_statements": 10, "percent_covered": 50.0, "missing_lines": 5, "excluded_lines": 0}, "missing_lines": [10, 11, 12, 14, 17], "excluded_lines": []}, "src/plonetheme/tokyo/browser/listings.py": {"executed_lines": [3, 6, 8, 12, 14], "summary": {"covered_lines": 5, "num_statements": 6, "percent_covered": 83.33333333333333, "missing_lines": 1, "excluded_lines": 0}, "missing_lines": [9], "excluded_lines": []}, "src/plonetheme/tokyo/browser/main_template.py": {"executed_lines": [3, 4, 5, 6, 9, 10, 12, 13, 15, 18, 25], "summary": {"covered_lines": 11, "num_statements": 16, "percent_covered": 68.75, "missing_lines": 5, "excluded_lines": 0}, "missing_lines": [16, 20, 21, 23, 27], "excluded_lines": []}, "src/plonetheme/tokyo/interfaces.py": {"executed_lines": [2, 3, 6, 7], "summary": {"covered_lines": 3, "num_statements": 3, "percent_covered": 100.0, "missing_lines": 0, "excluded_lines": 0}, "missing_lines": [], "excluded_lines": []}, "src/plonetheme/tokyo/setuphandlers.py": {"executed_lines": [3, 4, 5, 8, 9, 10, 18, 23, 26, 27, 33, 35], "summary": {"covered_lines": 11, "num_statements": 13, "percent_covered": 84.61538461538461, "missing_lines": 2, "excluded_lines": 0}, "missing_lines": [12, 15], "excluded_lines": []}}, "totals": {"covered_lines": 39, "num_statements": 52, "percent_covered": 75.0, "missing_lines": 13, "excluded_lines": 0}} \ No newline at end of file diff --git a/setup.py b/setup.py index a2bca40f..27ac5225 100644 --- a/setup.py +++ b/setup.py @@ -24,6 +24,8 @@ "Framework :: Plone :: 5.2", "Programming Language :: Python", "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Operating System :: OS Independent", "License :: OSI Approved :: GNU General Public License v2 (GPLv2)", ], From cd397a8b2c6fb9ee2b26d579df0f1100cc92f2fc Mon Sep 17 00:00:00 2001 From: Stefan Antonelli Date: Thu, 17 Feb 2022 17:41:51 +0100 Subject: [PATCH 2/4] testing --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9fd200b..d1d42155 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,7 @@ jobs: - name: Create coverage run: | bin/createcoverage - bin/coverage json -i + bin/coverage lcov - name: Coveralls uses: coverallsapp/github-action@master with: From 52b41d1ed09595f1d8080d3adea1460db0208f56 Mon Sep 17 00:00:00 2001 From: Stefan Antonelli Date: Thu, 17 Feb 2022 17:48:34 +0100 Subject: [PATCH 3/4] fix coverage lcov --- .github/workflows/build.yml | 3 +- coverage.lcov | 95 +++++++++++++++++++++++++++++++++++++ versions.cfg | 1 + 3 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 coverage.lcov diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d1d42155..f25d4142 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,8 +49,9 @@ jobs: - name: Create coverage run: | bin/createcoverage - bin/coverage lcov + bin/coverage lcov -i - name: Coveralls uses: coverallsapp/github-action@master with: github-token: ${{ secrets.GITHUB_TOKEN }} + path-to-lcov: lcov.info diff --git a/coverage.lcov b/coverage.lcov new file mode 100644 index 00000000..6a67d4e2 --- /dev/null +++ b/coverage.lcov @@ -0,0 +1,95 @@ +TN: +SF:src/plonetheme/__init__.py +DA:3,1,gG9L/J2A/IwO9tZM1raZxQ +LF:1 +LH:1 +end_of_record +TN: +SF:src/plonetheme/tokyo/__init__.py +DA:2,1,J1PuuQr8ksS1PSAIV60l7Q +DA:4,1,TeaBZJj1wbJ/c/iw+/43pw +DA:7,1,56YNFa6YywoYiYWALYXBkQ +LF:3 +LH:3 +end_of_record +TN: +SF:src/plonetheme/tokyo/browser/__init__.py +DA:1,1,1B2M2Y8AsgTpgAmY7PhCfg +LF:0 +LH:1 +end_of_record +TN: +SF:src/plonetheme/tokyo/browser/header.py +DA:3,1,RIlRrbOnIzgZAO2I+qFjFg +DA:4,1,OQuTMmFlUgx+PzdwE8x9EQ +DA:5,1,gCATlppgnkTrE5I3wNtJ+A +DA:8,1,r9HXZjHXVCjlczOC3hOKLw +DA:9,1,TIFXrbd434QrObHqUImyqQ +DA:10,0,VRyCd9igvNC+G591QS/fjA +DA:11,0,c/qEFbeJAMVKzf6r0DTIRg +DA:12,0,znbf11jBypdikQzMlWZrVg +DA:14,0,MtAN/rId8UMwtYW6mYxEEA +DA:17,0,BtoCwWazjZ2ZCN154JMO8A +LF:10 +LH:5 +end_of_record +TN: +SF:src/plonetheme/tokyo/browser/listings.py +DA:3,1,+nBNdbxpvZOyx2WbY7kjuA +DA:6,1,WQSHHl0V1gMcylcGPn2Zeg +DA:8,1,e24qk4AOVJqPntEsy1cngw +DA:12,1,rgaXqIJU/8GjG3Nt+WH4DA +DA:14,1,k0FVjUPPWdN1KRnshTPEeQ +DA:9,0,BOCyQyvGPwnLeGGEkB0WzA +LF:6 +LH:5 +end_of_record +TN: +SF:src/plonetheme/tokyo/browser/main_template.py +DA:3,1,KLBq+iZWHpUMh+ZgK6+fPQ +DA:4,1,+nBNdbxpvZOyx2WbY7kjuA +DA:5,1,2Tt7Scwnwhrv4hYFyPU4Sg +DA:6,1,1nqOPeoR3f26HB0Kr1oUYg +DA:9,1,pOsLOXe2kmtxaKwAmo0I9Q +DA:10,1,PXS2je6AHPmVohYPGwZmyA +DA:12,1,J9UZz9PP7u6wuHwzM48h/A +DA:13,1,+E6VI2ZXc+TQVvl4AFD/9Q +DA:15,1,2ydOjk0utaYT8mpg0Vp2pQ +DA:18,1,HmADa1g/W1C2Vo9Wm4sNNA +DA:25,1,HmADa1g/W1C2Vo9Wm4sNNA +DA:16,0,bDfWrPbS0x4AIzI5+ZI0yQ +DA:20,0,2pxzWZzCDRh0RVKWFKMmQA +DA:21,0,uhw4En6uGqq5O8B92N9TrQ +DA:23,0,AYMUD0yQvcgO/PePJ1Eudg +DA:27,0,2GYIC3YaGBQdl0LgjcWtNQ +LF:16 +LH:11 +end_of_record +TN: +SF:src/plonetheme/tokyo/interfaces.py +DA:2,1,evm9QZ1mHErNqGDXoIXvew +DA:3,1,2BEZCEdiqpoIO1GRXgtQPw +DA:6,1,Alk4E4R/8qX3tCiHsLeKqg +DA:7,1,sggum8+7u0eclCzUZaXk6g +LF:3 +LH:4 +end_of_record +TN: +SF:src/plonetheme/tokyo/setuphandlers.py +DA:3,1,RIlRrbOnIzgZAO2I+qFjFg +DA:4,1,AguT7WyyQOqcaXt5ObXJWQ +DA:5,1,1nqOPeoR3f26HB0Kr1oUYg +DA:8,1,zbnPdwRMIg3K4fxfw4kWoA +DA:9,1,YLRhVaFymQ9iRPHvyPPwgA +DA:10,1,Mwo2U6B/Dlzo9OR1qfsZPQ +DA:18,1,gjXQcDt6sRujrIb7jZU9Vw +DA:23,1,qAloaGi7AQ1kKyS8nsLZwg +DA:26,1,kQEh8BDoOa4B0AgNX1xI7Q +DA:27,1,/ZvqiDY7XVzMiSFdpC6ZCg +DA:33,1,BDhXDgTcu1tygjsVHQUtfw +DA:35,1,sxkupJcXwaQya3DXkeyxCQ +DA:12,0,jQ1RpWQmJlAx0dgPZv3odw +DA:15,0,E8zJItbcgvVnzIhQwkTjTw +LF:13 +LH:12 +end_of_record diff --git a/versions.cfg b/versions.cfg index 52a96feb..44a6bbca 100644 --- a/versions.cfg +++ b/versions.cfg @@ -4,6 +4,7 @@ build = 0.1.0 case-conversion = 2.1.0 check-manifest = 0.46 collective.sidebar = 1.5.0 +coverage = 6.3.1 createcoverage = 1.5 fancycompleter = 0.9.1 flake8 = 3.8.4 From bd303cb096b0ffeb4825bb47a5435a94db7cf24c Mon Sep 17 00:00:00 2001 From: Stefan Antonelli Date: Thu, 17 Feb 2022 17:54:22 +0100 Subject: [PATCH 4/4] fix file path --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f25d4142..426b1d5e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,4 +54,4 @@ jobs: uses: coverallsapp/github-action@master with: github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: lcov.info + path-to-lcov: coverage.lcov