Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: update ansys-dpf-core #3082

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

build: update ansys-dpf-core #3082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5e0387a
Update ansys-dpf-core
germa89 May 10, 2024
bf887ba
Merge branch 'main' into maint/update-dpf-test
germa89 Jul 8, 2024
0bfc6b6
chore: adding changelog file 3082.dependencies.md
pyansys-ci-bot Jul 8, 2024
2b093f9
chore: merge remote-tracking branch 'origin/main' into maint/update-d…
germa89 Nov 25, 2024
a075b71
feat: using dpf action and latest version
germa89 Nov 25, 2024
ba09706
fix: using server installation
germa89 Nov 25, 2024
a648a24
fix: running dpf tests in local
germa89 Nov 25, 2024
63ffb7c
fix: adding dpf env var
germa89 Nov 25, 2024
a282e9d
fix: removing dpf unused env vars
germa89 Nov 25, 2024
905693c
Merge branch 'main' into maint/update-dpf-test
germa89 Nov 26, 2024
e6bee75
ci: removing check DPF port
germa89 Nov 26, 2024
70a0af8
Merge branch 'maint/update-dpf-test' of https://github.com/ansys/pyma…
germa89 Nov 26, 2024
05950e6
chore: adding changelog file 3082.dependencies.md [dependabot-skip]
pyansys-ci-bot Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .ci/waiting_services.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
2 changes: 1 addition & 1 deletion .devcontainer/codespaces-dev/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/codespaces-docs/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer-local/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
28 changes: 18 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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/[email protected]
with:
dpf-standalone-TOKEN: ${{secrets.PYANSYS_CI_BOT_TOKEN}}

- name: "Getting files change filters"
uses: dorny/paths-filter@v3
Expand Down Expand Up @@ -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/[email protected]
with:
dpf-standalone-TOKEN: ${{secrets.PYANSYS_CI_BOT_TOKEN}}

- name: "Getting files change filters"
uses: dorny/paths-filter@v3
Expand Down Expand Up @@ -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/[email protected]
with:
dpf-standalone-TOKEN: ${{secrets.PYANSYS_CI_BOT_TOKEN}}

- name: "Unit testing requirements installation"
run: |
Expand All @@ -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
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/linkchecker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
dpf-standalone-TOKEN: ${{secrets.PYANSYS_CI_BOT_TOKEN}}

- name: "Pull, launch, and validate MAPDL service"
id: start_mapdl
Expand Down
1 change: 1 addition & 0 deletions doc/changelog.d/3082.dependencies.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: update ansys-dpf-core
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
Loading