Skip to content

Commit 3645936

Browse files
germa89germa89
committed
Merge branch 'main' into release/0.62
2 parents eba1898 + 428d05d commit 3645936

File tree

118 files changed

+7492
-881
lines changed

Some content is hidden

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

118 files changed

+7492
-881
lines changed

‎.ci/start_mapdl.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/bash
2-
echo $GH_PAT | docker login -u $GH_USERNAME --password-stdin docker.pkg.github.com
32
docker pull $MAPDL_IMAGE
43
docker run -e ANSYSLMD_LICENSE_FILE=1055@$LICENSE_SERVER --restart always --name mapdl -p $PYMAPDL_PORT:50052 -p $PYMAPDL_DB_PORT:50055 $MAPDL_IMAGE -smp > log.txt &
54
grep -q 'Server listening on' <(timeout 60 tail -f log.txt)

‎.github/ISSUE_TEMPLATE/bug.yml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
name: 🐞 Bug, problem, error
2+
description: Fill a bug report here
3+
title: "Bug located in ..."
4+
labels: ["bug"]
5+
assignees: [""]
6+
7+
body:
8+
9+
- type: markdown
10+
attributes:
11+
value: '# 🐞 **Problem**'
12+
13+
- type: checkboxes
14+
id: new-bug
15+
attributes:
16+
label: Before submitting the issue
17+
description: Please, make sure the following conditions are met
18+
options:
19+
- label: I have searched among the existing issues
20+
required: true
21+
- label: I am using a Python virtual environment
22+
required: true
23+
24+
- type: textarea
25+
id: bug-description
26+
attributes:
27+
label: Description of the bug
28+
placeholder: Describe what bug you encountered and what should have happened
29+
validations:
30+
required: true
31+
32+
- type: textarea
33+
id: steps-to-reproduce
34+
attributes:
35+
label: Steps To Reproduce
36+
placeholder: Please write the steps in a list form
37+
validations:
38+
required: true
39+
40+
- type: markdown
41+
attributes:
42+
value: '# 🖥️ **System Information**'
43+
44+
- type: dropdown
45+
id: os-name
46+
attributes:
47+
label: Which Operating System are you using?
48+
multiple: false
49+
options:
50+
- 'Windows'
51+
- 'MacOS'
52+
- 'Linux'
53+
validations:
54+
required: true
55+
56+
- type: dropdown
57+
id: python-version
58+
attributes:
59+
label: Which Python version are you using?
60+
description: Run `python --version` to verify your Python version
61+
multiple: false
62+
options:
63+
- '3.7'
64+
- '3.8'
65+
- '3.9'
66+
- '3.10'
67+
validations:
68+
required: true
69+
70+
- type: textarea
71+
id: installed-packages
72+
attributes:
73+
label: Installed packages
74+
description: Run `python -m pip freeze` to list installed packages
75+
placeholder: Paste the output of `python -m pip freeze` here
76+
validations:
77+
required: true

‎.github/ISSUE_TEMPLATE/feature.yml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: 💡 New feature
2+
description: Enhancements to the code
3+
title: "Add ..."
4+
labels: ["enhancement"]
5+
assignees: [""]
6+
7+
body:
8+
9+
- type: markdown
10+
attributes:
11+
value: '# 📝 **New Feature**'
12+
13+
- type: textarea
14+
id: feature-description
15+
attributes:
16+
label: Description of the feature
17+
placeholder: Describe what feature you devised and why it is useful for the project
18+
validations:
19+
required: true
20+
21+
- type: markdown
22+
attributes:
23+
value: '# 💡 **Implementation**'
24+
25+
- type: textarea
26+
id: implementation-description
27+
attributes:
28+
label: Steps for implementing the feature
29+
placeholder: Describe how this new feature can be implemented
30+
validations:
31+
required: true
32+
33+
- type: markdown
34+
attributes:
35+
value: '# 🔗 **References**'
36+
37+
- type: textarea
38+
id: references
39+
attributes:
40+
label: Useful links and references
41+
placeholder: A list of links and references to help when implementing the feature
42+
validations:
43+
required: false

‎.github/dependabot.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ updates:
66
schedule:
77
interval: "daily"
88
labels:
9-
- "maintenance"
10-
- "dependencies"
9+
- "Maintenance"
10+
- "Dependencies"
1111
ignore:
1212
- dependency-name: "vtk"
13-
- dependency-name: "ansys-mapdl-reader"
1413
- dependency-name: "grpcio"

‎.github/labeler.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Documentation:
2+
- doc/source/**/*
3+
- examples/**/*
4+
Maintenance:
5+
- .github/**/*
6+
- codecov.yml
7+
- .flake8
8+
- .coveragerc
9+
- ignore_words.txt
10+
- pyproject.toml
11+
Dependencies:
12+
- requirements*
13+
- pyproject.toml
14+
- requirements/*
15+
CI/CD:
16+
- docker/**/*
17+
- .github/**/*
18+
- .ci/**/*

