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.

Sign up for GitHub

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

Jump to bottom

Remove restraint of vtk<9.1.0 #132

Merged
merged 18 commits into from
Aug 19, 2022
Merged

Remove restraint of vtk<9.1.0 #132

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3dac2e2
Remove restrain on vtk<9.1.0
PProfizi Aug 11, 2022
8abdec8
Use the new DpfPlotter instead of the old.
PProfizi Aug 11, 2022
ebac50d
Revert "Use the new DpfPlotter instead of the old."
PProfizi Aug 11, 2022
af53219
Remove problematic line to test the rest
PProfizi Aug 11, 2022
7f04480
Output info on renderer
PProfizi Aug 11, 2022
eb5efc6
Force renderer info
PProfizi Aug 11, 2022
92e86ef
Comment out other plotting tests
PProfizi Aug 12, 2022
0780f3a
revert changes
akaszynski Aug 18, 2022
2c49d56
conditional VTK version for testing
akaszynski Aug 18, 2022
d73e792
Merge branch 'master' into fix/support_vtk_above_9_1_0
akaszynski Aug 18, 2022
774f42a
fix python_requires
akaszynski Aug 18, 2022
7c0d371
conditionally disable lighting
akaszynski Aug 19, 2022
3e5b1e6
Fix naming error
PProfizi Aug 19, 2022
d5c1071
Remove matplotlib requirements as well since a dependency of PyVista
PProfizi Aug 19, 2022
0534ef7
Remove doctest +SKIP
PProfizi Aug 19, 2022
078b647
Add a global conftest for doctest
PProfizi Aug 19, 2022
1d571ad
Revert "Add a global conftest for doctest"
PProfizi Aug 19, 2022
dcabaab
Revert "Remove doctest +SKIP"
PProfizi Aug 19, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9"]
python-version: ["3.8", "3.9", "3.10"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.7", "3.8", "3.9", "3.10"]

I think that, since we are supporting above Python 3.7, shouldn't it be included in this matrix testing?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is tested in job Build_and_Test. We separated them to be able to trigger them independantly. The CI will however be reworked soon with a testing strategy coherent with what is being put in place for PyDPF-Core.

os: ["windows-latest", "ubuntu-latest"]

steps:
Expand Down
5 changes: 2 additions & 3 deletions ansys/dpf/post/result_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
user will be able to use to compute through the DPF Post API.

This is a fields container wrapper."""

from textwrap import wrap

from ansys.dpf.core import FieldsContainer, Operator
Expand Down Expand Up @@ -296,7 +295,7 @@ def plot_contour(
>>> solution = post.load_solution(examples.download_all_kinds_of_complexity())
>>> stress = solution.stress(location=post.locations.nodal)
>>> sx = stress.xx
>>> pl = sx.plot_contour("time", [1], off_screen=True)
>>> pl = sx.plot_contour("time", [1], off_screen=True) # doctest: +SKIP

The labels can be obtained using:

Expand Down Expand Up @@ -348,7 +347,7 @@ def plot_contour(
else:
# sorts and creates a new fields_container with only the desired labels
fc = self._sort_fields_container_with_labels(option_id, display_option)
# Call Plotter.plot_contour (to change for use of DpfPlotter

pl.plot_contour(fc, **kwargs)

def _plot_chart(self):
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pytest==7.1.2
coverage==6.4.4
pytest-cov==3.0.0
pytest-rerunfailures==10.2
coverage==6.4.4
pytest==7.1.2
5 changes: 3 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
python_requires=">=3.7.*,!=3.10.*",
python_requires=">=3.7.*,<4.0",
extras_require={
"plotting": ["vtk<9.1.0", "pyvista>=0.24.0", "matplotlib"],
"plotting": ["pyvista>=0.24.0", "matplotlib"],
},
install_requires=install_requires,
license='MIT',
Expand Down
23 changes: 23 additions & 0 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Launch or connect to a persistent local DPF service to be shared in
pytest as a sesson fixture
"""
import re
import os

import pytest
Expand All @@ -16,6 +17,28 @@
pv.OFF_SCREEN = True
mpl.use("Agg")


def get_lighting():
"""Get lighting configuration.

Disable lighting when using OSMesa on Windows. See:
https://github.com/pyvista/pyvista/issues/3185

"""
pl = pv.Plotter(notebook=False, off_screen=True)
pl.add_mesh(pv.Sphere())
pl.show(auto_close=False)
gpu_info = pl.ren_win.ReportCapabilities();
pl.close()

regex = re.compile("OpenGL version string:(.+)\n")
version = regex.findall(gpu_info)[0]
return not(os.name == 'nt' and 'Mesa' in version)


pv.global_theme.lighting = get_lighting()


# currently running dpf on docker. Used for testing on CI
running_docker = os.environ.get("DPF_DOCKER", False)

Expand Down