Skip to content

Commit 5af2162

Browse files
Merge branch 'main' into release/0.10
# Conflicts: # src/ansys/aedt/core/__init__.py
2 parents 6279c27 + 54fcc25 commit 5af2162

Some content is hidden

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

64 files changed

+3240
-604
lines changed

.git-blame-ignore-revs

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# One commit hash per line, and all commits in the file will be ignored by git blame.
2+
3+
# Apply flake8 policy for unused imports (#449)
4+
f2ebb7a80978e1ea82328e9b6afd3f9484362552
5+
# Organize module imports (#448)
6+
98bb0a1bfd27f8174ef86a131b3f6eed09f562ad
7+
# Format line length (#445)
8+
b82041bb75d71b8e11b54f9dcfdfc696a1bcf68c
9+
# Format modeler files (#441)
10+
0174ae92359f49fb8215f16d715f3afe8598745f
11+
# Format example files (#444)
12+
41eb277bc05b6736c674af33d5b601c3bc9a33d3
13+
# Format ipy unittests (#443)
14+
522b13c6ed123be60eb6220bfe6fed35ba059ab8
15+
# Format unittests (#442)
16+
11d60aa7e31f3494d8a73c0223c924ff17eec985
17+
# Format modules files (#436)
18+
0798f3f4c2252c1c3c486b8400540939c5b42dc6
19+
# Format application files (#434)
20+
19b758272a6d9551a8837b5f2d3a6283974d3367
21+
# Format pyaedt files with black (#433)
22+
3c3f0c6e01336eae66199bb9e461319d18a435d7
23+
# Formatting - fix line length part 2 (#415)
24+
58bbdc280545f7345b7999db0f17c3ff666e0be2
25+
# Formatting - fix line length part 1 (#414)
26+
af6af2e6b5db5e1485bfddd2b9d0e363614ecfce
27+
# Formatting - blank lines (#412)
28+
babf97db629f2901f40ae080ac3a7e24084a1e87
29+
# Formatting - whitespace on blank lines (#409)
30+
08e4ae515f7d5fd4a37e7baab7b321c907e66324
31+
# Formatting - indentations (#407)
32+
9ddfe050d95feaa022cc30cc64acabee16029c07
33+
# Remove trailing whitespace (#404)
34+
a4b5fe60c7d0a7db624d7ab160a0ce5e1f378759
35+
# Run autopep8 W291, remove trailing whitespace (#401)
36+
159bb43d42ad502c2440531d71cf7df6c780a8c9

.github/workflows/ci_cd.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,9 @@ jobs:
523523
uses: actions/checkout@v4
524524

525525
- name: Install the package requirements
526-
run: pip install -e .
526+
run: |
527+
python -m pip install --upgrade pip
528+
pip install -e .
527529
528530
- name: Get the version to PyMeilisearch
529531
run: |

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ repos:
4848

