Skip to content

Commit e5ae798

Browse files
committed
Merge branch 'main' into release/0.51
2 parents 6a02950 + 01d42eb commit e5ae798

File tree

3 files changed

+27
-17
lines changed

3 files changed

+27
-17
lines changed

.github/workflows/testing-and-deployment.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@ jobs:
132132
quay.io/pypa/manylinux2014_x86_64 \
133133
/io/.ci/build_wheels.sh ${{ matrix.python-version }}
134134
135+
- name: Install VTK on Python 3.10
136+
if: matrix.python-version == '3.10'
137+
run: pip install --find-links https://wheels.pyvista.org/ vtk
138+
135139
- name: Build wheel on Windows
136140
if: ${{ runner.os == 'Windows' }}
137141
run: |

README.rst

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,32 @@ Installation
4343
------------
4444
Installation through pip::
4545

46-
pip install ansys-mapdl-reader
46+
pip install ansys-mapdl-reader
4747

4848
You can also visit `pymapdl-reader <https://github.com/pyansys/pymapdl-reader>`_
4949
to download the source or releases from GitHub.
5050

51+
Python 3.10 Extra Instructions
52+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5153

52-
Loading and Plotting an ANSYS Archive File
53-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
54+
PyMAPDL-Reader requires the `VTK library <https://vtk.org/>`_ which, at the
55+
moment, is not available for Python 3.10 in `their official channel
56+
<https://pypi.org/project/vtk/>`_.
57+
58+
If you wish to install PyMAPDL-Reader in Python 3.10, you can still do it by
59+
using the unofficial VTK wheel from PyVista using ``--find-links``. This tells ``pip`` to look for vtk at `wheels.pyvista.org <https://wheels.pyvista.org/>`_. Use this with::
60+
61+
pip install ansys-mapdl-reader --find-links https://wheels.pyvista.org/
62+
63+
Please visit `Unofficial VTK Wheels for Python 3.10
64+
<https://github.com/pyvista/pyvista/discussions/2064>`_ for further details.
65+
66+
67+
Examples
68+
--------
69+
70+
Loading and Plotting a MAPDL Archive File
71+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5472
ANSYS archive files containing solid elements (both legacy and
5573
modern), can be loaded using Archive and then converted to a vtk
5674
object.
@@ -215,7 +233,7 @@ movie_filename and animate it with:
215233
216234
217235
Reading a Full File
218-
-------------------
236+
~~~~~~~~~~~~~~~~~~~
219237
This example reads in the mass and stiffness matrices associated with
220238
the above example.
221239
@@ -277,6 +295,7 @@ you will need to install your own C++ compiler. We recommend:
277295
278296
To get the package up and running.
279297
298+
280299
License and Acknowledgments
281300
---------------------------
282301
The ``ansys-mapdl-reader`` module is licensed under the MIT license.

setup.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -109,19 +109,6 @@ def compiler_name():
109109
'Please check the version of Python installed at\n'
110110
'%s' % sys.executable)
111111

112-
113-
if sys.version_info.minor == 10 and is64:
114-
# use pip to check if vtk is available or installed
115-
sys_name = platform.system()
116-
if sys_name == 'Linux':
117-
install_requires.append(
118-
'vtk @ https://github.com/pyvista/pyvista-wheels/raw/main/vtk-9.1.0.dev0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
119-
)
120-
elif sys_name == 'Windows':
121-
install_requires.append(
122-
'vtk @ https://github.com/pyvista/pyvista-wheels/raw/main/vtk-9.1.0.dev0-cp310-cp310-win_amd64.whl',
123-
)
124-
125112
setup(
126113
name='ansys-mapdl-reader',
127114
packages=['ansys.mapdl.reader', 'ansys.mapdl.reader.examples'],

0 commit comments

Comments
 (0)