From 920fbd11500ce1510ce0d232b1db9ea052e12353 Mon Sep 17 00:00:00 2001 From: PProfizi <100710998+PProfizi@users.noreply.github.com> Date: Thu, 12 May 2022 17:57:52 +0200 Subject: [PATCH 1/5] Update badges in readme --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a7ae433a2c3..2e0cbec946f 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # DPF - Ansys Data Processing Framework - -[![PyPI version](https://badge.fury.io/py/ansys-dpf-core.svg)](https://badge.fury.io/py/ansys-dpf-core) - -[![Build Status](https://dev.azure.com/pyansys/pyansys/_apis/build/status/pyansys.DPF-Core?branchName=master)](https://dev.azure.com/pyansys/pyansys/_build/latest?definitionId=2&branchName=master) - +[![PyAnsys](https://img.shields.io/badge/Py-Ansys-ffc107.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAABDklEQVQ4jWNgoDfg5mD8vE7q/3bpVyskbW0sMRUwofHD7Dh5OBkZGBgW7/3W2tZpa2tLQEOyOzeEsfumlK2tbVpaGj4N6jIs1lpsDAwMJ278sveMY2BgCA0NFRISwqkhyQ1q/Nyd3zg4OBgYGNjZ2ePi4rB5loGBhZnhxTLJ/9ulv26Q4uVk1NXV/f///////69du4Zdg78lx//t0v+3S88rFISInD59GqIH2esIJ8G9O2/XVwhjzpw5EAam1xkkBJn/bJX+v1365hxxuCAfH9+3b9/+////48cPuNehNsS7cDEzMTAwMMzb+Q2u4dOnT2vWrMHu9ZtzxP9vl/69RVpCkBlZ3N7enoDXBwEAAA+YYitOilMVAAAAAElFTkSuQmCC)](https://docs.pyansys.com/) +[![Python](https://img.shields.io/badge/Python-3.7%20%7C%203.8%20%7C%203.9%20%7C%203.10-blue)](https://pypi.org/project/pyansys-sphinx-theme/) +[![pypi](https://badge.fury.io/py/ansys-dpf-core.svg?logo=python&logoColor=white)](https://pypi.org/project/ansys-dpf-core) +[![GH-CI](https://github.com/pyansys/pydpf-core/actions/workflows/ci.yml/badge.svg)](https://github.com/pyansys/pydpf-core/actions/workflows/ci.yml) +[![MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) The Data Processing Framework (DPF) is designed to provide numerical simulation users/engineers with a toolbox for accessing and From b3777cb7d715685dcbe0727b2c8191f3550277a4 Mon Sep 17 00:00:00 2001 From: PProfizi <100710998+PProfizi@users.noreply.github.com> Date: Thu, 12 May 2022 18:06:09 +0200 Subject: [PATCH 2/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e0cbec946f..2d3426c7d85 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # DPF - Ansys Data Processing Framework [![PyAnsys](https://img.shields.io/badge/Py-Ansys-ffc107.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAABDklEQVQ4jWNgoDfg5mD8vE7q/3bpVyskbW0sMRUwofHD7Dh5OBkZGBgW7/3W2tZpa2tLQEOyOzeEsfumlK2tbVpaGj4N6jIs1lpsDAwMJ278sveMY2BgCA0NFRISwqkhyQ1q/Nyd3zg4OBgYGNjZ2ePi4rB5loGBhZnhxTLJ/9ulv26Q4uVk1NXV/f///////69du4Zdg78lx//t0v+3S88rFISInD59GqIH2esIJ8G9O2/XVwhjzpw5EAam1xkkBJn/bJX+v1365hxxuCAfH9+3b9/+////48cPuNehNsS7cDEzMTAwMMzb+Q2u4dOnT2vWrMHu9ZtzxP9vl/69RVpCkBlZ3N7enoDXBwEAAA+YYitOilMVAAAAAElFTkSuQmCC)](https://docs.pyansys.com/) -[![Python](https://img.shields.io/badge/Python-3.7%20%7C%203.8%20%7C%203.9%20%7C%203.10-blue)](https://pypi.org/project/pyansys-sphinx-theme/) +[![Python](https://img.shields.io/badge/Python-3.8-blue)](https://pypi.org/project/ansys-dpf-core/) [![pypi](https://badge.fury.io/py/ansys-dpf-core.svg?logo=python&logoColor=white)](https://pypi.org/project/ansys-dpf-core) [![GH-CI](https://github.com/pyansys/pydpf-core/actions/workflows/ci.yml/badge.svg)](https://github.com/pyansys/pydpf-core/actions/workflows/ci.yml) [![MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) From a0498f7646d45d5aff61a19b9efa284a5df8d74a Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Wed, 18 May 2022 12:14:18 +0200 Subject: [PATCH 3/5] Adding coverage badges as well as downloads, co, commit and code quality --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2d3426c7d85..351324ce6a7 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,14 @@ # DPF - Ansys Data Processing Framework [![PyAnsys](https://img.shields.io/badge/Py-Ansys-ffc107.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAABDklEQVQ4jWNgoDfg5mD8vE7q/3bpVyskbW0sMRUwofHD7Dh5OBkZGBgW7/3W2tZpa2tLQEOyOzeEsfumlK2tbVpaGj4N6jIs1lpsDAwMJ278sveMY2BgCA0NFRISwqkhyQ1q/Nyd3zg4OBgYGNjZ2ePi4rB5loGBhZnhxTLJ/9ulv26Q4uVk1NXV/f///////69du4Zdg78lx//t0v+3S88rFISInD59GqIH2esIJ8G9O2/XVwhjzpw5EAam1xkkBJn/bJX+v1365hxxuCAfH9+3b9/+////48cPuNehNsS7cDEzMTAwMMzb+Q2u4dOnT2vWrMHu9ZtzxP9vl/69RVpCkBlZ3N7enoDXBwEAAA+YYitOilMVAAAAAElFTkSuQmCC)](https://docs.pyansys.com/) [![Python](https://img.shields.io/badge/Python-3.8-blue)](https://pypi.org/project/ansys-dpf-core/) -[![pypi](https://badge.fury.io/py/ansys-dpf-core.svg?logo=python&logoColor=white)](https://pypi.org/project/ansys-dpf-core) +[![pypi](https://img.shields.io/pypi/v/ansys-dpf-core.svg?logo=python&logoColor=white)](https://pypi.org/project/ansys-dpf-core) +[![freq-PyDPF-Core](https://img.shields.io/github/commit-activity/m/pyansys/pydpf-core)](https://github.com/pyansys/pydpf-core) [![GH-CI](https://github.com/pyansys/pydpf-core/actions/workflows/ci.yml/badge.svg)](https://github.com/pyansys/pydpf-core/actions/workflows/ci.yml) +[![docs](https://img.shields.io/website?down_color=lightgrey&down_message=invalid&label=documentation&up_color=brightgreen&up_message=up&url=https%3A%2F%2Fdpfdocs.pyansys.com%2F)](https://dpfdocs.pyansys.com) [![MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) +[![pypidl](https://img.shields.io/pypi/dm/ansys-dpf-core.svg?label=PyPI%20downloads)](https://pypi.org/project/ansys-dpf-core/) +[![cov](https://codecov.io/gh/pyansys/pydpf-core/branch/master/graph/badge.svg)](https://codecov.io/gh/pyansys/pydpf-core) +[![codacy](https://app.codacy.com/project/badge/Grade/61b6a519aea64715ad1726b3955fcf98)](https://www.codacy.com/gh/pyansys/pydpf-core/dashboard?utm_source=github.com&utm_medium=referral&utm_content=pyansys/pydpf-core&utm_campaign=Badge_Grade) The Data Processing Framework (DPF) is designed to provide numerical simulation users/engineers with a toolbox for accessing and From 434f2a9db08e89599cefaef562e54df23a26d05f Mon Sep 17 00:00:00 2001 From: jose-henriquezroa <103057713+jose-henriquezroa@users.noreply.github.com> Date: Fri, 13 May 2022 11:37:31 +0200 Subject: [PATCH 4/5] Fix typo in example 02/04 (#238) --- examples/02-modal-harmonic/04-modal_superposition.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/02-modal-harmonic/04-modal_superposition.py b/examples/02-modal-harmonic/04-modal_superposition.py index ad8e8d065af..11463d341d6 100644 --- a/examples/02-modal-harmonic/04-modal_superposition.py +++ b/examples/02-modal-harmonic/04-modal_superposition.py @@ -18,9 +18,9 @@ # Create the data sources # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # First create a data sources with the mode shapes and the modal response -# The expansion is recursive in dpf: first the modal response is red, +# The expansion is recursive in dpf: first the modal response is read, # then, "upstreams" mode shapes are found in the data sources, so they -# are red and expanded (mode shapes x modal response) +# are read and expanded (mode shapes x modal response) msup_files = examples.download_msup_files_to_dict() data_sources = dpf.DataSources(msup_files["rfrq"]) From bf4769684b609efb05c64665ba1053b0aa653489 Mon Sep 17 00:00:00 2001 From: PProfizi <100710998+PProfizi@users.noreply.github.com> Date: Wed, 18 May 2022 10:39:51 +0200 Subject: [PATCH 5/5] Adding coverage (#241) * Adding coverage * Adding coverage * Adding coverage * Adding coverage * Adding coverage * Adding coverage * Adding .coveragerc * Removing .coveragerc --- .github/workflows/ci.yml | 7 +++++-- codecov.yml | 21 +++++++++++++++++++++ requirements_test.txt | 1 + 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 codecov.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8c308c1243..967192e5a92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,12 +104,12 @@ jobs: Copy-Item -Path ".\test_local_server.py",".\test_multi_server.py", ".\test_workflow.py" -Destination ".\..\local_server_test\" Copy-Item -Path ".\conftest.py" -Destination ".\..\local_server_test\conftest.py" Remove-Item -Path ".\test_local_server.py",".\test_multi_server.py", ".\test_workflow.py" - pytest --log-level=ERROR --junitxml=junit/test-results1.xml --reruns 2 . + pytest --cov=ansys.dpf.core --cov-report=xml --cov-report=html --log-level=ERROR --junitxml=junit/test-results1.xml --reruns 2 . - name: Test Core API 2 run: | cd local_server_test - pytest --log-level=ERROR --junitxml=../tests/junit/test-results2.xml --reruns 2 . + pytest --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results2.xml --reruns 2 . timeout-minutes: 10 - name: Kill all servers @@ -120,6 +120,9 @@ jobs: if "%ERRORLEVEL%"=="0"(taskkill /f /im Ans.Dpf.Grpc.exe) continue-on-error: true + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v2 + - name: Publish Test Results uses: actions/upload-artifact@v2 with: diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 00000000000..11163ebe617 --- /dev/null +++ b/codecov.yml @@ -0,0 +1,21 @@ +comment: + layout: "diff" + behavior: default + +coverage: + status: + project: false + patch: + default: + # basic + target: auto + threshold: 10% + if_not_found: success + if_ci_failed: error + if_no_uploads: error + ignore: + - "examples" # ignore folder and all its contents + - "docs" # ignore folder and all its contents + - "docker" # ignore folder and all its contents + - "tests" # ignore folder and all its contents + - "ansys/dpf/core/operators" # ignore folder and all its contents \ No newline at end of file diff --git a/requirements_test.txt b/requirements_test.txt index d3da4307ede..33ed6c8703d 100755 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -4,3 +4,4 @@ pytest-rerunfailures matplotlib==3.2 vtk<9.1.0 pyvista>=0.24.0 +coverage