Skip to content

Commit

Permalink
Merge branch 'main' into field_summary_enhancement
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenzovecchietti authored Apr 29, 2024
2 parents 1d3f633 + 7104268 commit 211462f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
13 changes: 7 additions & 6 deletions _unittest_solvers/test_26_emit.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import pytest

from pyaedt import Emit
from pyaedt import generate_unique_project_name
from pyaedt.emit_core.emit_constants import EmiCategoryFilter
from pyaedt.emit_core.emit_constants import InterfererType
from pyaedt.emit_core.emit_constants import ResultType
Expand Down Expand Up @@ -373,7 +374,7 @@ def test_07_antenna_component(self, add_app):
reason="Skipped on versions earlier than 2023.2",
)
def test_08_revision_generation(self, add_app):
self.aedtapp = add_app(application=Emit)
self.aedtapp = add_app(application=Emit, project_name=generate_unique_project_name())
assert len(self.aedtapp.results.revisions) == 0
# place components and generate the appropriate number of revisions
rad1 = self.aedtapp.modeler.components.create_component("UE - Handheld")
Expand Down Expand Up @@ -443,7 +444,7 @@ def test_08_revision_generation(self, add_app):
reason="Skipped on versions earlier than 2023.2",
)
def test_09_manual_revision_access_test_getters(self, add_app):
self.aedtapp = add_app(application=Emit)
self.aedtapp = add_app(application=Emit, project_name=generate_unique_project_name())
rad1 = self.aedtapp.modeler.components.create_component("UE - Handheld")
ant1 = self.aedtapp.modeler.components.create_component("Antenna")
rad2 = self.aedtapp.modeler.components.create_component("Bluetooth")
Expand Down Expand Up @@ -512,7 +513,7 @@ def test_09_manual_revision_access_test_getters(self, add_app):
reason="Skipped on versions earlier than 2023.2",
)
def test_10_radio_band_getters(self, add_app):
self.aedtapp = add_app(application=Emit)
self.aedtapp = add_app(application=Emit, project_name=generate_unique_project_name())
rad1, ant1 = self.aedtapp.modeler.components.create_radio_antenna("New Radio")
rad2, ant2 = self.aedtapp.modeler.components.create_radio_antenna("Bluetooth Low Energy (LE)")
rad3, ant3 = self.aedtapp.modeler.components.create_radio_antenna("WiFi - 802.11-2012")
Expand Down Expand Up @@ -729,7 +730,7 @@ def test_14_version(self, add_app):
reason="Skipped on versions earlier than 2023.2",
)
def test_15_basic_run(self, add_app):
self.aedtapp = add_app(application=Emit)
self.aedtapp = add_app(application=Emit, project_name=generate_unique_project_name())
assert len(self.aedtapp.results.revisions) == 0
# place components and generate the appropriate number of revisions
rad1 = self.aedtapp.modeler.components.create_component("UE - Handheld")
Expand Down Expand Up @@ -811,7 +812,7 @@ def test_15_basic_run(self, add_app):
reason="Skipped on versions earlier than 2024.1",
)
def test_16_optimal_n_to_1_feature(self, add_app):
self.aedtapp = add_app(application=Emit)
self.aedtapp = add_app(application=Emit, project_name=generate_unique_project_name())
# place components and generate the appropriate number of revisions
rad1 = self.aedtapp.modeler.components.create_component("Bluetooth")
ant1 = self.aedtapp.modeler.components.create_component("Antenna")
Expand Down Expand Up @@ -867,7 +868,7 @@ def test_16_optimal_n_to_1_feature(self, add_app):
reason="Skipped on versions earlier than 2023.2",
)
def test_17_availability_1_to_1(self, add_app):
self.aedtapp = add_app(application=Emit)
self.aedtapp = add_app(application=Emit, project_name=generate_unique_project_name())
# place components and generate the appropriate number of revisions
rad1 = self.aedtapp.modeler.components.create_component("MD400C")
ant1 = self.aedtapp.modeler.components.create_component("Antenna")
Expand Down
3 changes: 0 additions & 3 deletions pyaedt/emit.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import warnings

from pyaedt import emit_core
from pyaedt import generate_unique_project_name
from pyaedt.application.Design import Design
from pyaedt.emit_core.Couplings import CouplingsEmit
from pyaedt.emit_core.emit_constants import EMIT_VALID_UNITS
Expand Down Expand Up @@ -114,8 +113,6 @@ def __init__(
port=0,
aedt_process_id=None,
):
if projectname is None:
projectname = generate_unique_project_name()
self.__emit_api_enabled = False
self.results = None
"""Constructor for the ``FieldAnalysisEmit`` class"""
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ tests = [
"pytest-cov>=4.0.0,<5.1",
"pytest-xdist>=3.5.0,<3.7",
"pyedb>=0.4.0,<0.9; python_version == '3.7'",
"pyedb>=0.5.0,<0.9; python_version > '3.7'",
"pyedb>=0.5.0,<0.10; python_version > '3.7'",
"pyvista>=0.38.0,<0.44",
"scikit-learn>=1.0.0,<1.5",
"scikit-rf>=0.30.0,<1.1",
Expand All @@ -70,7 +70,7 @@ doc = [
"imageio>=2.30.0,<2.35",
#"imageio-ffmpeg>=0.4.0,<0.5",
"ipython>=7.34.0; python_version == '3.7'",
"ipython>=8.13.0,<8.24; python_version > '3.7'",
"ipython>=8.13.0,<8.25; python_version > '3.7'",
#"ipywidgets>=8.0.0,<8.2",
"joblib>=1.3.0,<1.5",
"jupyterlab>=4.0.0,<4.3",
Expand Down

0 comments on commit 211462f

Please sign in to comment.