Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/yuanrui/enhanced images #135

Merged
merged 36 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
65f07af
Finished the first version of enhanced image module
zhang-yuanrui Oct 4, 2024
f44b11d
Add a part name parameter to remove all hardcode
zhang-yuanrui Oct 4, 2024
19b6b6d
Reformat. Remove functions only for testing
zhang-yuanrui Oct 4, 2024
8bbede5
Simplify the code
zhang-yuanrui Oct 4, 2024
b9799cc
Merge branch 'main' of github.com:ansys/pydynamicreporting into feat/…
zhang-yuanrui Oct 9, 2024
fecbd74
Merge branch 'main' into feat/yuanrui/enhanced_images
zhang-yuanrui Oct 9, 2024
22ba889
Mark helper functions by appending '_'
zhang-yuanrui Oct 9, 2024
62e0ea8
Merge branch 'feat/yuanrui/enhanced_images' of github.com:ansys/pydyn…
zhang-yuanrui Oct 9, 2024
a72e6bd
Check package dependency
zhang-yuanrui Oct 9, 2024
07bb501
Backup _test_enhanced_images.py
zhang-yuanrui Oct 10, 2024
dc07365
properly teardown for in-mem version
zhang-yuanrui Oct 10, 2024
e4a7767
Switch to returning a buffer instead of an image
zhang-yuanrui Oct 11, 2024
b72274e
Finish testing.
zhang-yuanrui Oct 11, 2024
08f89db
Merge branch 'main' of github.com:ansys/pydynamicreporting into feat/…
zhang-yuanrui Oct 11, 2024
a1dfbf2
Add vtk and dpf dependency
zhang-yuanrui Oct 15, 2024
36b45b8
Merge branch 'main' of github.com:ansys/pydynamicreporting into feat/…
zhang-yuanrui Oct 15, 2024
a8c1936
Finish the initial test script for enhanced images
zhang-yuanrui Oct 15, 2024
622f1b5
Enable the test to install required packages
zhang-yuanrui Oct 16, 2024
6142549
reformat
zhang-yuanrui Oct 16, 2024
468e02b
Add # pragma: no cover; make all the helper functions under the modul…
zhang-yuanrui Oct 16, 2024
7c39895
Add a try catch block to bypass the test if there is no DPF server av…
zhang-yuanrui Oct 16, 2024
cea61fb
terminate the testing program if DPF server is not set
zhang-yuanrui Oct 16, 2024
143dd0a
Return None when DPF server is not found in the testing process
zhang-yuanrui Oct 16, 2024
cdab4b4
Remove unecessary import; Add pytest.mark decorations
zhang-yuanrui Oct 16, 2024
58715c8
Upgrade setuptools
zhang-yuanrui Oct 16, 2024
9844d92
skip 3.12
zhang-yuanrui Oct 17, 2024
fe4850b
rm a test file
zhang-yuanrui Oct 17, 2024
1fa7c40
Exclude dpf-core for python 3.12
zhang-yuanrui Oct 17, 2024
e23254c
Upgrade numpy for testing
zhang-yuanrui Oct 17, 2024
5af384c
Upgrade numpy in test
zhang-yuanrui Oct 17, 2024
d5eef71
Remove constraint for dpf-core
zhang-yuanrui Oct 17, 2024
95f835f
ignore extra testing files for enhanced images
zhang-yuanrui Oct 18, 2024
b26b23d
Move numpy version back to 1.25.1 and limit pyvista, vtk, dpf-core to…
zhang-yuanrui Oct 18, 2024
5719097
Remove numpy in [test]
zhang-yuanrui Oct 18, 2024
cbbbe54
Allow pyvista, vtk and dpf-core to run with python 3.12
zhang-yuanrui Oct 18, 2024
b603ec1
uncomment need smoke test
zhang-yuanrui Oct 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,15 @@ jobs:
- name: Pull Docker container
run: make pull-docker

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Run pytest
uses: ansys/actions/tests-pytest@v8
run: make test
env:
ANSYSLMD_LICENSE_FILE: ${{ format('1055@{0}', secrets.LICENSE_SERVER )}}
with:
checkout: false
python-version: ${{ env.MAIN_PYTHON_VERSION }}
pytest-extra-args: -rvx --setup-show --cov=ansys.dynamicreporting --cov-report html:coverage-html --cov-report term --cov-report xml:coverage.xml
ANSYSLMD_LICENSE_FILE: ${{ format('1055@{0}', secrets.LICENSE_SERVER) }}

- name: Upload coverage report
if: env.MAIN_PYTHON_VERSION == matrix.python-version
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,9 @@ jobs:
run: make pull-docker

- name: Run pytest
uses: ansys/actions/tests-pytest@v8
run: make test
env:
ANSYSLMD_LICENSE_FILE: ${{ format('1055@{0}', secrets.LICENSE_SERVER )}}
with:
checkout: false
python-version: ${{ env.MAIN_PYTHON_VERSION }}
pytest-extra-args: -rvx --setup-show --cov=ansys.dynamicreporting --cov-report html:coverage-html --cov-report term --cov-report xml:coverage.xml
ANSYSLMD_LICENSE_FILE: ${{ format('1055@{0}', secrets.LICENSE_SERVER) }}

nightly_and_upload:
name: nightly_and_upload
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,8 @@ venv/
.vscode

# Ignore Sphinx files
doc/_build
doc/_build

# TIFF files
*.tiff
_test_enhanced_images.py
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@ pull-docker:
bash .ci/pull_adr_image.sh

test:
pytest -rvx --setup-show --cov=ansys.dynamicreporting.core \
--cov-report html:coverage-html \
--cov-report term \
--cov-report xml:coverage.xml
pip install -e .[test]
pytest -rvx --setup-show --cov=ansys.dynamicreporting.core --cov-report html:coverage-html --cov-report term --cov-report xml:coverage.xml

smoketest:
python -c "from ansys.dynamicreporting.core import __version__; print(__version__)"
Expand Down
9 changes: 6 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[build-system]
build-backend = "setuptools.build_meta"
requires = [
"setuptools>=45.0",
"setuptools>=65.5.0",
"setuptools-scm",
"wheel>=0.37.0",
"pre-commit==3.3.3",
Expand Down Expand Up @@ -70,12 +70,15 @@ repository = "https://github.com/ansys/pydynamicreporting"
ci = "https://github.com/ansys/pydynamicreporting/actions"

[project.optional-dependencies]
tests = [
test = [
"docker>=7.1.0",
"numpy==1.25.1",
"psutil==6.0.0",
"exceptiongroup==1.0.0",
"pytest==8.3.3",
"pytest-cov==4.1.0",
"pyvista==0.44.1",
"vtk==9.3.1",
"ansys-dpf-core==0.13.0",
]
doc = [
"ansys-sphinx-theme==0.12.4",
Expand Down
Loading
Loading