Skip to content

Commit dc35b7e

Browse files
Gobot1234Gobot1234
authored
Merge branch 'main' into main
2 parents 563c288 + 4f618cb commit dc35b7e

Some content is hidden

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

54 files changed

+338
-205
lines changed

‎.ci/fluent_test_runner.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ def _run_single_test(
4545
"""
4646
logging.debug(f"journal_file: {journal_file}")
4747
src_pyfluent_dir = str(Path(pyfluent.__file__).parent)
48-
verion_for_file_name = FluentVersion.current_dev().number
49-
dst_pyfluent_dir = f"/ansys_inc/v{verion_for_file_name}/commonfiles/CPython/3_10/linx64/Release/Ansys/PyFluentCore/ansys/fluent/core"
48+
version_for_file_name = FluentVersion.current_dev().number
49+
dst_pyfluent_dir = f"/ansys_inc/v{version_for_file_name}/commonfiles/CPython/3_10/linx64/Release/Ansys/PyFluentCore/ansys/fluent/core"
5050
src_gen_dir = (
5151
Path(pyfluent.__file__).parent / "ansys" / "fluent" / "core" / "generated"
5252
)
53-
dst_gen_dir = f"/ansys_inc/v{verion_for_file_name}/fluent/fluent{FluentVersion.current_dev()!r}/cortex/pylib/flapi/generated"
53+
dst_gen_dir = f"/ansys_inc/v{version_for_file_name}/fluent/fluent{FluentVersion.current_dev()!r}/cortex/pylib/flapi/generated"
5454
dst_test_dir = "/testing"
5555
working_dir = Path(dst_test_dir)
5656
parent = journal_file.parent

‎.github/pull_request_template.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
## Context
2+
What was the situation or problem before this change?
3+
4+
## Change Summary
5+
What changes were made?
6+
7+
## Rationale
8+
Why was this approach taken?
9+
10+
## Impact
11+
What parts of the system or workflows are affected?

‎.github/workflows/ci.yml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ env:
3030
MAIN_PYTHON_VERSION: "3.10"
3131
PYTHON_VERSION: "3.12"
3232
PYFLUENT_TIMEOUT_FORCE_EXIT: 30
33+
PYTEST_XDIST_AUTO_NUM_WORKERS: 4
3334
PYFLUENT_LAUNCH_CONTAINER: 1
3435
PYFLUENT_LOGGING: "DEBUG"
3536
PYFLUENT_WATCHDOG_DEBUG: "OFF"
@@ -43,7 +44,7 @@ jobs:
4344
- uses: actions/checkout@v5
4445

4546
- name: Set up Python
46-
uses: actions/setup-python@v5
47+
uses: actions/setup-python@v6
4748
with:
4849
python-version: ${{ env.MAIN_PYTHON_VERSION }}
4950

@@ -63,7 +64,7 @@ jobs:
6364
contents: write
6465
pull-requests: write
6566
steps:
66-
- uses: ansys/actions/doc-deploy-changelog@v10.0
67+
- uses: ansys/actions/doc-deploy-changelog@v10.1
6768
with:
6869
bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
6970
bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }}
@@ -74,7 +75,7 @@ jobs:
7475
runs-on: ubuntu-latest
7576
steps:
7677
- name: Running Vale
77-
uses: ansys/actions/doc-style@v10.0
78+
uses: ansys/actions/doc-style@v10.1
7879
with:
7980
token: ${{ secrets.GITHUB_TOKEN }}
8081

@@ -83,13 +84,13 @@ jobs:
8384
runs-on: ubuntu-latest
8485
steps:
8586
- name: "Run PyAnsys code style checks"
86-
uses: ansys/actions/code-style@v10.0
87+
uses: ansys/actions/code-style@v10.1
8788

8889
commit-style:
8990
name: "Run commit style checks"
9091
runs-on: ubuntu-latest
9192
steps:
92-
- uses: ansys/actions/check-pr-title@v10.0
93+
- uses: ansys/actions/check-pr-title@v10.1
9394
with:
9495
token: ${{ secrets.GITHUB_TOKEN }}
9596

@@ -108,7 +109,7 @@ jobs:
108109
os: macos-latest
109110
steps:
110111
- name: Build wheelhouse and perform smoke test
111-
uses: ansys/actions/build-wheelhouse@v10.0
112+
uses: ansys/actions/build-wheelhouse@v10.1
112113
with:
113114
library-name: ${{ env.PACKAGE_NAME }}
114115
operating-system: ${{ matrix.os }}
@@ -140,7 +141,7 @@ jobs:
140141
- uses: actions/checkout@v5
141142

142143
- name: Setup Python
143-
uses: actions/setup-python@v5
144+
uses: actions/setup-python@v6
144145
with:
145146
python-version: ${{ env.PYTHON_VERSION }}
146147

@@ -194,7 +195,7 @@ jobs:
194195

195196
- name: Login to GitHub Container Registry
196197
if: steps.cache-api-code.outputs.cache-hit != 'true'
197-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
198+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
198199
with:
199200
registry: ghcr.io
200201
username: ansys-bot
@@ -252,7 +253,7 @@ jobs:
252253
- uses: actions/checkout@v5
253254

254255
- name: Setup Python
255-
uses: actions/setup-python@v5
256+
uses: actions/setup-python@v6
256257
with:
257258
python-version: ${{ env.MAIN_PYTHON_VERSION }}
258259

@@ -277,7 +278,7 @@ jobs:
277278
id: version
278279

279280
- name: Login to GitHub Container Registry
280-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
281+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
281282
with:
282283
registry: ghcr.io
283284
username: ansys-bot
@@ -496,7 +497,7 @@ jobs:
496497

497498
- name: Setup Python
498499
if: ${{ !contains(github.event.pull_request.title, '[skip tests]') }}
499-
uses: actions/setup-python@v5
500+
uses: actions/setup-python@v6
500501
with:
501502
python-version: ${{ env.MAIN_PYTHON_VERSION }}
502503

@@ -520,7 +521,7 @@ jobs:
520521

521522
- name: Login to GitHub Container Registry
522523
if: ${{ !contains(github.event.pull_request.title, '[skip tests]') }}
523-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
524+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
524525
with:
525526
registry: ghcr.io
526527
username: ansys-bot
@@ -555,13 +556,14 @@ jobs:
555556
name: Release Testing
556557
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, 'dev')
557558
runs-on: [self-hosted, pyfluent]
558-
timeout-minutes: 120
559+
env:
560+
PYTEST_XDIST_AUTO_NUM_WORKERS: 1
559561

560562
steps:
561563
- uses: actions/checkout@v5
562564

563565
- name: Setup Python
564-
uses: actions/setup-python@v5
566+
uses: actions/setup-python@v6
565567
with:
566568
python-version: ${{ env.MAIN_PYTHON_VERSION }}
567569

@@ -586,7 +588,7 @@ jobs:
586588
id: version
587589

588590
- name: Login to GitHub Container Registry
589-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
591+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
590592
with:
591593
registry: ghcr.io
592594
username: ansys-bot
@@ -638,7 +640,7 @@ jobs:
638640

639641
steps:
640642
- name: Set up Python
641-
uses: actions/setup-python@v5
643+
uses: actions/setup-python@v6
642644
with:
643645
python-version: ${{ env.MAIN_PYTHON_VERSION }}
644646

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@v5
3232

3333
- name: Setup Python
34-
uses: actions/setup-python@v5
34+
uses: actions/setup-python@v6
3535
with:
3636
python-version: "3.11"
3737

@@ -44,7 +44,7 @@ jobs:
4444
run: make install
4545

4646
- name: Login to GitHub Container Registry
47-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
47+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
4848
with:
4949
registry: ghcr.io
5050
username: ansys-bot
@@ -128,7 +128,7 @@ jobs:
128128
if: github.ref == 'refs/heads/main'
129129
steps:
130130
- name: "Deploy development documentation"
131-
uses: ansys/actions/doc-deploy-dev@v10.0
131+
uses: ansys/actions/doc-deploy-dev@v10.1
132132
with:
133133
doc-artifact-name: "HTML-Documentation-tag-${{ env.DOC_DEPLOYMENT_IMAGE_TAG }}"
134134
decompress-artifact: true

‎.github/workflows/doc-build-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@v5
3434

3535
- name: Setup Python
36-
uses: actions/setup-python@v5
36+
uses: actions/setup-python@v6
3737
with:
3838
python-version: "3.11"
3939

@@ -46,7 +46,7 @@ jobs:
4646
run: make install
4747

4848
- name: Login to GitHub Container Registry
49-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
49+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
5050
with:
5151
registry: ghcr.io
5252
username: ansys-bot
@@ -94,7 +94,7 @@ jobs:
9494
needs: [build_release_docs]
9595
steps:
9696
- name: "Deploy release documentation"
97-
uses: ansys/actions/doc-deploy-stable@v10.0
97+
uses: ansys/actions/doc-deploy-stable@v10.1
9898
with:
9999
doc-artifact-name: "HTML-Documentation-tag-${{ env.DOC_DEPLOYMENT_IMAGE_TAG }}"
100100
decompress-artifact: true

‎.github/workflows/execute-examples-weekly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- uses: actions/checkout@v5
4242

4343
- name: Setup Python
44-
uses: actions/setup-python@v5
44+
uses: actions/setup-python@v6
4545
with:
4646
python-version: ${{ env.PYTHON_VERSION }}
4747

@@ -54,7 +54,7 @@ jobs:
5454
Python-${{ runner.os }}-${{ env.PYTHON_VERSION }}
5555
5656
- name: Login to GitHub Container Registry
57-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
57+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
5858
with:
5959
registry: ghcr.io
6060
username: ansys-bot

‎.github/workflows/force-update-stable-Fluent-image-version.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/checkout@v5
3131

3232
- name: Login to GitHub Container Registry
33-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
33+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
3434
with:
3535
registry: ghcr.io
3636
username: ansys-bot

‎.github/workflows/label.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
steps:
4242
# Label based on modified files
4343
- name: Label based on changed files
44-
uses: actions/labeler@v5
44+
uses: actions/labeler@v6
4545
with:
4646
repo-token: "${{ secrets.GITHUB_TOKEN }}"
4747
sync-labels: false
@@ -131,7 +131,7 @@ jobs:
131131
pull-requests: write
132132
runs-on: ubuntu-latest
133133
steps:
134-
- uses: ansys/actions/doc-changelog@v10.0
134+
- uses: ansys/actions/doc-changelog@v10.1
135135
with:
136136
bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
137137
bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }}

‎.github/workflows/test-fluent-journals.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- uses: actions/checkout@v5
3636

3737
- name: Setup Python
38-
uses: actions/setup-python@v5
38+
uses: actions/setup-python@v6
3939
with:
4040
python-version: ${{ env.PYTHON_VERSION }}
4141

@@ -60,7 +60,7 @@ jobs:
6060
id: version
6161

6262
- name: Login to GitHub Container Registry
63-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
63+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
6464
with:
6565
registry: ghcr.io
6666
username: ansys-bot

‎.github/workflows/test-podman-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- uses: actions/checkout@v5
4747

4848
- name: Setup Python
49-
uses: actions/setup-python@v5
49+
uses: actions/setup-python@v6
5050
with:
5151
python-version: ${{ env.PYTHON_VERSION }}
5252

@@ -73,7 +73,7 @@ jobs:
7373
id: version
7474

7575
- name: Login to GitHub Container Registry
76-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
76+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
7777
with:
7878
registry: ghcr.io
7979
username: ansys-bot

0 commit comments

Comments
 (0)