Skip to content

Commit bedd07b

Browse files
committed
Merge branch 'main' into release/0.60
2 parents f43b520 + 9f9128f commit bedd07b

File tree

128 files changed

+8106
-2258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+8106
-2258
lines changed

.coveragerc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[run]
2+
omit =
3+
# omit commands
4+
ansys/mapdl/core/_commands/*
5+
6+
# ignore legacy interfaces
7+
ansys/mapdl/core/mapdl_console.py
8+
ansys/mapdl/core/mapdl_corba.py
9+
ansys/mapdl/core/jupyter.py

.github/dependabot.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "pip" # See documentation for possible values
4+
directory: "/" # Location of package manifests
5+
insecure-external-code-execution: allow
6+
schedule:
7+
interval: "daily"
8+
labels:
9+
- "maintenance"
10+
- "dependencies"
11+
ignore:
12+
- dependency-name: "vtk"
13+
- dependency-name: "ansys-mapdl-reader"
14+
- dependency-name: "grpcio"

.github/workflows/ci.yml

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
strategy:
4545
matrix:
4646
os: [windows-latest, ubuntu-latest]
47-
python-version: ['3.6', '3.7', '3.8', '3.9']
47+
python-version: ['3.7', '3.8', '3.9']
4848

4949
steps:
5050
- uses: actions/checkout@v2
@@ -90,6 +90,7 @@ jobs:
9090

9191
# used for documentation deployment
9292
- name: Get Bot Application Token
93+
if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
9394
id: get_workflow_token
9495
uses: peter-murray/workflow-application-token-action@v1
9596
with:
@@ -156,23 +157,6 @@ jobs:
156157
path: doc/build/html/PyMAPDL_documentation.zip
157158
retention-days: 7
158159

159-
- name: Build PDF Documentation
160-
working-directory: doc
161-
run: |
162-
# Overwrite MAPDL commands section so it doesn't show up
163-
make latex
164-
python validate_png.py # clean-up GIFs mislabeled as PNG
165-
cd build/latex
166-
latexmk -r latexmkrc -pdf *.tex -interaction=nonstopmode || true
167-
(test -f *.pdf && echo pdf exists) || exit 1
168-
169-
- name: Upload PDF Documentation
170-
uses: actions/upload-artifact@v2
171-
with:
172-
name: PDF-Documentation
173-
path: doc/build/latex/pymapdl*.pdf
174-
retention-days: 7
175-
176160
- name: Deploy
177161
if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
178162
uses: JamesIves/[email protected]
@@ -183,6 +167,17 @@ jobs:
183167
FOLDER: doc/build/html
184168
CLEAN: true
185169

170+
- name: Build PDF Documentation
171+
working-directory: doc
172+
run: make pdf
173+
174+
- name: Upload PDF Documentation
175+
uses: actions/upload-artifact@v2
176+
with:
177+
name: PDF-Documentation
178+
path: doc/build/latex/pymapdl*.pdf
179+
retention-days: 7
180+
186181
build_test:
187182
name: Build and Unit Testing
188183
needs: testimport
@@ -220,8 +215,9 @@ jobs:
220215
- name: Install ansys-mapdl-core
221216
run: |
222217
pip install -r requirements_build.txt
218+
python setup.py sdist
223219
python setup.py bdist_wheel
224-
pip install dist/ansys*.whl
220+
pip install dist/*.whl
225221
cd tests # run from test directory to test installed module
226222
xvfb-run python -c "from ansys.mapdl import core as pymapdl; print(pymapdl.Report())"
227223
@@ -236,13 +232,21 @@ jobs:
236232
- name: Unit Testing
237233
run: |
238234
pip install -r requirements_test.txt
239-
pip install pytest-azurepipelines
240-
xvfb-run pytest -v --junitxml=junit/test-results.xml --cov --cov-report=xml --cov-report=html
235+
xvfb-run pytest -v --cov=ansys.mapdl.core --cov-report=xml --cov-report=html
241236
242-
- name: Upload wheel
237+
- uses: codecov/codecov-action@v2
238+
if: matrix.mapdl-version == 'v21.2.1'
239+
name: 'Upload coverage to Codecov'
240+
241+
- name: Check package
242+
run: |
243+
pip install twine
244+
twine check dist/*
245+
246+
- name: Upload wheel and binaries
243247
uses: actions/upload-artifact@v2
244248
with:
245-
name: PyMAPDL-wheel
249+
name: PyMAPDL-packages
246250
path: dist/
247251
retention-days: 7
248252

@@ -269,6 +273,7 @@ jobs:
269273
run: |
270274
pip install twine
271275
twine upload --skip-existing ./**/*.whl
276+
twine upload --skip-existing ./**/*.tar.gz
272277
env:
273278
TWINE_USERNAME: __token__
274279
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
@@ -278,4 +283,17 @@ jobs:
278283
with:
279284
files: |
280285
./**/*.whl
286+
./**/*.tar.gz
281287
./**/*.pdf
288+
289+
- name: Notify if fail
290+
uses: skitionek/notify-microsoft-teams@master
291+
if: ${{ failure() }}
292+
with:
293+
webhook_url: ${{ secrets.TEAM_HOOK }}
294+
needs: ${{ toJson(needs) }}
295+
job: ${{ toJson(job) }}
296+
steps: ${{ toJson(steps) }}
297+
overwrite: "{
298+
title: `Release FAILED!`,
299+
}"

.github/workflows/nightly-doc-build.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,15 @@ jobs:
6969
BRANCH: gh-pages
7070
FOLDER: doc/build/html
7171
CLEAN: true
72+
73+
- name: Notify if fail
74+
uses: skitionek/notify-microsoft-teams@master
75+
if: ${{ failure() }}
76+
with:
77+
webhook_url: ${{ secrets.TEAM_HOOK }}
78+
needs: ${{ toJson(needs) }}
79+
job: ${{ toJson(job) }}
80+
steps: ${{ toJson(steps) }}
81+
overwrite: "{
82+
title: `${workflow} failed.`,
83+
}"

.github/workflows/nightly-mapdl-check.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
name: GitHub Actions
1+
name: Nightly MAPDL check
22

33
on:
4-
push:
5-
pull_request:
64
workflow_dispatch:
75
schedule: # UTC at 0400
86
- cron: '0 4 * * *'
@@ -53,10 +51,21 @@ jobs:
5351
- name: Unit Testing
5452
run: |
5553
pip install -r requirements_test.txt
56-
pip install pytest-azurepipelines
57-
xvfb-run pytest -v --junitxml=junit/test-results.xml --cov --cov-report=xml --cov-report=html
54+
xvfb-run pytest -v --cov=ansys.mapdl.core --cov-report=xml --cov-report=html
5855
5956
- name: Display MAPDL Logs
6057
if: always()
6158
run: cat log.txt
6259

60+
- name: Notify if fail
61+
uses: skitionek/notify-microsoft-teams@master
62+
if: ${{ failure() }}
63+
with:
64+
webhook_url: ${{ secrets.TEAM_HOOK }}
65+
needs: ${{ toJson(needs) }}
66+
job: ${{ toJson(job) }}
67+
steps: ${{ toJson(steps) }}
68+
overwrite: "{
69+
title: `${workflow} failed.`,
70+
}"
71+

.idea/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

.idea/modules.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.idea/pymapdl.iml

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)