Skip to content

Commit addfb12

Browse files
committed
chore: Merge branch 'main' into release/0.68
2 parents d13b398 + b6a9c65 commit addfb12

Some content is hidden

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

47 files changed

+312
-378
lines changed

.github/workflows/cache_cleaner.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Check out code
13-
uses: actions/[email protected].0
13+
uses: actions/[email protected].1
1414

1515
- name: Cleanup PR caches
1616
if: github.event_name != 'workflow_dispatch'

.github/workflows/ci.yml

Lines changed: 28 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ env:
3434
MAPDL_PACKAGE: ghcr.io/ansys/mapdl
3535
ON_CI: True
3636
PYTEST_ARGUMENTS: '-vvv -ra --durations=10 --maxfail=3 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html'
37+
BUILD_CHEATSHEET: True
3738

3839
# Following env vars when changed will "reset" the mentioned cache,
3940
# by changing the cache file name. It is rendered as ...-v%RESET_XXX%-...
@@ -69,19 +70,11 @@ jobs:
6970
contents: write
7071
pull-requests: write
7172
steps:
72-
- uses: ansys/actions/doc-deploy-changelog@v7
73+
- uses: ansys/actions/doc-deploy-changelog@v8
7374
with:
7475
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
75-
76-
77-
branch-name:
78-
# Only if the event is a pull request and the branch name is not from the pre-commit-ci bot
79-
if: github.event_name == 'pull_request' && github.head_ref != 'pre-commit-ci-update-config'
80-
name: Check the name of the branch
81-
runs-on: ubuntu-latest
82-
steps:
83-
- name: Check branch name
84-
uses: ansys/actions/branch-name-style@v7
76+
bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
77+
bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }}
8578

8679

8780
pull-request-name:
@@ -90,7 +83,7 @@ jobs:
9083
runs-on: ubuntu-latest
9184
steps:
9285
- name: Check pull-request name
93-
uses: ansys/actions/commit-style@v7
86+
uses: ansys/actions/check-pr-title@v8
9487
with:
9588
token: ${{ secrets.GITHUB_TOKEN }}
9689

@@ -103,7 +96,7 @@ jobs:
10396
folder: ["doc", "examples"]
10497
steps:
10598
- name: "Ansys documentation style checks"
106-
uses: ansys/actions/doc-style@v7
99+
uses: ansys/actions/doc-style@v8
107100
with:
108101
token: ${{ secrets.GITHUB_TOKEN }}
109102
files: ${{ matrix.folder }}
@@ -129,7 +122,7 @@ jobs:
129122
os: macos-latest
130123
steps:
131124
- name: "Build wheelhouse and perform smoke test"
132-
uses: ansys/actions/build-wheelhouse@v7
125+
uses: ansys/actions/build-wheelhouse@v8
133126
with:
134127
library-name: ${{ env.PACKAGE_NAME }}
135128
operating-system: ${{ matrix.os }}
@@ -159,7 +152,7 @@ jobs:
159152
GRPC_ENABLE_FORK_SUPPORT: false # See #3434
160153
steps:
161154
- name: "Install Git and checkout project"
162-
uses: actions/[email protected].0
155+
uses: actions/[email protected].1
163156

164157
- name: "Login in Github container registry"
165158
uses: docker/[email protected]
@@ -356,7 +349,7 @@ jobs:
356349

357350
steps:
358351
- name: "Install Git and checkout project"
359-
uses: actions/[email protected].0
352+
uses: actions/[email protected].1
360353

361354
- name: Get event type and user to check permissions.
362355
id: get_user
@@ -375,6 +368,7 @@ jobs:
375368
376369
- uses: tspascoal/get-user-teams-membership@v3
377370
id: is_organization_member
371+
if: ${{ github.actor != 'dependabot[bot]' }}
378372
with:
379373
username: ${{ steps.get_user.outputs.user }}
380374
organization: ansys
@@ -384,7 +378,7 @@ jobs:
384378
- id: set-matrix
385379
env:
386380
extended_testing: ${{ github.event_name == 'schedule' || ( github.event_name == 'workflow_dispatch' && inputs.run_all_tests ) || ( github.event_name == 'push' && contains(github.ref, 'refs/tags') ) }}
387-
auth_user: ${{ steps.is_organization_member.outputs.isTeamMember == 'true' }}
381+
auth_user: ${{ steps.is_organization_member.outputs.isTeamMember == 'true' || github.actor == 'dependabot[bot]' }}
388382
run: .ci/build_matrix.sh
389383

390384
build-test-remote:
@@ -410,7 +404,7 @@ jobs:
410404

411405
steps:
412406
- name: "Install Git and checkout project"
413-
uses: actions/[email protected].0
407+
uses: actions/[email protected].1
414408

415409
- name: "Login in Github container registry"
416410
uses: docker/[email protected]
@@ -594,10 +588,11 @@ jobs:
594588
matrix: ${{ steps.set-matrix.outputs.matrix }}
595589
steps:
596590
- name: "Install Git and checkout project"
597-
uses: actions/[email protected].0
591+
uses: actions/[email protected].1
598592

