Skip to content

Commit 607f45c

Browse files
prmukherjprmukherj
authored
Merge branch 'main' into maint/activate_2d_meshing_tests_for_251
2 parents 67f9d0c + 7a75882 commit 607f45c

File tree

19 files changed

+237
-206
lines changed

19 files changed

+237
-206
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ env:
3737
PYFLUENT_LOGGING: 'DEBUG'
3838
PYFLUENT_WATCHDOG_DEBUG: 'OFF'
3939
PYFLUENT_HIDE_LOG_SECRETS: 1
40-
PYFLUENT_SKIP_API_UPGRADE_ADVICE: 1
4140

4241
jobs:
4342

@@ -191,11 +190,7 @@ jobs:
191190
- name: Build Source Documentation
192191
run: |
193192
pip install -r requirements/requirements_build.txt
194-
if [ -f poetry.lock ] ; then
195-
rm poetry.lock
196-
fi
197-
poetry install --with docs
198-
poetry install --all-extras
193+
pip install ansys-fluent-core[docs,reader,tests]
199194
make build-doc-source
200195
env:
201196
FLUENT_IMAGE_TAG: ${{ env.DOC_DEPLOYMENT_IMAGE_TAG }}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,7 @@ jobs:
6262
- name: Build All Documentation
6363
run: |
6464
pip install -r requirements/requirements_build.txt
65-
if [ -f poetry.lock ] ; then
66-
rm poetry.lock
67-
fi
68-
poetry install --with docs
69-
poetry install --all-extras
65+
pip install ansys-fluent-core[docs,reader,tests]
7066
make build-all-docs
7167
env:
7268
FLUENT_IMAGE_TAG: ${{ env.DOC_DEPLOYMENT_IMAGE_TAG }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Build All Documentation
6060
run: |
6161
pip install -r requirements/requirements_build.txt
62-
poetry install --only docs
62+
pip install ansys-fluent-core[docs]
6363
make build-all-docs
6464
env:
6565
FLUENT_IMAGE_TAG: ${{ env.DOC_DEPLOYMENT_IMAGE_TAG }}

‎.github/workflows/test-run-custom.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
echo "Running custom unittest"
106106
sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
107107
make install-test
108-
poetry python -m pytest -v --no-cov --capture=no -k test_parametric_workflow --nightly
108+
python -m pytest -v --no-cov --capture=no -k test_parametric_workflow --nightly
109109
env:
110110
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
111111

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022 ANSYS, Inc. All rights reserved.
3+
Copyright (c) 2025 ANSYS, Inc. All rights reserved.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Makefile‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ style:
44

55
install:
66
@pip install -r requirements/requirements_build.txt
7-
@poetry build
7+
@flit build
88
@pip install -q --force-reinstall dist/*.whl
99

1010
install-test:
1111
@pip install -r requirements/requirements_build.txt
12-
@poetry install --with test
13-
@poetry install -E reader
14-
@poetry run python -m pip install -q --force-reinstall dist/*.whl > /dev/null
12+
@pip install ansys-fluent-core[reader,tests]
13+
@python -m pip install -q --force-reinstall dist/*.whl > /dev/null
1514

1615
version-info:
1716
@bash -c "date -u +'Build date: %B %d, %Y %H:%M UTC ShaID: <id>' | xargs -I date sed -i 's/_VERSION_INFO = .*/_VERSION_INFO = \"date\"/g' src/ansys/fluent/core/__init__.py"
@@ -31,117 +30,117 @@ unittest: unittest-dev-242
3130
unittest-dev-222:
3231
@echo "Running unittests"
3332
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
34-
@poetry run python -m pytest --fluent-version=22.2 $(PYTESTEXTRA) || poetry run python -m pytest --fluent-version=22.2 $(PYTESTRERUN)
33+
@python -m pytest --fluent-version=22.2 $(PYTESTEXTRA) || python -m pytest --fluent-version=22.2 $(PYTESTRERUN)
3534

3635
unittest-dev-231:
3736
@echo "Running unittests"
3837
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
39-
@poetry run python -m pytest --fluent-version=23.1 $(PYTESTEXTRA) || poetry run python -m pytest --fluent-version=23.1 $(PYTESTRERUN)
38+
@python -m pytest --fluent-version=23.1 $(PYTESTEXTRA) || python -m pytest --fluent-version=23.1 $(PYTESTRERUN)
4039

4140
unittest-dev-232:
4241
@echo "Running unittests"
4342
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
44-
@poetry run python -m pytest --fluent-version=23.2 $(PYTESTEXTRA) || poetry run python -m pytest --fluent-version=23.2 $(PYTESTRERUN)
43+
@python -m pytest --fluent-version=23.2 $(PYTESTEXTRA) || python -m pytest --fluent-version=23.2 $(PYTESTRERUN)
4544

4645
unittest-dev-241:
4746
@echo "Running unittests"
4847
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
49-
@poetry run python -m pytest --fluent-version=24.1 $(PYTESTEXTRA) || poetry run python -m pytest --fluent-version=24.1 $(PYTESTRERUN)
48+
@python -m pytest --fluent-version=24.1 $(PYTESTEXTRA) || python -m pytest --fluent-version=24.1 $(PYTESTRERUN)
5049

5150
unittest-dev-242:
5251
@echo "Running unittests"
5352
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
54-
@poetry run python -m pytest --fluent-version=24.2 $(PYTESTEXTRA) || poetry run python -m pytest --fluent-version=24.2 $(PYTESTRERUN)
53+
@python -m pytest --fluent-version=24.2 $(PYTESTEXTRA) || python -m pytest --fluent-version=24.2 $(PYTESTRERUN)
5554

5655
unittest-dev-251:
5756
@echo "Running unittests"
5857
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
59-
@poetry run python -m pytest --fluent-version=25.1 $(PYTESTEXTRA) || poetry run python -m pytest --fluent-version=25.1 $(PYTESTRERUN)
58+
@python -m pytest --fluent-version=25.1 $(PYTESTEXTRA) || python -m pytest --fluent-version=25.1 $(PYTESTRERUN)
6059

6160
unittest-dev-252:
6261
@echo "Running unittests"
6362
@sudo rm -rf /home/ansys/Documents/ansys_fluent_core_examples/*
64-
@poetry run python -m pytest --fluent-version=25.2 $(PYTESTEXTRA) || poetry run python -m pytest --fluent-version=25.2 $(PYTESTRERUN)
63+
@python -m pytest --fluent-version=25.2 $(PYTESTEXTRA) || python -m pytest --fluent-version=25.2 $(PYTESTRERUN)
6564

6665
unittest-all-222:
6766
@echo "Running all unittests"
6867
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
69-
@poetry run python -m pytest --nightly --fluent-version=22.2 $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=22.2 $(PYTESTRERUN)
68+
@python -m pytest --nightly --fluent-version=22.2 $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=22.2 $(PYTESTRERUN)
7069

7170
unittest-all-222-no-codegen:
7271
@echo "Running all unittests"
7372
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
74-
@poetry run python -m pytest --nightly --fluent-version=22.2 -m "not codegen_required" $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=22.2 -m "not codegen_required" $(PYTESTRERUN)
73+
@python -m pytest --nightly --fluent-version=22.2 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=22.2 -m "not codegen_required" $(PYTESTRERUN)
7574

7675
unittest-all-231:
7776
@echo "Running all unittests"
7877
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
79-
@poetry run python -m pytest --nightly --fluent-version=23.1 $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=23.1 $(PYTESTRERUN)
78+
@python -m pytest --nightly --fluent-version=23.1 $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=23.1 $(PYTESTRERUN)
8079

8180
unittest-all-231-no-codegen:
8281
@echo "Running all unittests"
8382
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
84-
@poetry run python -m pytest --nightly --fluent-version=23.1 -m "not codegen_required" $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=23.1 -m "not codegen_required" $(PYTESTRERUN)
83+
@python -m pytest --nightly --fluent-version=23.1 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=23.1 -m "not codegen_required" $(PYTESTRERUN)
8584

8685
unittest-all-232:
8786
@echo "Running all unittests"
8887
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
89-
@poetry run python -m pytest --nightly --fluent-version=23.2 $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=23.2 $(PYTESTRERUN)
88+
@python -m pytest --nightly --fluent-version=23.2 $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=23.2 $(PYTESTRERUN)
9089

9190
unittest-all-232-no-codegen:
9291
@echo "Running all unittests"
9392
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
94-
@poetry run python -m pytest --nightly --fluent-version=23.2 -m "not codegen_required" $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=23.2 -m "not codegen_required" $(PYTESTRERUN)
93+
@python -m pytest --nightly --fluent-version=23.2 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=23.2 -m "not codegen_required" $(PYTESTRERUN)
9594

9695
unittest-all-241:
9796
@echo "Running all unittests"
9897
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
99-
@poetry run python -m pytest --nightly --fluent-version=24.1 $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=24.1 $(PYTESTRERUN)
98+
@python -m pytest --nightly --fluent-version=24.1 $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=24.1 $(PYTESTRERUN)
10099

101100
unittest-all-241-no-codegen:
102101
@echo "Running all unittests"
103102
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
104-
@poetry run python -m pytest --nightly --fluent-version=24.1 -m "not codegen_required" $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=24.1 -m "not codegen_required" $(PYTESTRERUN)
103+
@python -m pytest --nightly --fluent-version=24.1 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=24.1 -m "not codegen_required" $(PYTESTRERUN)
105104

106105
unittest-all-242:
107106
@echo "Running all unittests"
108107
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
109-
@poetry run python -m pytest --nightly --fluent-version=24.2 $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=24.2 $(PYTESTRERUN)
108+
@python -m pytest --nightly --fluent-version=24.2 $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=24.2 $(PYTESTRERUN)
110109

111110
unittest-all-242-no-codegen:
112111
@echo "Running all unittests"
113112
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
114-
@poetry run python -m pytest --nightly --fluent-version=24.2 -m "not codegen_required" $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=24.2 -m "not codegen_required" $(PYTESTRERUN)
113+
@python -m pytest --nightly --fluent-version=24.2 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=24.2 -m "not codegen_required" $(PYTESTRERUN)
115114

116115
unittest-all-251:
117116
@echo "Running all unittests"
118117
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
119-
@poetry run python -m pytest --nightly --fluent-version=25.1 $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=25.1 $(PYTESTRERUN)
118+
@python -m pytest --nightly --fluent-version=25.1 $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=25.1 $(PYTESTRERUN)
120119

121120
unittest-solvermode-251:
122121
@echo "Running all unittests"
123122
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
124-
@poetry run python -m pytest --fluent-version=25.1 --solvermode $(PYTESTEXTRA) || poetry run python -m pytest --fluent-version=25.1 --solvermode $(PYTESTRERUN)
123+
@python -m pytest --fluent-version=25.1 --solvermode $(PYTESTEXTRA) || python -m pytest --fluent-version=25.1 --solvermode $(PYTESTRERUN)
125124

126125
unittest-all-251-no-codegen:
127126
@echo "Running all unittests"
128127
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
129-
@poetry run python -m pytest --nightly --fluent-version=25.1 -m "not codegen_required" $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=25.1 -m "not codegen_required" $(PYTESTRERUN)
128+
@python -m pytest --nightly --fluent-version=25.1 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=25.1 -m "not codegen_required" $(PYTESTRERUN)
130129

131130
unittest-all-252:
132131
@echo "Running all unittests"
133132
@sudo rm -rf /home/ansys/Documents/ansys_fluent_core_examples/*
134-
@poetry run python -m pytest --nightly --fluent-version=25.2 $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=25.2 $(PYTESTRERUN)
133+
@python -m pytest --nightly --fluent-version=25.2 $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=25.2 $(PYTESTRERUN)
135134

136135
unittest-solvermode-252:
137136
@echo "Running all unittests"
138137
@sudo rm -rf /home/ansys/Documents/ansys_fluent_core_examples/*
139-
@poetry run python -m pytest --fluent-version=25.2 --solvermode $(PYTESTEXTRA) || poetry run python -m pytest --fluent-version=25.2 --solvermode $(PYTESTRERUN)
138+
@python -m pytest --fluent-version=25.2 --solvermode $(PYTESTEXTRA) || python -m pytest --fluent-version=25.2 --solvermode $(PYTESTRERUN)
140139

141140
unittest-all-252-no-codegen:
142141
@echo "Running all unittests"
143142
@sudo rm -rf /home/ansys/Documents/ansys_fluent_core_examples/*
144-
@poetry run python -m pytest --nightly --fluent-version=25.2 -m "not codegen_required" $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=25.2 -m "not codegen_required" $(PYTESTRERUN)
143+
@python -m pytest --nightly --fluent-version=25.2 -m "not codegen_required" $(PYTESTEXTRA) || python -m pytest --nightly --fluent-version=25.2 -m "not codegen_required" $(PYTESTRERUN)
145144

146145
api-codegen:
147146
@echo "Running API codegen"
@@ -158,16 +157,16 @@ build-doc-source:
158157
@sudo rm -rf doc/source/api/solver/tui
159158
@sudo rm -rf doc/source/api/solver/_autosummary/settings
160159
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
161-
@xvfb-run poetry run -- make -C doc html
160+
@xvfb-run make -C doc html
162161

163162
build-all-docs:
164163
@python doc/api_rstgen.py
165164
@python doc/datamodel_rstgen.py
166165
@python doc/tui_rstgen.py
167166
@python doc/settings_rstgen.py
168167
@sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
169-
@xvfb-run poetry run -- make -C doc html
170-
@poetry run python doc/modify_html.py
168+
@xvfb-run make -C doc html
169+
@python doc/modify_html.py
171170

172171
compare-flobject:
173172
@python .ci/compare_flobject.py
@@ -182,6 +181,6 @@ cleanup-previous-docker-containers:
182181

183182
write-and-run-fluent-tests:
184183
@pip install -r requirements/requirements_build.txt
185-
@poetry install --with test -E reader
186-
@poetry run python -m pytest --write-fluent-journals
187-
@poetry run python .ci/fluent_test_runner.py tests
184+
@pip install ansys-fluent-core[reader]
185+
@python -m pytest --write-fluent-journals
186+
@python .ci/fluent_test_runner.py tests

‎doc/source/contributing/index.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ To run the PyFluent unit tests, execute the following command in the root
3232

3333
.. code:: console
3434
35-
poetry install --with test
36-
poetry run pytest ----fluent-version=24.2
35+
pip install ansys-fluent-core[tests]
36+
python -m pytest -n 4 --fluent-version=24.2
3737
3838
You can change the Fluent version by replacing ``24.2`` with the version you want to test.
3939

@@ -44,9 +44,9 @@ To build the PyFluent documentation locally, run the following commands in the r
4444

4545
.. code:: console
4646
47-
poetry install --with docs
47+
pip install ansys-fluent-core[docs]
4848
cd doc
49-
poetry run make html
49+
make html
5050
5151
After the build completes, the HTML documentation is located in the
5252
``_build/html`` directory. You can load the ``index.html`` file in

0 commit comments

Comments
 (0)