4949
# validate GitHub workflow files
5050
- repo: https://github.com/python-jsonschema/check-jsonschema
51-
rev: 0.29.1
51+
rev: 0.29.2
5252
hooks:
5353
- id: check-github-workflows
5454

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
[![PyAnsys](https://img.shields.io/badge/Py-Ansys-ffc107.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAABDklEQVQ4jWNgoDfg5mD8vE7q/3bpVyskbW0sMRUwofHD7Dh5OBkZGBgW7/3W2tZpa2tLQEOyOzeEsfumlK2tbVpaGj4N6jIs1lpsDAwMJ278sveMY2BgCA0NFRISwqkhyQ1q/Nyd3zg4OBgYGNjZ2ePi4rB5loGBhZnhxTLJ/9ulv26Q4uVk1NXV/f///////69du4Zdg78lx//t0v+3S88rFISInD59GqIH2esIJ8G9O2/XVwhjzpw5EAam1xkkBJn/bJX+v1365hxxuCAfH9+3b9/+////48cPuNehNsS7cDEzMTAwMMzb+Q2u4dOnT2vWrMHu9ZtzxP9vl/69RVpCkBlZ3N7enoDXBwEAAA+YYitOilMVAAAAAElFTkSuQmCC)](https://docs.pyansys.com/)
1414
[![pypi](https://img.shields.io/pypi/v/pyaedt.svg?logo=python&logoColor=white)](https://pypi.org/project/pyaedt/)
1515
[![PyPIact](https://static.pepy.tech/badge/pyaedt/month)](https://www.pepy.tech/projects/pyaedt)
16-
[![PythonVersion](https://img.shields.io/badge/python-3.7+-blue.svg)](https://www.python.org/downloads/)
16+
[![PythonVersion](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/downloads/)
1717
[![GH-CI](https://github.com/ansys/pyaedt/actions/workflows/unit_tests.yml/badge.svg)](https://github.com/ansys/pyaedt/actions/workflows/unit_tests.yml)
1818
[![codecov](https://codecov.io/gh/ansys/pyaedt/branch/main/graph/badge.svg)](https://codecov.io/gh/ansys/pyaedt)
1919
[![MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/blog/license/mit)[![black](https://img.shields.io/badge/code%20style-black-000000.svg?style=flat)](https://github.com/psf/black)[![Anaconda](https://anaconda.org/conda-forge/pyaedt/badges/version.svg)](https://anaconda.org/conda-forge/pyaedt)

README_CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<br> <a href="README.md">English</a> | 中文
1111
</p>
1212

13-
[![PyAnsys](https://img.shields.io/badge/Py-Ansys-ffc107.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAABDklEQVQ4jWNgoDfg5mD8vE7q/3bpVyskbW0sMRUwofHD7Dh5OBkZGBgW7/3W2tZpa2tLQEOyOzeEsfumlK2tbVpaGj4N6jIs1lpsDAwMJ278sveMY2BgCA0NFRISwqkhyQ1q/Nyd3zg4OBgYGNjZ2ePi4rB5loGBhZnhxTLJ/9ulv26Q4uVk1NXV/f///////69du4Zdg78lx//t0v+3S88rFISInD59GqIH2esIJ8G9O2/XVwhjzpw5EAam1xkkBJn/bJX+v1365hxxuCAfH9+3b9/+////48cPuNehNsS7cDEzMTAwMMzb+Q2u4dOnT2vWrMHu9ZtzxP9vl/69RVpCkBlZ3N7enoDXBwEAAA+YYitOilMVAAAAAElFTkSuQmCC)](https://docs.pyansys.com/)[![pypi](https://img.shields.io/pypi/v/pyaedt.svg?logo=python&logoColor=white)](https://pypi.org/project/pyaedt/)[![PyPIact](https://pepy.tech/badge/pyaedt/month)](https://pypi.org/project/pyaedt/)[![PythonVersion](https://img.shields.io/badge/python-3.7+-blue.svg)](https://www.python.org/downloads/)[![GH-CI](https://github.com/ansys/pyaedt/actions/workflows/unit_tests.yml/badge.svg)](https://github.com/ansys/pyaedt/actions/workflows/unit_tests.yml)[![codecov](https://codecov.io/gh/ansys/pyaedt/branch/main/graph/badge.svg)](https://codecov.io/gh/ansys/pyaedt)[![MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/blog/license/mit)[![black](https://img.shields.io/badge/code%20style-black-000000.svg?style=flat)](https://github.com/psf/black)[![Anaconda](https://anaconda.org/conda-forge/pyaedt/badges/version.svg)](https://anaconda.org/conda-forge/pyaedt)[![pre-commit](https://results.pre-commit.ci/badge/github/ansys/pyaedt/main.svg)](https://results.pre-commit.ci/latest/github/ansys/pyaedt/main)
13+
[![PyAnsys](https://img.shields.io/badge/Py-Ansys-ffc107.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAABDklEQVQ4jWNgoDfg5mD8vE7q/3bpVyskbW0sMRUwofHD7Dh5OBkZGBgW7/3W2tZpa2tLQEOyOzeEsfumlK2tbVpaGj4N6jIs1lpsDAwMJ278sveMY2BgCA0NFRISwqkhyQ1q/Nyd3zg4OBgYGNjZ2ePi4rB5loGBhZnhxTLJ/9ulv26Q4uVk1NXV/f///////69du4Zdg78lx//t0v+3S88rFISInD59GqIH2esIJ8G9O2/XVwhjzpw5EAam1xkkBJn/bJX+v1365hxxuCAfH9+3b9/+////48cPuNehNsS7cDEzMTAwMMzb+Q2u4dOnT2vWrMHu9ZtzxP9vl/69RVpCkBlZ3N7enoDXBwEAAA+YYitOilMVAAAAAElFTkSuQmCC)](https://docs.pyansys.com/)[![pypi](https://img.shields.io/pypi/v/pyaedt.svg?logo=python&logoColor=white)](https://pypi.org/project/pyaedt/)[![PyPIact](https://pepy.tech/badge/pyaedt/month)](https://pypi.org/project/pyaedt/)[![PythonVersion](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/downloads/)[![GH-CI](https://github.com/ansys/pyaedt/actions/workflows/unit_tests.yml/badge.svg)](https://github.com/ansys/pyaedt/actions/workflows/unit_tests.yml)[![codecov](https://codecov.io/gh/ansys/pyaedt/branch/main/graph/badge.svg)](https://codecov.io/gh/ansys/pyaedt)[![MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/blog/license/mit)[![black](https://img.shields.io/badge/code%20style-black-000000.svg?style=flat)](https://github.com/psf/black)[![Anaconda](https://anaconda.org/conda-forge/pyaedt/badges/version.svg)](https://anaconda.org/conda-forge/pyaedt)[![pre-commit](https://results.pre-commit.ci/badge/github/ansys/pyaedt/main.svg)](https://results.pre-commit.ci/latest/github/ansys/pyaedt/main)
1414

1515
## PyAEDT 简介
1616

_unittest/conftest.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
settings.enable_desktop_logs = False
6363
settings.desktop_launch_timeout = 180
6464
settings.release_on_exception = False
65+
settings.wait_for_license = True
6566

6667
from ansys.aedt.core import Edb
6768
from ansys.aedt.core import Hfss
@@ -197,13 +198,16 @@ def _method(
197198
test_project = None
198199
if not application:
199200
application = Hfss
200-
return application(
201-
project=test_project,
202-
design=design_name,
203-
solution_type=solution_type,
204-
version=desktop_version,
205-
non_graphical=NONGRAPHICAL,
206-
)
201+
202+
args = {
203+
"project": test_project,
204+
"design": design_name,
205+
"version": desktop_version,
206+
"non_graphical": NONGRAPHICAL,
207+
}
208+
if solution_type:
209+
args["solution_type"] = solution_type
210+
return application(**args)
207211

208212
return _method
209213

0 commit comments

Comments
 (0)