599593
- uses: tspascoal/get-user-teams-membership@v3
600594
id: is_organization_member
595+
if: ${{ github.actor != 'dependabot[bot]' }}
601596
with:
602597
username: ${{ github.actor }}
603598
organization: ansys
@@ -613,7 +608,7 @@ jobs:
613608
RUN_ALL_TEST: ${{ inputs.run_all_tests }}
614609
ON_PUSH: ${{ github.event_name == 'push' }}
615610
HAS_TAG: ${{ contains(github.ref, 'refs/tags') }}
616-
auth_user: ${{ steps.is_organization_member.outputs.isTeamMember == 'true' }}
611+
auth_user: ${{ steps.is_organization_member.outputs.isTeamMember == 'true' || github.actor == 'dependabot[bot]' }}
617612
run: .ci/build_matrix.sh
618613

619614
build-test-ubuntu-local:
@@ -640,7 +635,7 @@ jobs:
640635

641636
steps:
642637
- name: "Install Git and checkout project"
643-
uses: actions/[email protected].0
638+
uses: actions/[email protected].1
644639
with:
645640
repository: ${{ github.event.pull_request.head.repo.full_name }}
646641
ref: ${{ github.event.pull_request.head.ref }}
@@ -771,7 +766,7 @@ jobs:
771766

772767
steps:
773768
- name: "Install Git and checkout project"
774-
uses: actions/[email protected].0
769+
uses: actions/[email protected].1
775770
with:
776771
repository: ${{ github.event.pull_request.head.repo.full_name }}
777772
ref: ${{ github.event.pull_request.head.ref }}
@@ -866,7 +861,7 @@ jobs:
866861
ON_LOCAL: TRUE
867862

868863
steps:
869-
- uses: actions/[email protected].0
864+
- uses: actions/[email protected].1
870865

871866
# Skipping because it is installed locally.
872867
# - name: Setup Python
@@ -934,7 +929,7 @@ jobs:
934929
runs-on: ubuntu-latest
935930
steps:
936931
- name: "Build library source and wheel artifacts"
937-
uses: ansys/actions/build-library@v7
932+
uses: ansys/actions/build-library@v8
938933
with:
939934
library-name: ${{ env.PACKAGE_NAME }}
940935
python-version: ${{ env.MAIN_PYTHON_VERSION }}
@@ -952,13 +947,13 @@ jobs:
952947
contents: write
953948
steps:
954949
- name: "Release to the public PyPI repository"
955-
uses: ansys/actions/release-pypi-public@v7
950+
uses: ansys/actions/release-pypi-public@v8
956951
with:
957952
library-name: ${{ env.PACKAGE_NAME }}
958953
use-trusted-publisher: true
959954

960955
- name: "Release to GitHub"
961-
uses: ansys/actions/release-github@v7
956+
uses: ansys/actions/release-github@v8
962957
with:
963958
library-name: ${{ env.PACKAGE_NAME }}
964959
additional-artifacts: "minimum_requirements.txt"
@@ -974,42 +969,13 @@ jobs:
974969
needs: [release]
975970
steps:
976971
- name: "Deploy the stable documentation"
977-
# TODO: testing SEO improvements. This branch avoids creating a
978-
# sitemap.xml pages in opposite to v5.
979-
uses: ansys/actions/doc-deploy-stable@feat/seo-improvements
972+
uses: ansys/actions/doc-deploy-stable@v8
980973
with:
981974
cname: ${{ env.DOCUMENTATION_CNAME }}
982975
token: ${{ secrets.GITHUB_TOKEN }}
983976
render-last: '5'
984-
985-
986-
doc-index-stable:
987-
name: "Deploy stable docs index"
988-
runs-on: ubuntu-latest
989-
needs: upload-docs-release
990-
steps:
991-
- name: "Install Git and clone project"
992-
uses: actions/[email protected]
993-
994-
- name: "Install the package requirements"
995-
run: pip install -e .
996-
997-
- name: "Get the version to PyMeilisearch"
998-
run: |
999-
VERSION=$(python -c "from ansys.mapdl.core import __version__; print('.'.join(__version__.split('.')[:2]))")
1000-
VERSION_MEILI=$(python -c "from ansys.mapdl.core import __version__; print('-'.join(__version__.split('.')[:2]))")
1001-
echo "Calculated VERSION: $VERSION"
1002-
echo "Calculated VERSION_MEILI: $VERSION_MEILI"
1003-
echo "VERSION=$VERSION" >> $GITHUB_ENV
1004-
echo "VERSION_MEILI=$VERSION_MEILI" >> $GITHUB_ENV
1005-
1006-
- name: "Deploy the latest documentation index"
1007-
uses: ansys/actions/doc-deploy-index@v7
1008-
with:
1009-
cname: ${{ env.DOCUMENTATION_CNAME }}/version/${{ env.VERSION }}
1010-
index-name: pymapdl-v${{ env.VERSION_MEILI }}
1011-
host-url: ${{ vars.MEILISEARCH_HOST_URL }}
1012-
api-key: ${{ env.MEILISEARCH_API_KEY }}
977+
bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
978+
bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }}
1013979

