diff --git a/.github/workflows/nightly-test-pyaedt.yml b/.github/workflows/nightly-test-pyaedt.yml new file mode 100644 index 0000000000..a7975ef584 --- /dev/null +++ b/.github/workflows/nightly-test-pyaedt.yml @@ -0,0 +1,77 @@ +name: Test pyedb as pyaedt dependency + +on: + # Schedule this workflow every day at UTC 3:00. + schedule: + - cron: '0 3 * * *' + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +env: + ANSYSLMD_LICENSE_FILE: ${{ format('1055@{0}', secrets.LICENSE_SERVER) }} + PYEDB_USE_LEGACY: '1' + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + + pyaedt-test: + name: "Check pyaedt tests when pyedb is used as a dependency" + runs-on: [ windows, pyedb, self-hosted ] + steps: + - name: Install Git and clone project + uses: actions/checkout@v4 + + - name: Set up Python + uses: ansys/actions/_setup-python@main + with: + python-version: '3.10' + use-cache: false + + - name: Create Python venv + run: | + python -m venv .venv + .\.venv\Scripts\Activate.ps1 + + - name: "Update pip" + run: | + .\.venv\Scripts\Activate.ps1 + python -m pip install -U pip + + - name: "Install Pyedb" + run: | + .\.venv\Scripts\Activate.ps1 + pip install --no-cache-dir . + + - name: "Clone pyaedt on specific branch" + uses: actions/checkout@v4 + with: + repository: ansys/pyaedt + path: "external/pyaedt" + ref: "maint/use_pyedb" + + - name: "Install Pyaedt" + run: | + .\.venv\Scripts\Activate.ps1 + pip install --no-cache-dir external/pyaedt[full] + + - name: "Install Pyaedt test dependencies" + run: | + .\.venv\Scripts\Activate.ps1 + pip install --no-cache-dir external/pyaedt[tests] + + - name: "Install specific vtk version with OSMesa bundled" + run: | + .\.venv\Scripts\Activate.ps1 + pip uninstall vtk -y + # Note: the vtk-osmesa used is 9.2.X as 9.3.0 is not working + # well with the use of pyvista in our tests atm. + # TODO: update once a stable versio is working + pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.2.20230527.dev0 + + - name: 'Pyaedt tests' + run: | + .\.venv\Scripts\Activate.ps1 + Set-Item -Path env:PYTHONMALLOC -Value "malloc" + pytest -n 6 --dist loadfile --durations=50 -vv --cov=pyaedt --cov-report=xml --cov-report=html --junitxml=junit/test-results.xml external\pyaedt\_unittest diff --git a/pyproject.toml b/pyproject.toml index 1b02656ff9..eefd353155 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -113,6 +113,7 @@ full = [ "osmnx", "pyvista==0.42.2; python_version > '3.7'", "pyvista==0.38.0; python_version <= '3.7'", + "vtk==9.2.6", "SRTM.py", "utm", "scikit-rf", diff --git a/src/pyedb/legacy/edb.py b/src/pyedb/legacy/edb.py index 91c6ed4680..a5cff828c2 100644 --- a/src/pyedb/legacy/edb.py +++ b/src/pyedb/legacy/edb.py @@ -175,7 +175,7 @@ def __init__( os.path.dirname(edbpath), "pyedb_" + os.path.splitext(os.path.split(edbpath)[-1])[0] + ".log" ) - if isaedtowned and (inside_desktop or settings.remote_api or settings.remote_rpc_session): + if isaedtowned and (inside_desktop or settings.remote_rpc_session): self.open_edb_inside_aedt() elif edbpath[-3:] in ["brd", "mcm", "gds", "xml", "dxf", "tgz"]: self.edbpath = edbpath[:-4] + ".aedb"