‎.github/release.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
changelog:
2+
categories:
3+
- title: New Features
4+
labels:
5+
- Enhancement
6+
- NEW FEATURE
7+
- title: Bug fixes or behavior changes
8+
labels:
9+
- BUG
10+
- BLOCKER
11+
- title: Documentation
12+
labels:
13+
- Documentation
14+
- Examples
15+
- title: Maintenance
16+
labels:
17+
- Maintenance
18+
- Dependencies
19+
- title: MAPDL and/or API related
20+
labels:
21+
- MAPDL

‎.github/stale.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 60
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 14
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- Future
8+
- MAPDL
9+
# Label to use when marking an issue as stale
10+
staleLabel:
11+
- Stale
12+
# Comment to post when marking an issue as stale. Set to `false` to disable
13+
markComment: >
14+
This issue has been automatically marked as stale because it has not had
15+
recent activity. It will be closed if no further activity occurs. Thank you
16+
for your contributions.
17+
# Comment to post when closing a stale issue. Set to `false` to disable
18+
closeComment: >
19+
Closed due to inactivity. Feel free to reopen if there is new information
20+
or interest.
21+
Thank you!

‎.github/workflows/ci.yml‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
PYMAPDL_DB_PORT: 21001 # default won't work on GitHub runners
1515
PYMAPDL_START_INSTANCE: FALSE
1616
PYANSYS_OFF_SCREEN: True
17-
DOCKER_PACKAGE: docker.pkg.github.com/pyansys/pymapdl/mapdl
17+
DOCKER_PACKAGE: ghcr.io/pyansys/pymapdl/mapdl
1818
DOCKER_IMAGE_VERSION_DOCS_BUILD: v21.2.1
1919
# Following env vars when changed will "reset" the mentioned cache,
2020
# by changing the cache file name. It is rendered as ...-v%RESET_XXX%-...
@@ -64,18 +64,18 @@ jobs:
6464
if: ${{ runner.os == 'Linux' }}
6565
with:
6666
path: ~/.cache/pip
67-
key: Python-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('setup.py') }}-${{ hashFiles('requirements/requirements_tests.txt') }}
67+
key: Python-v${{ env.RESET_PIP_CACHE }}-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('setup.py') }}-${{ hashFiles('requirements/requirements_tests.txt') }}
6868
restore-keys: |
69-
Python-${{ runner.os }}-${{ matrix.python-version }}
69+
Python-v${{ env.RESET_PIP_CACHE }}-${{ runner.os }}-${{ matrix.python-version }}
7070
7171
- name: Window pip cache
7272
uses: actions/cache@v2
7373
if: ${{ runner.os == 'Windows' }}
7474
with:
7575
path: ~\AppData\Local\pip\Cache
76-
key: Python-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('setup.py') }}-${{ hashFiles('requirements/requirements_tests*.txt') }}
76+
key: Python-v${{ env.RESET_PIP_CACHE }}-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('setup.py') }}-${{ hashFiles('requirements/requirements_tests*.txt') }}
7777
restore-keys: |
78-
Python-${{ runner.os }}-${{ matrix.python-version }}
78+
Python-v${{ env.RESET_PIP_CACHE }}-${{ runner.os }}-${{ matrix.python-version }}
7979
8080
- name: Install PyMAPDL
8181
run: pip install .
@@ -136,9 +136,9 @@ jobs:
136136
uses: actions/cache@v2
137137
with:
138138
path: ~/.cache/pip
139-
key: Python-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('setup.py') }}-${{ hashFiles('requirements/requirements_docs*.txt') }}
139+
key: Python-v${{ env.RESET_PIP_CACHE }}-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('setup.py') }}-${{ hashFiles('requirements/requirements_docs*.txt') }}
140140
restore-keys: |
141-
Python-${{ runner.os }}-${{ matrix.python-version }}
141+
Python-v${{ env.RESET_PIP_CACHE }}-${{ runner.os }}-${{ matrix.python-version }}
142142
143143
- name: Test virtual framebuffer
144144
run: |
@@ -152,12 +152,17 @@ jobs:
152152
pip install dist/ansys*.whl
153153
xvfb-run python -c "from ansys.mapdl import core as pymapdl; print(pymapdl.Report())"
154154
155+
- name: Login in Github Container registry
156+
uses: docker/login-action@v1
157+
with:
158+
registry: ghcr.io
159+
username: ${{ secrets.GH_USERNAME }}
160+
password: ${{ secrets.GITHUB_TOKEN }}
161+
155162
- name: Pull, launch, and validate MAPDL service
156163
run: .ci/start_mapdl.sh
157164
env:
158165
LICENSE_SERVER: ${{ secrets.LICENSE_SERVER }}
159-
GH_USERNAME: ${{ secrets.GH_USERNAME }}
160-
GH_PAT: ${{ secrets.REPO_DOWNLOAD_PAT }}
161166
MAPDL_IMAGE: '${{ env.DOCKER_PACKAGE }}:${{ env.DOCKER_IMAGE_VERSION_DOCS_BUILD }}'
162167

