Skip to content

Commit

Permalink
Feat/yuanrui/enhanced images (#135)
Browse files Browse the repository at this point in the history
  • Loading branch information
zhang-yuanrui authored Oct 21, 2024
1 parent 9bbb298 commit db039d8
Show file tree
Hide file tree
Showing 7 changed files with 556 additions and 20 deletions.
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

0 comments on commit db039d8

Please sign in to comment.