From f6bce0342430e1a9a67bf28e98c2770d1ff3cbc1 Mon Sep 17 00:00:00 2001 From: Sebastien Morais Date: Thu, 8 Aug 2024 09:51:11 +0200 Subject: [PATCH 1/2] CHORE: Update to use AEDT 24.2 --- .github/workflows/ci_cd.yml | 8 ++++---- doc/source/examples/antenna_toolkit_example.py | 2 +- doc/source/examples/create_antenna_simple.py | 2 +- tests/backend/conftest.py | 4 ++-- tests/backend/test_antenna_models_api/conftest.py | 2 +- tests/backend/tests_toolkit_api/conftest.py | 2 +- tests/backend/tests_toolkit_rest_api/conftest.py | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index dd107e7da..5c4e45a56 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -220,7 +220,7 @@ jobs: runs-on: [self-hosted, pyaedt, toolkits, Linux] needs: [ smoke-tests ] env: - ANSYSEM_ROOT241: '/ansys_inc/AnsysEM/v241/Linux64' + ANSYSEM_ROOT242: '/ansys_inc/AnsysEM/v242/Linux64' ANS_NODEPCHECK: '1' steps: - uses: actions/checkout@v4 @@ -248,7 +248,7 @@ jobs: - name: Antenna models testing timeout-minutes: 5 run: | - export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT241 }}/common/mono/Linux64/lib64:${{ env.ANSYSEM_ROOT241 }}/Delcross:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT242 }}/common/mono/Linux64/lib64:${{ env.ANSYSEM_ROOT242 }}/Delcross:$LD_LIBRARY_PATH source .venv_linux/bin/activate pytest -v -m antenna_models_common_api pytest -v -m antenna_models_api @@ -256,14 +256,14 @@ jobs: - name: Toolkit API testing timeout-minutes: 30 run: | - export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT241 }}/common/mono/Linux64/lib64:${{ env.ANSYSEM_ROOT241 }}/Delcross:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT242 }}/common/mono/Linux64/lib64:${{ env.ANSYSEM_ROOT242 }}/Delcross:$LD_LIBRARY_PATH source .venv_linux/bin/activate pytest -v -m antenna_toolkit_api - name: Toolkit REST API testing timeout-minutes: 30 run: | - export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT241 }}/common/mono/Linux64/lib64:${{ env.ANSYSEM_ROOT241 }}/Delcross:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT242 }}/common/mono/Linux64/lib64:${{ env.ANSYSEM_ROOT242 }}/Delcross:$LD_LIBRARY_PATH source .venv_linux/bin/activate pytest -v -m antenna_toolkit_rest_api diff --git a/doc/source/examples/antenna_toolkit_example.py b/doc/source/examples/antenna_toolkit_example.py index 725d69f02..8608c08e7 100644 --- a/doc/source/examples/antenna_toolkit_example.py +++ b/doc/source/examples/antenna_toolkit_example.py @@ -18,7 +18,7 @@ # # Set AEDT version. -aedt_version = "2024.1" +aedt_version = "2024.2" # ## Set non-graphical mode # diff --git a/doc/source/examples/create_antenna_simple.py b/doc/source/examples/create_antenna_simple.py index c48e069ba..450c8f539 100644 --- a/doc/source/examples/create_antenna_simple.py +++ b/doc/source/examples/create_antenna_simple.py @@ -18,7 +18,7 @@ # # Set AEDT version. -aedt_version = "2024.1" +aedt_version = "2024.2" # ## Set non-graphical mode # diff --git a/tests/backend/conftest.py b/tests/backend/conftest.py index f975f4d99..d930f29a8 100644 --- a/tests/backend/conftest.py +++ b/tests/backend/conftest.py @@ -28,7 +28,7 @@ The default configuration can be changed by placing a file called local_config.json in the same directory as this module. An example of the contents of local_config.json { - "desktop_version": "2024.1", + "desktop_version": "2024.2", "non_graphical": false, "use_grpc": true } @@ -49,7 +49,7 @@ import pytest DEFAULT_CONFIG = { - "desktop_version": "2024.1", + "desktop_version": "2024.2", "non_graphical": True, "use_grpc": True, "debug": False diff --git a/tests/backend/test_antenna_models_api/conftest.py b/tests/backend/test_antenna_models_api/conftest.py index ab28a0ef8..d8438432a 100644 --- a/tests/backend/test_antenna_models_api/conftest.py +++ b/tests/backend/test_antenna_models_api/conftest.py @@ -32,7 +32,7 @@ An example of the contents of local_config.json: { - "desktop_version": "2024.1", + "desktop_version": "2024.2", "non_graphical": false, "use_grpc": true } diff --git a/tests/backend/tests_toolkit_api/conftest.py b/tests/backend/tests_toolkit_api/conftest.py index a5b088646..e2615804b 100644 --- a/tests/backend/tests_toolkit_api/conftest.py +++ b/tests/backend/tests_toolkit_api/conftest.py @@ -32,7 +32,7 @@ An example of the contents of local_config.json: { - "desktop_version": "2024.1", + "desktop_version": "2024.2", "non_graphical": false, "use_grpc": true } diff --git a/tests/backend/tests_toolkit_rest_api/conftest.py b/tests/backend/tests_toolkit_rest_api/conftest.py index b8a8e328e..9205c3140 100644 --- a/tests/backend/tests_toolkit_rest_api/conftest.py +++ b/tests/backend/tests_toolkit_rest_api/conftest.py @@ -32,7 +32,7 @@ An example of the contents of local_config.json: { - "desktop_version": "2024.1", + "desktop_version": "2024.2", "non_graphical": false, "use_grpc": true } From 4bb9ce8f2fb0d71fa6e7ca485c0323a0b33cc79b Mon Sep 17 00:00:00 2001 From: Sebastien Morais Date: Mon, 12 Aug 2024 11:31:52 +0200 Subject: [PATCH 2/2] CI: Do not use cached directory --- .github/workflows/ci_cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 5c4e45a56..c30c75fae 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -242,7 +242,7 @@ jobs: python -c "import sys; print(sys.executable)" python -m pip install --upgrade pip pip install --upgrade build wheel - pip install .[tests] + pip install --no-cache-dir .[tests] pip install --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org pytest-azurepipelines - name: Antenna models testing