163168
- name: Retrieve PyMAPDL version
@@ -170,25 +175,25 @@ jobs:
170175
uses: actions/cache@v2
171176
with:
172177
path: doc/source/examples
173-
key: Examples-${{ steps.version.outputs.PYMAPDL_VERSION }}-${{ github.sha }}
178+
key: Examples-v${{ env.RESET_EXAMPLES_CACHE }}-${{ steps.version.outputs.PYMAPDL_VERSION }}-${{ github.sha }}
174179
restore-keys: |
175-
Examples-${{ steps.version.outputs.PYMAPDL_VERSION }}
180+
Examples-v${{ env.RESET_EXAMPLES_CACHE }}-${{ steps.version.outputs.PYMAPDL_VERSION }}
176181
177182
- name: Cache docs build directory
178183
uses: actions/cache@v2
179184
with:
180185
path: doc/build
181-
key: doc-build-${{ steps.version.outputs.PYMAPDL_VERSION }}-${{ github.sha }}
186+
key: doc-build-v${{ env.RESET_DOC_BUILD_CACHE }}-${{ steps.version.outputs.PYMAPDL_VERSION }}-${{ github.sha }}
182187
restore-keys: |
183-
doc-build-${{ steps.version.outputs.PYMAPDL_VERSION }}
188+
doc-build-v${{ env.RESET_DOC_BUILD_CACHE }}-${{ steps.version.outputs.PYMAPDL_VERSION }}
184189
185190
- name: Cache autosummary
186191
uses: actions/cache@v2
187192
with:
188193
path: doc/source/**/_autosummary/*.rst
189-
key: autosummary-rst-${{ steps.version.outputs.PYMAPDL_VERSION }}-${{ github.sha }}
194+
key: autosummary-v${{ env.RESET_AUTOSUMMARY_CACHE }}-${{ steps.version.outputs.PYMAPDL_VERSION }}-${{ github.sha }}
190195
restore-keys: |
191-
autosummary-rst-${{ steps.version.outputs.PYMAPDL_VERSION }}
196+
autosummary-v${{ env.RESET_AUTOSUMMARY_CACHE }}-${{ steps.version.outputs.PYMAPDL_VERSION }}
192197
193198
- name: Install Docs Build Requirements
194199
run: |
@@ -237,7 +242,7 @@ jobs:
237242
runs-on: ubuntu-latest
238243
strategy:
239244
matrix:
240-
mapdl-version: ['v21.1.1', 'v21.2.1']
245+
mapdl-version: ['v21.1.1', 'v21.2.1', 'v22.1.0']
241246

242247
steps:
243248
- uses: actions/checkout@v2
@@ -256,9 +261,9 @@ jobs:
256261
uses: actions/cache@v2
257262
with:
258263
path: ~/.cache/pip
259-
key: Python-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('setup.py') }}-${{ hashFiles('requirements/requirements_tests.txt') }}
264+
key: Python-v${{ env.RESET_PIP_CACHE }}-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('setup.py') }}-${{ hashFiles('requirements/requirements_tests.txt') }}
260265
restore-keys: |
261-
Python-${{ runner.os }}-${{ matrix.python-version }}
266+
Python-v${{ env.RESET_PIP_CACHE }}-${{ runner.os }}-${{ matrix.python-version }}
262267
263268
- name: Test virtual framebuffer
264269
run: |
@@ -272,12 +277,17 @@ jobs:
272277
pip install dist/*.whl
273278
xvfb-run python -c "from ansys.mapdl import core as pymapdl; print(pymapdl.Report())"
274279
280+
- name: Login in Github Container registry
281+
uses: docker/login-action@v1
282+
with:
283+
registry: ghcr.io
284+
username: ${{ secrets.GH_USERNAME }}
285+
password: ${{ secrets.GITHUB_TOKEN }}
286+
275287
- name: Pull, launch, and validate MAPDL service
276288
run: .ci/start_mapdl.sh
277289
env:
278290
LICENSE_SERVER: ${{ secrets.LICENSE_SERVER }}
279-
GH_USERNAME: ${{ secrets.GH_USERNAME }}
280-
GH_PAT: ${{ secrets.REPO_DOWNLOAD_PAT }}
281291
MAPDL_IMAGE: ${{ env.DOCKER_PACKAGE }}:${{ matrix.mapdl-version }}
282292

283293
- name: Unit Testing

0 commit comments

Comments
 (0)