Skip to content

Commit bfd2a23

Browse files
committed
Merge branch 'main' into release/0.1
2 parents fb283b3 + 4ceaacc commit bfd2a23

File tree

17 files changed

+356
-121
lines changed

17 files changed

+356
-121
lines changed

.github/labeler.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ Documentation:
22
- doc/source/**/*
33
Maintenance:
44
- .github/**/*
5+
- codecov.yml
56
- .flake8
7+
- .coveragerc
68
- doc/styles/**/*
79
- pyproject.toml
810
Dependencies:

.github/workflows/ci_cd.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
MAIN_PYTHON_VERSION: '3.9'
1515
PACKAGE_NAME: 'ansys-math-core'
1616
PACKAGE_NAMESPACE: 'ansys.math.core'
17-
DOCKER_PACKAGE: ghcr.io/pyansys/pymapdl/mapdl
17+
DOCKER_PACKAGE: ghcr.io/ansys/pymapdl/mapdl
1818
DOCKER_IMAGE_VERSION_DOCS_BUILD: v22.2.0
1919
DOCUMENTATION_CNAME: 'math.docs.pyansys.com'
2020
PYMAPDL_START_INSTANCE: FALSE
@@ -36,7 +36,7 @@ jobs:
3636
runs-on: ubuntu-latest
3737
steps:
3838
- name: PyAnsys code style checks
39-
uses: pyansys/actions/code-style@v4
39+
uses: ansys/actions/code-style@v4
4040
with:
4141
python-version: ${{ env.MAIN_PYTHON_VERSION }}
4242

@@ -46,7 +46,7 @@ jobs:
4646
runs-on: ubuntu-latest
4747
steps:
4848
- name: PyAnsys documentation style checks
49-
uses: pyansys/actions/doc-style@v4
49+
uses: ansys/actions/doc-style@v4
5050
with:
5151
token: ${{ secrets.GITHUB_TOKEN }}
5252

@@ -59,7 +59,7 @@ jobs:
5959
fail-fast: false
6060
matrix:
6161
os: [ubuntu-latest, windows-latest, macos-latest]
62-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
62+
python-version: ['3.8', '3.9', '3.10', '3.11']
6363
# Only perform wheelhouse builds for Windows and macOS when releasing
6464
should-release:
6565
- ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags') }}
@@ -70,7 +70,7 @@ jobs:
7070
os: windows-latest
7171
steps:
7272
- name: Build wheelhouse and perform smoke test
73-
uses: pyansys/actions/build-wheelhouse@v4
73+
uses: ansys/actions/build-wheelhouse@v4
7474
with:
7575
library-name: ${{ env.PACKAGE_NAME }}
7676
library-namespace: ${{ env.PACKAGE_NAMESPACE }}
@@ -112,7 +112,7 @@ jobs:
112112
python -m pip install ansys-mapdl-core
113113
114114
- name: "Login in Github container registry"
115-
uses: docker/login-action@v2.1.0
115+
uses: docker/login-action@v2.2.0
116116
with:
117117
registry: ghcr.io
118118
username: ${{ secrets.GH_USERNAME }}
@@ -233,7 +233,7 @@ jobs:
233233

234234
- name: "Install OS packages"
235235
run: |
236-
sudo apt update
236+
sudo apt update
237237
sudo apt install pandoc
238238
239239
- name: "Cache pip"
@@ -249,7 +249,7 @@ jobs:
249249
pip install .
250250
251251
- name: "Login in Github container registry"
252-
uses: docker/login-action@v2.1.0
252+
uses: docker/login-action@v2.2.0
253253
with:
254254
registry: ghcr.io
255255
username: ${{ secrets.GH_USERNAME }}
@@ -297,11 +297,11 @@ jobs:
297297
# If DPF server is needed, uncomment
298298
# - name: "DPF server activation"
299299
# run: |
300-
# docker pull ghcr.io/pyansys/dpf-core:22.2dev
301-
# docker run -d --name dpfserver -p ${{ env.DPF_PORT }}:50052 ghcr.io/pyansys/dpf-core:22.2dev && echo "DPF Server active on port ${{ env.DPF_PORT }}."
300+
# docker pull ghcr.io/ansys/dpf-core:22.2dev
301+
# docker run -d --name dpfserver -p ${{ env.DPF_PORT }}:50052 ghcr.io/ansys/dpf-core:22.2dev && echo "DPF Server active on port ${{ env.DPF_PORT }}."
302302

