Skip to content

Commit b9cf0c7

Browse files
authored
Merge branch 'main' into main
2 parents b145585 + 5f78e2a commit b9cf0c7

Some content is hidden

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

55 files changed

+1021
-55
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
with:
140140
generate-summary: true
141141
token: ${{ secrets.GITHUB_TOKEN }}
142-
auditing-level: 'high'
142+
auditing-level: "high"
143143

144144
docs_build:
145145
name: Build Documentation
@@ -171,7 +171,7 @@ jobs:
171171
key: Python-${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('pyproject.toml') }}
172172
restore-keys: |
173173
Python-${{ runner.os }}-${{ env.PYTHON_VERSION }}
174-
lookup-only: false # zizmor: ignore[cache-poisoning]
174+
lookup-only: false # zizmor: ignore[cache-poisoning]
175175

176176
- name: Install Quarto
177177
uses: quarto-dev/quarto-actions/setup@9e48da27e184aa238fcb49f5db75469626d43adb # v2.1.9
@@ -207,7 +207,7 @@ jobs:
207207
path: |
208208
src/ansys/fluent/core/generated
209209
key: API-Code-v${{ env.API_CODE_CACHE }}-${{ steps.version.outputs.PYFLUENT_VERSION }}-${{ env.DOC_DEPLOYMENT_IMAGE_TAG }}-${{ hashFiles('src/ansys/fluent/core/codegen/**') }}
210-
lookup-only: false # zizmor: ignore[cache-poisoning]
210+
lookup-only: false # zizmor: ignore[cache-poisoning]
211211

212212
- name: Login to GitHub Container Registry
213213
if: steps.cache-api-code.outputs.cache-hit != 'true'
@@ -284,7 +284,7 @@ jobs:
284284
key: Python-${{ runner.os }}-${{ env.MAIN_PYTHON_VERSION }}-${{ hashFiles('pyproject.toml') }}
285285
restore-keys: |
286286
Python-${{ runner.os }}-${{ env.MAIN_PYTHON_VERSION }}
287-
lookup-only: false # zizmor: ignore[cache-poisoning]
287+
lookup-only: false # zizmor: ignore[cache-poisoning]
288288

289289
- name: Add version information
290290
run: make version-info
@@ -313,7 +313,7 @@ jobs:
313313
# Combined cache key for all versions:
314314
# API-Code-<Cache version>-<PyFluent version>-<First Fluent release version>-<Last Fluent release version>-<Fluent dev version>-<Hash of codegen files>
315315
key: API-Code-v${{ env.API_CODE_CACHE }}-${{ steps.version.outputs.PYFLUENT_VERSION }}-v23.1.0-v25.2.0-${{ vars.FLUENT_STABLE_IMAGE_DEV }}-${{ hashFiles('src/ansys/fluent/core/codegen/**') }}
316-
lookup-only: false # zizmor: ignore[cache-poisoning]
316+
lookup-only: false # zizmor: ignore[cache-poisoning]
317317

318318
- name: Pull 23.1 Fluent docker image
319319
if: steps.cache-api-code.outputs.cache-hit != 'true'
@@ -602,7 +602,7 @@ jobs:
602602
key: Python-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml') }}
603603
restore-keys: |
604604
Python-${{ runner.os }}-${{ matrix.python-version }}
605-
lookup-only: false # zizmor: ignore[cache-poisoning]
605+
lookup-only: false # zizmor: ignore[cache-poisoning]
606606

607607
- name: Add version information
608608
run: make version-info
@@ -661,7 +661,7 @@ jobs:
661661
release:
662662
name: Release
663663
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
664-
needs: [test, update-changelog, nightly-dev-test]
664+
needs: [test, update-changelog]
665665
runs-on: ubuntu-latest
666666
permissions:
667667
id-token: write # required for trusted publishing
@@ -673,6 +673,12 @@ jobs:
673673
with:
674674
python-version: ${{ env.MAIN_PYTHON_VERSION }}
675675

676+
- name: "Download the library artifacts from build-library step"
677+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
678+
with:
679+
name: PyFluent-packages
680+
path: PyFluent-packages
681+
676682
- name: Display package file list
677683
run: ls -R
678684

@@ -686,12 +692,6 @@ jobs:
686692
TWINE_PASSWORD: ${{ secrets.PYANSYS_PYPI_PRIVATE_PAT }}
687693
TWINE_REPOSITORY_URL: https://pkgs.dev.azure.com/pyansys/_packaging/pyansys/pypi/upload
688694

689-
- name: "Download the library artifacts from build-library step"
690-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
691-
with:
692-
name: PyFluent-packages
693-
path: PyFluent-packages
694-
695695
- name: "Upload artifacts to PyPI using trusted publisher"
696696
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
697697
with:

codegen/allapigen.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
gt_222 = FluentVersion(version) > FluentVersion.v222
1818
ge_231 = FluentVersion(version) >= FluentVersion.v231
1919
ge_242 = FluentVersion(version) >= FluentVersion.v242
20+
ge_261 = FluentVersion(version) >= FluentVersion.v261
2021

2122
static_infos = {
2223
StaticInfoType.DATAMODEL_WORKFLOW: meshing._datamodel_service_se.get_static_info(
@@ -40,6 +41,10 @@
4041
static_infos[StaticInfoType.DATAMODEL_MESHING_UTILITIES] = (
4142
meshing._datamodel_service_se.get_static_info("MeshingUtilities")
4243
)
44+
if ge_261:
45+
static_infos[StaticInfoType.DATAMODEL_MESHING_WORKFLOW] = (
46+
meshing._datamodel_service_se.get_static_info("meshing_workflow")
47+
)
4348
meshing.exit()
4449

4550
solver = launch_fluent(

doc/changelog.d/4374.added.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/4381.dependencies.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/4382.fixed.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/4412.documentation.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/4428.dependencies.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/4431.dependencies.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/4432.dependencies.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/4441.fixed.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)