1014980

1015981
upload-dev-docs:
@@ -1019,25 +985,12 @@ jobs:
1019985
needs: [docs-build]
1020986
steps:
1021987
- name: "Deploy the latest documentation"
1022-
# TODO: testing SEO improvements. This branch reuses the "index.html" from the stable version
1023-
uses: ansys/actions/doc-deploy-dev@feat/seo-improvements
988+
uses: ansys/actions/doc-deploy-dev@v8
1024989
with:
1025990
cname: ${{ env.DOCUMENTATION_CNAME }}
1026991
token: ${{ secrets.GITHUB_TOKEN }}
1027-
1028-
1029-
doc-index-dev:
1030-
name: "Deploy dev index docs"
1031-
runs-on: ubuntu-latest
1032-
needs: upload-dev-docs
1033-
steps:
1034-
- name: "Deploy the latest documentation index"
1035-
uses: ansys/actions/doc-deploy-index@v7
1036-
with:
1037-
cname: ${{ env.DOCUMENTATION_CNAME }}/version/dev
1038-
index-name: pymapdl-vdev
1039-
host-url: ${{ vars.MEILISEARCH_HOST_URL }}
1040-
api-key: ${{ env.MEILISEARCH_API_KEY }}
992+
bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
993+
bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }}
1041994

1042995

1043996
notify:
@@ -1065,7 +1018,7 @@ jobs:
10651018
os: [ubuntu-latest, windows-latest]
10661019

10671020
steps:
1068-
- uses: actions/[email protected].0
1021+
- uses: actions/[email protected].1
10691022
- name: "Set up Julia"
10701023
uses: julia-actions/setup-julia@v2
10711024
with:

.github/workflows/docker_clean_untagged.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323

2424
- name: "Perform versions cleanup - except certain tags"
25-
uses: ansys/actions/hk-package-clean-untagged@v7
25+
uses: ansys/actions/hk-package-clean-untagged@v8
2626
with:
2727
package-name: 'mapdl'
2828
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/label.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: Syncer
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/[email protected].0
24+
- uses: actions/[email protected].1
2525
- uses: micnncim/action-label-syncer@v1
2626
env:
2727
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -127,6 +127,8 @@ jobs:
127127
pull-requests: write
128128
runs-on: ubuntu-latest
129129
steps:
130-
- uses: ansys/actions/doc-changelog@v7
130+
- uses: ansys/actions/doc-changelog@v8
131131
with:
132+
bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
133+
bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }}
132134
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}

.github/workflows/linkchecker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
SHELLOPTS: "errexit:pipefail"
3232
steps:
3333
- name: "Install Git and checkout project"
34-
uses: actions/[email protected].0
34+
uses: actions/[email protected].1
3535

3636
- name: "Login in Github container registry"
3737
uses: docker/[email protected]

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@ repos:
3939
)
4040
4141
- repo: https://github.com/psf/black
42-
rev: 24.8.0 # If version changes --> modify "blacken-docs" manually as well.
42+
rev: 24.10.0 # If version changes --> modify "blacken-docs" manually as well.
4343
hooks:
4444
- id: black
4545
args:
4646
- --line-length=88
4747

4848
- repo: https://github.com/adamchainz/blacken-docs
49-
rev: 1.18.0
49+
rev: 1.19.0
5050
hooks:
5151
- id: blacken-docs
52-
additional_dependencies: [black==24.8.0]
52+
additional_dependencies: [black==24.10.0]
5353

5454
- repo: https://github.com/PyCQA/flake8
5555
rev: 7.1.1
@@ -71,7 +71,7 @@ repos:
7171
# exclude: "tests/"
7272

7373
- repo: https://github.com/pre-commit/pre-commit-hooks
74-
rev: v4.6.0
74+
rev: v5.0.0
7575
hooks:
7676
- id: check-merge-conflict
7777
- id: debug-statements

CONTRIBUTORS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Project Lead
44

5-
* [German Martinez Ayuso](https://github.com/germa89)
5+
* [German Martinez Ayuso](https://github.com/germa89)
66

77
## Individual Contributors
88

@@ -14,3 +14,4 @@
1414
* [Maxime Rey](https://github.com/MaxJPRey)
1515
* [Revathy Venugopal](https://github.com/Revathyvenugopal162)
1616
* [Roberto Pastor](https://github.com/RobPasMue)
17+
* [Mohamed Koubaa](https://github.com/koubaa)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
build: bump grpcio from 1.66.1 to 1.66.2 in the grpc-deps group
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
build: bump sphinx-autobuild from 2024.9.19 to 2024.10.3 in the documentation group

doc/changelog.d/3455.added.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
chore: update CHANGELOG for v0.68.5

0 commit comments

Comments
 (0)