303303
- name: "Run Ansys documentation building action"
304-
uses: pyansys/actions/doc-build@v4
304+
uses: ansys/actions/doc-build@v4
305305
with:
306306
python-version: ${{ env.MAIN_PYTHON_VERSION }}
307307
checkout: false
@@ -316,7 +316,7 @@ jobs:
316316
runs-on: ubuntu-latest
317317
steps:
318318
- name: Build library source and wheel artifacts
319-
uses: pyansys/actions/build-library@v4
319+
uses: ansys/actions/build-library@v4
320320
with:
321321
library-name: ${{ env.PACKAGE_NAME }}
322322
python-version: ${{ env.MAIN_PYTHON_VERSION }}
@@ -330,7 +330,7 @@ jobs:
330330
needs: [package]
331331
steps:
332332
- name: "Deploy the latest documentation"
333-
uses: pyansys/actions/doc-deploy-dev@v4
333+
uses: ansys/actions/doc-deploy-dev@v4
334334
with:
335335
cname: ${{ env.DOCUMENTATION_CNAME }}
336336
token: ${{ secrets.GITHUB_TOKEN }}
@@ -344,14 +344,14 @@ jobs:
344344
steps:
345345

346346
- name: "Release to the public PyPI repository"
347-
uses: pyansys/actions/release-pypi-public@v4
347+
uses: ansys/actions/release-pypi-public@v4
348348
with:
349349
library-name: ${{ env.PACKAGE_NAME }}
350350
twine-username: "__token__"
351351
twine-token: ${{ secrets.PYPI_TOKEN }}
352352

353353
- name: "Release to GitHub"
354-
uses: pyansys/actions/release-github@v4
354+
uses: ansys/actions/release-github@v4
355355
with:
356356
library-name: ${{ env.PACKAGE_NAME }}
357357

