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 diff --git a/.devcontainer/codespaces-dev/requirements.txt b/.devcontainer/codespaces-dev/requirements.txt index 98ab828342..06cfbd7a31 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.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 f20ef9bb4c..50280a5ad3 100644 --- a/.devcontainer/codespaces-docs/requirements.txt +++ b/.devcontainer/codespaces-docs/requirements.txt @@ -1,4 +1,4 @@ -ansys-dpf-core==0.10.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 8b43beda39..d8610c191f 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.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..0e6e5f8ecb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,12 +29,10 @@ 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' - + ANSYS_DPF_ACCEPT_LA: "Y" BUILD_CHEATSHEET: True # Following env vars when changed will "reset" the mentioned cache, @@ -186,9 +184,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-server@v2.3 + with: + dpf-standalone-TOKEN: ${{secrets.PYANSYS_CI_BOT_TOKEN}} - name: "Getting files change filters" uses: dorny/paths-filter@v3 @@ -481,9 +481,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-server@v2.3 + with: + dpf-standalone-TOKEN: ${{secrets.PYANSYS_CI_BOT_TOKEN}} - name: "Getting files change filters" uses: dorny/paths-filter@v3 @@ -694,6 +696,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: | @@ -708,7 +716,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 diff --git a/.github/workflows/linkchecker.yml b/.github/workflows/linkchecker.yml index bbe761fd11..da8d2ea78b 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-server@v2.3 + with: + dpf-standalone-TOKEN: ${{secrets.PYANSYS_CI_BOT_TOKEN}} - name: "Pull, launch, and validate MAPDL service" id: start_mapdl diff --git a/doc/changelog.d/3082.dependencies.md b/doc/changelog.d/3082.dependencies.md new file mode 100644 index 0000000000..3ec6ead92c --- /dev/null +++ b/doc/changelog.d/3082.dependencies.md @@ -0,0 +1 @@ +build: update ansys-dpf-core \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 981ba88736..e38be5e048 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,7 @@ jupyter = [ ] tests = [ - "ansys-dpf-core==0.10.1", + "ansys-dpf-core==0.13.2", "ansys-tools-visualization-interface==0.5.0", "autopep8==2.3.1", "matplotlib==3.9.2", @@ -72,7 +72,7 @@ tests = [ "vtk==9.3.1", ] doc = [ - "ansys-dpf-core==0.10.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",