From 5e0387a7560e10e0a2d26c7b087c802607f30742 Mon Sep 17 00:00:00 2001 From: German Date: Fri, 10 May 2024 11:28:03 +0200 Subject: [PATCH 1/9] Update ansys-dpf-core --- .devcontainer/codespaces-dev/requirements.txt | 2 +- .devcontainer/codespaces-docs/requirements.txt | 2 +- .devcontainer/devcontainer-local/requirements.txt | 2 +- pyproject.toml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.devcontainer/codespaces-dev/requirements.txt b/.devcontainer/codespaces-dev/requirements.txt index d4351baf78..7c6626487a 100644 --- a/.devcontainer/codespaces-dev/requirements.txt +++ b/.devcontainer/codespaces-dev/requirements.txt @@ -1,4 +1,4 @@ -ansys-dpf-core==0.10.1 +ansys-dpf-core==0.12.1 autopep8==2.1.0 matplotlib==3.8.4 scipy==1.13.0 diff --git a/.devcontainer/codespaces-docs/requirements.txt b/.devcontainer/codespaces-docs/requirements.txt index bffda2453b..9f229fd365 100644 --- a/.devcontainer/codespaces-docs/requirements.txt +++ b/.devcontainer/codespaces-docs/requirements.txt @@ -1,5 +1,5 @@ sphinx==7.3.7 -ansys-dpf-core==0.10.1 +ansys-dpf-core==0.12.1 ansys-mapdl-reader==0.53.0 ansys-sphinx-theme==0.15.2 grpcio==1.63.0 diff --git a/.devcontainer/devcontainer-local/requirements.txt b/.devcontainer/devcontainer-local/requirements.txt index d4351baf78..7c6626487a 100644 --- a/.devcontainer/devcontainer-local/requirements.txt +++ b/.devcontainer/devcontainer-local/requirements.txt @@ -1,4 +1,4 @@ -ansys-dpf-core==0.10.1 +ansys-dpf-core==0.12.1 autopep8==2.1.0 matplotlib==3.8.4 scipy==1.13.0 diff --git a/pyproject.toml b/pyproject.toml index 41b3a750be..55dcf1ed25 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,7 +62,7 @@ jupyter = [ ] tests = [ - "ansys-dpf-core==0.10.1", + "ansys-dpf-core==0.12.1", "autopep8==2.1.0", "matplotlib==3.8.4", "scipy==1.13.0", @@ -79,7 +79,7 @@ tests = [ ] doc = [ "sphinx==7.3.7", - "ansys-dpf-core==0.10.1", + "ansys-dpf-core==0.12.1", "ansys-mapdl-reader==0.53.0", "ansys-sphinx-theme==0.15.2", "grpcio==1.63.0", From 0bfc6b6f3b179d494a3acf337fbfa8b32c66e084 Mon Sep 17 00:00:00 2001 From: pyansys-ci-bot <92810346+pyansys-ci-bot@users.noreply.github.com> Date: Mon, 8 Jul 2024 16:12:42 +0000 Subject: [PATCH 2/9] chore: adding changelog file 3082.dependencies.md --- doc/changelog.d/3082.dependencies.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/changelog.d/3082.dependencies.md diff --git a/doc/changelog.d/3082.dependencies.md b/doc/changelog.d/3082.dependencies.md new file mode 100644 index 0000000000..1d1e3fa0f0 --- /dev/null +++ b/doc/changelog.d/3082.dependencies.md @@ -0,0 +1 @@ +Update ansys-dpf-core \ No newline at end of file From a075b7164530a3abb4bfd901edee72175ab6b057 Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Mon, 25 Nov 2024 20:43:43 +0100 Subject: [PATCH 3/9] feat: using dpf action and latest version --- .devcontainer/codespaces-dev/requirements.txt | 2 +- .devcontainer/codespaces-docs/requirements.txt | 2 +- .../devcontainer-local/requirements.txt | 2 +- .github/workflows/ci.yml | 16 ++++++++++------ .github/workflows/linkchecker.yml | 8 +++++--- pyproject.toml | 4 ++-- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.devcontainer/codespaces-dev/requirements.txt b/.devcontainer/codespaces-dev/requirements.txt index 6fa6a461c4..06cfbd7a31 100644 --- a/.devcontainer/codespaces-dev/requirements.txt +++ b/.devcontainer/codespaces-dev/requirements.txt @@ -1,4 +1,4 @@ -ansys-dpf-core==0.12.1 +ansys-dpf-core==0.13.2 ansys-tools-visualization-interface==0.2.6 autopep8==2.3.1 matplotlib==3.9.0 diff --git a/.devcontainer/codespaces-docs/requirements.txt b/.devcontainer/codespaces-docs/requirements.txt index 94cbfa6012..50280a5ad3 100644 --- a/.devcontainer/codespaces-docs/requirements.txt +++ b/.devcontainer/codespaces-docs/requirements.txt @@ -1,4 +1,4 @@ -ansys-dpf-core==0.12.1 +ansys-dpf-core==0.13.2 ansys-mapdl-reader==0.53.0 ansys-sphinx-theme==0.16.6 ansys-tools-visualization-interface==0.2.6 diff --git a/.devcontainer/devcontainer-local/requirements.txt b/.devcontainer/devcontainer-local/requirements.txt index 905b27cfb8..d8610c191f 100644 --- a/.devcontainer/devcontainer-local/requirements.txt +++ b/.devcontainer/devcontainer-local/requirements.txt @@ -1,4 +1,4 @@ -ansys-dpf-core==0.12.1 +ansys-dpf-core==0.13.2 ansys-mapdl-reader==0.53.0 ansys-sphinx-theme==0.16.6 ansys-tools-visualization-interface==0.2.6 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 888deef9e0..131e8281de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -186,9 +186,11 @@ jobs: echo "Launching MAPDL service at PID: $DOCKER_PID" echo "DOCKER_PID=$(echo $DOCKER_PID)" >> $GITHUB_OUTPUT - - name: "DPF server activation" - run: | - $(docker pull ghcr.io/ansys/dpf-core:22.2dev && docker run -d --name dpfserver -p ${{ env.DPF_PORT }}:50052 ghcr.io/ansys/dpf-core:22.2dev && echo "DPF Server active on port ${{ env.DPF_PORT }}.") & + - name: "Install DPF" + id: set-server-path + uses: ansys/pydpf-actions/install-dpf-docker@v2.3 + with: + dpf-standalone-TOKEN: ${{secrets.PYANSYS_CI_BOT_TOKEN}} - name: "Getting files change filters" uses: dorny/paths-filter@v3 @@ -481,9 +483,11 @@ jobs: echo "DOCKER_PID_0=$(echo $DOCKER_PID_0)" >> $GITHUB_OUTPUT echo "DOCKER_PID_1=$(echo $DOCKER_PID_1)" >> $GITHUB_OUTPUT - - name: "DPF server activation" - run: | - $(docker pull ghcr.io/ansys/dpf-core:22.2dev && docker run -d --name dpfserver -p ${{ env.DPF_PORT }}:50052 ghcr.io/ansys/dpf-core:22.2dev && echo "DPF Server active on port ${{ env.DPF_PORT }}.") & + - name: "Install DPF" + id: set-server-path + uses: ansys/pydpf-actions/install-dpf-docker@v2.3 + with: + dpf-standalone-TOKEN: ${{secrets.PYANSYS_CI_BOT_TOKEN}} - name: "Getting files change filters" uses: dorny/paths-filter@v3 diff --git a/.github/workflows/linkchecker.yml b/.github/workflows/linkchecker.yml index bbe761fd11..bfb50b2418 100644 --- a/.github/workflows/linkchecker.yml +++ b/.github/workflows/linkchecker.yml @@ -40,9 +40,11 @@ jobs: username: ${{ secrets.GH_USERNAME }} password: ${{ secrets.GITHUB_TOKEN }} - - name: "DPF server activation" - run: | - $(docker pull ghcr.io/ansys/dpf-core:22.2dev && docker run -d --name dpfserver -p ${{ env.DPF_PORT }}:50052 ghcr.io/ansys/dpf-core:22.2dev && echo "DPF Server active on port ${{ env.DPF_PORT }}.") & + - name: "Install DPF" + id: set-server-path + uses: ansys/pydpf-actions/install-dpf-docker@v2.3 + with: + dpf-standalone-TOKEN: ${{secrets.PYANSYS_CI_BOT_TOKEN}} - name: "Pull, launch, and validate MAPDL service" id: start_mapdl diff --git a/pyproject.toml b/pyproject.toml index ce1cfd8dee..80cb4e6daa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,7 +56,7 @@ jupyter = [ ] tests = [ - "ansys-dpf-core==0.12.1", + "ansys-dpf-core==0.13.2", "ansys-tools-visualization-interface==0.5.0", "autopep8==2.3.1", "matplotlib==3.9.2", @@ -74,7 +74,7 @@ tests = [ "vtk==9.3.1", ] doc = [ - "ansys-dpf-core==0.12.1", + "ansys-dpf-core==0.13.2", "ansys-mapdl-reader==0.54.2", "ansys-sphinx-theme==1.2.2", "ansys-tools-visualization-interface==0.5.0", From ba0970631c4e792b2eb3a9238f30a88362abaa06 Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Mon, 25 Nov 2024 22:24:11 +0100 Subject: [PATCH 4/9] fix: using server installation --- .github/workflows/ci.yml | 4 ++-- .github/workflows/linkchecker.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 131e8281de..fee4dc4b9a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -188,7 +188,7 @@ jobs: - name: "Install DPF" id: set-server-path - uses: ansys/pydpf-actions/install-dpf-docker@v2.3 + uses: ansys/pydpf-actions/install-dpf-server@v2.3 with: dpf-standalone-TOKEN: ${{secrets.PYANSYS_CI_BOT_TOKEN}} @@ -485,7 +485,7 @@ jobs: - name: "Install DPF" id: set-server-path - uses: ansys/pydpf-actions/install-dpf-docker@v2.3 + uses: ansys/pydpf-actions/install-dpf-server@v2.3 with: dpf-standalone-TOKEN: ${{secrets.PYANSYS_CI_BOT_TOKEN}} diff --git a/.github/workflows/linkchecker.yml b/.github/workflows/linkchecker.yml index bfb50b2418..da8d2ea78b 100644 --- a/.github/workflows/linkchecker.yml +++ b/.github/workflows/linkchecker.yml @@ -42,7 +42,7 @@ jobs: - name: "Install DPF" id: set-server-path - uses: ansys/pydpf-actions/install-dpf-docker@v2.3 + uses: ansys/pydpf-actions/install-dpf-server@v2.3 with: dpf-standalone-TOKEN: ${{secrets.PYANSYS_CI_BOT_TOKEN}} From a648a2410ed14ce0cfe240624068afd55e52fcfc Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Mon, 25 Nov 2024 22:25:34 +0100 Subject: [PATCH 5/9] fix: running dpf tests in local --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fee4dc4b9a..d9f1890d99 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -698,6 +698,12 @@ jobs: python -m build python -m pip install dist/*.whl xvfb-run python -c "from ansys.mapdl import core as pymapdl; print(pymapdl.Report())" + + - name: "Install DPF" + id: set-server-path + uses: ansys/pydpf-actions/install-dpf-server@v2.3 + with: + dpf-standalone-TOKEN: ${{secrets.PYANSYS_CI_BOT_TOKEN}} - name: "Unit testing requirements installation" run: | @@ -712,7 +718,7 @@ jobs: echo "ON_STUDENT: $ON_STUDENT" unset PYMAPDL_PORT unset PYMAPDL_START_INSTANCE - xvfb-run pytest -k "not test_dpf" \ + xvfb-run pytest \ ${{ env.PYTEST_ARGUMENTS }} \ --reset_only_failed --add_missing_images \ --cov-report=xml:${{ matrix.mapdl-version }}-local.xml From 63ffb7c1ff78d49b71ce242f0b23cb651323f8bc Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Mon, 25 Nov 2024 22:26:51 +0100 Subject: [PATCH 6/9] fix: adding dpf env var --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9f1890d99..efb6730697 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ env: MAPDL_PACKAGE: ghcr.io/ansys/mapdl ON_CI: True PYTEST_ARGUMENTS: '-vvv -rxXsa --color=yes --durations=10 --random-order --random-order-bucket=class --maxfail=10 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html' - + ANSYS_DPF_ACCEPT_LA: "Y" BUILD_CHEATSHEET: True # Following env vars when changed will "reset" the mentioned cache, From a282e9d5b45d6d11e54db36c60525a537c10a579 Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Mon, 25 Nov 2024 22:27:53 +0100 Subject: [PATCH 7/9] fix: removing dpf unused env vars --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index efb6730697..0e6e5f8ecb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,8 +29,6 @@ env: MEILISEARCH_API_KEY: ${{ secrets.MEILISEARCH_API_KEY }} MEILISEARCH_PUBLIC_API_KEY: ${{ secrets.MEILISEARCH_PUBLIC_API_KEY }} PYANSYS_OFF_SCREEN: True - DPF_START_SERVER: False - DPF_PORT: 21004 MAPDL_PACKAGE: ghcr.io/ansys/mapdl ON_CI: True PYTEST_ARGUMENTS: '-vvv -rxXsa --color=yes --durations=10 --random-order --random-order-bucket=class --maxfail=10 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html' From e6bee75f4e504be77a9e18fd7e67dbd8fd0c8617 Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:46:20 +0100 Subject: [PATCH 8/9] ci: removing check DPF port --- .ci/waiting_services.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.ci/waiting_services.sh b/.ci/waiting_services.sh index b2050ef89d..5dbb241d88 100755 --- a/.ci/waiting_services.sh +++ b/.ci/waiting_services.sh @@ -10,10 +10,3 @@ sleep 0.1 done echo "::endgroup::" echo "MAPDL service is up!" - -echo "::group:: Waiting for the DPF port to be open..." -while ! nc -z localhost "$DPF_PORT"; do - sleep 0.1 -done -echo "::endgroup::" -echo "DPF service is up!" \ No newline at end of file From 05950e69149be41e3ea000043b6e5292279be55b Mon Sep 17 00:00:00 2001 From: pyansys-ci-bot <92810346+pyansys-ci-bot@users.noreply.github.com> Date: Tue, 26 Nov 2024 10:59:59 +0000 Subject: [PATCH 9/9] chore: adding changelog file 3082.dependencies.md [dependabot-skip] --- doc/changelog.d/3082.dependencies.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changelog.d/3082.dependencies.md b/doc/changelog.d/3082.dependencies.md index 1d1e3fa0f0..3ec6ead92c 100644 --- a/doc/changelog.d/3082.dependencies.md +++ b/doc/changelog.d/3082.dependencies.md @@ -1 +1 @@ -Update ansys-dpf-core \ No newline at end of file +build: update ansys-dpf-core \ No newline at end of file