@@ -364,7 +364,7 @@ jobs:
364364
needs: [release]
365365
steps:
366366
- name: "Deploy the stable documentation"
367-
uses: pyansys/actions/doc-deploy-stable@v4
367+
uses: ansys/actions/doc-deploy-stable@v4
368368
with:
369369
cname: ${{ env.DOCUMENTATION_CNAME }}
370370
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/label.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ jobs:
7979
issue-number: ${{ github.event.pull_request.number }}
8080
body: |
8181
Please add one of the following labels to add this contribution to the Release Notes :point_down:
82-
- [bug](https://github.com/pyansys/pyansys-math/pulls?q=label%3Abug+)
83-
- [documentation](https://github.com/pyansys/pyansys-math/pulls?q=label%3Adocumentation+)
84-
- [enhancement](https://github.com/pyansys/pyansys-math/pulls?q=label%3Aenhancement+)
85-
- [good first issue](https://github.com/pyansys/pyansys-math/pulls?q=label%3Agood+first+issue)
86-
- [maintenance](https://github.com/pyansys/pyansys-math/pulls?q=label%3Amaintenance+)
87-
- [release](https://github.com/pyansys/pyansys-math/pulls?q=label%3Arelease+)
82+
- [bug](https://github.com/ansys/pyansys-math/pulls?q=label%3Abug+)
83+
- [documentation](https://github.com/ansys/pyansys-math/pulls?q=label%3Adocumentation+)
84+
- [enhancement](https://github.com/ansys/pyansys-math/pulls?q=label%3Aenhancement+)
85+
- [good first issue](https://github.com/ansys/pyansys-math/pulls?q=label%3Agood+first+issue)
86+
- [maintenance](https://github.com/ansys/pyansys-math/pulls?q=label%3Amaintenance+)
87+
- [release](https://github.com/ansys/pyansys-math/pulls?q=label%3Arelease+)

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ repos:
5454
- repo: https://github.com/python-jsonschema/check-jsonschema
5555
rev: 0.22.0
5656
hooks:
57-
- id: check-github-workflows
57+
- id: check-github-workflows

README.rst

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ PyAnsys Math
1010
.. |pypi| image:: https://img.shields.io/pypi/v/ansys-math-core.svg?logo=python&logoColor=white
1111
:target: https://pypi.org/project/ansys-math-core/
1212

13-
.. |codecov| image:: https://codecov.io/gh/pyansys/pyansys-math/branch/main/graph/badge.svg
14-
:target: https://codecov.io/gh/pyansys/pyansys-math
13+
.. |codecov| image:: https://codecov.io/gh/ansys/pyansys-math/branch/main/graph/badge.svg
14+
:target: https://codecov.io/gh/ansys/pyansys-math
1515

16-
.. |GH-CI| image:: https://github.com/pyansys/pyansys-math/actions/workflows/ci_cd.yml/badge.svg
17-
:target: https://github.com/pyansys/pyansys-math/actions/workflows/ci_cd.yml
16+
.. |GH-CI| image:: https://github.com/ansys/pyansys-math/actions/workflows/ci_cd.yml/badge.svg
17+
:target: https://github.com/ansys/pyansys-math/actions/workflows/ci_cd.yml
1818

1919
.. |MIT| image:: https://img.shields.io/badge/License-MIT-yellow.svg
2020
:target: https://opensource.org/licenses/MIT
@@ -23,6 +23,10 @@ PyAnsys Math
2323
:target: https://github.com/psf/black
2424
:alt: black
2525

26+
.. |pre-commit| image:: https://results.pre-commit.ci/badge/github/ansys/pyansys-math/main.svg
27+
:target: https://results.pre-commit.ci/latest/github/ansys/pyansys-math/main
28+
:alt: pre-commit.ci status
29+
2630

2731
PyAnsys Math is a Python repository holding Ansys mathematical libraries.
2832
To use them, you must have a local installation of Ansys Mechanical APDL.
@@ -37,13 +41,8 @@ Installation
3741

3842
For users
3943
~~~~~~~~~
40-
The ``ansys.math.core`` package currently supports Python 3.7 through
41-
Python 3.10 on Windows, Mac OS, and Linux.
42-
43-
.. warning::
44-
45-
``ansys.math.core`` will no longer support Python 3.7 by June 2023.
46-
44+
The ``ansys.math.core`` package currently supports Python 3.8 through
45+
Python 3.11 on Windows, Mac OS, and Linux.
4746

4847
Install the latest package for use with this command:
4948

@@ -52,12 +51,12 @@ Install the latest package for use with this command:
5251
pip install ansys-math-core
5352
5453
Alternatively, install the latest
55-
`PyAnsys Math GitHub <https://github.com/pyansys/pyansys-math.git>`_ package
54+
`PyAnsys Math GitHub <https://github.com/ansys/pyansys-math.git>`_ package
5655
with this command:
5756

5857
.. code::
5958
60-
pip install git+https://github.com/pyansys/pyansys-math.git
59+
pip install git+https://github.com/ansys/pyansys-math.git
6160
6261
6362
@@ -67,7 +66,7 @@ For a local *development* version, install the latest package with:
6766

6867
.. code::
6968
70-
git clone https://github.com/pyansys/pyansys-math.git
69+
git clone https://github.com/ansys/pyansys-math.git
7170
cd pyansys-math
7271
pip install -e .
7372

doc/source/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
# specify the location of your github repo
5353
html_theme_options = {
54-
"github_url": "https://github.com/pyansys/pyansys-math",
54+
"github_url": "https://github.com/ansys/pyansys-math",
5555
"check_switcher": False,
5656
"show_prev_next": False,
5757
"show_breadcrumbs": True,
@@ -63,7 +63,7 @@
6363
"icon_links": [
6464
{
6565
"name": "Support",
66-
"url": "https://github.com/pyansys/pyansys-math/discussions",
66+
"url": "https://github.com/ansys/pyansys-math/discussions",
6767
"icon": "fa fa-comment fa-fw",
6868
},
6969
],
@@ -85,9 +85,9 @@
8585
extensions = [
8686
"jupyter_sphinx",
8787
"notfound.extension", # for the not found page.
88+
"numpydoc",
8889
"sphinx.ext.autodoc",
8990
"sphinx.ext.autosummary",
90-
"numpydoc",
9191
"sphinx.ext.coverage",
9292
"sphinx.ext.intersphinx",
9393
"sphinx_copybutton",

doc/source/contributing/index.rst

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Clone the repository
1515

1616
Run this code to clone and install the latest version of PyAnsys Math in development mode::
1717

18-
git clone https://github.com/pyansys/pyansys-math
18+
git clone https://github.com/ansys/pyansys-math
1919
cd pyansys-math
2020
python -m pip install --upgrade pip
2121
pip install -e .
@@ -32,7 +32,7 @@ templates:
3232

3333
If your issue does not fit into one of these categories, create your own issue.
3434

35-
To reach the PyAnsys support team, email `pyansys.core@ansys.com <pyansys.core@ansys.com>`_.
35+
To reach the project support team, email `pyansys.core@ansys.com <pyansys.core@ansys.com>`_.
3636

3737

3838
Build documentation
@@ -46,11 +46,9 @@ To build the PyAnsys Math documentation locally, in the root directory of the re
4646
Documentation for the latest stable release of PyAnsys Math is hosted at
4747
`PyAnsys Math Documentation <pymath_docs_>`_.
4848

49-
Documentation for the latest development version, which tracks the
50-
``main`` branch, is hosted at
51-
`Development PyAnsys Math Documentation <pymath_dev_docs_>`_.
52-
This version is automatically kept up to date via GitHub actions.
53-
49+
In the upper right corner of the documentation’s title bar, there is an option for
50+
switching from viewing the documentation for the latest stable release to viewing
51+
the documentation for the development version or previously released versions.
5452

5553
Adhere to code style
5654
--------------------

doc/source/links.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
.. #PyAnsys Math related
55
.. _pymath_docs: https://math.docs.pyansys.com/
66
.. _pymath_dev_docs: https://math.docs.pyansys.com/dev/
7-
.. _pymath_issues: https://github.com/pyansys/pyansys-math/issues
8-
.. _pymath_github: https://github.com/pyansys/pyansys-math.git
7+
.. _pymath_issues: https://github.com/ansys/pyansys-math/issues
8+
.. _pymath_github: https://github.com/ansys/pyansys-math.git
99

1010
.. #MAPDL related
1111
.. _mapdl_tech_show: https://ansyshelp.ansys.com/account/secured?returnurl=/Views/Secured/corp/v222/en/wb_wbtec/wb_wbtec.html
@@ -15,7 +15,7 @@
1515
.. _grpc: https://grpc.io/
1616
.. _numpy_docs: https://numpy.org/doc/stable/
1717
.. _precommit: https://pre-commit.com/
18-
.. _scipy_docs: https://docs.scipy.org/doc/scipy/reference/
18+
.. _scipy_docs: https://docs.scipy.org/doc/scipy/
1919

2020
.. #Other projects
2121
.. _dpf_post_docs: https://post.docs.pyansys.com/
@@ -42,5 +42,5 @@
4242

4343
.. #PyMAPDL related
4444
.. _pymapdl_docs: https://mapdl.docs.pyansys.com
45-
.. _pymapdl_github: https://github.com/pyansys/pymapdl
45+
.. _pymapdl_github: https://github.com/ansys/pymapdl
4646
.. _pymapdl_examples: https://mapdl.docs.pyansys.com/dev/examples/index.html

doc/styles/Vocab/ANSYS/accept.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ Eigenshape
1717
eigenshapes
1818
eigensolvers
1919
MAPDL
20-
Mapdl
2120
mapdl
2221
my_mat
2322
nax

examples/eigen_solve.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
# get the stiff (``k``) and mass (``m``) matrices from the FULL file.
3232

3333
out = mm._mapdl.input(vmfiles["vm153"])
34-
35-
k = mm.stiff(fname="PRSMEMB.full")
36-
m = mm.mass(fname="PRSMEMB.full")
34+
fullfile = mm._mapdl.jobname + ".full"
35+
k = mm.stiff(fname=fullfile)
36+
m = mm.mass(fname=fullfile)
3737

3838

3939
###############################################################################

0 commit comments

Comments
 (0)