Skip to content

Commit

Permalink
Merge branch 'main' into feat/dynamic_scrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
clatapie authored Mar 20, 2024
2 parents e30a4b0 + de433ad commit 4b47d9a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
1 change: 1 addition & 0 deletions .ci/display_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Quickly check if VTK off screen plotting works."""

import pyvista
from pyvista.plotting import system_supports_plotting

Expand Down
14 changes: 7 additions & 7 deletions .ci/start_mapdl.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
docker pull $MAPDL_IMAGE
docker pull "$MAPDL_IMAGE"
docker run \
--name mapdl \
--restart always \
Expand All @@ -8,16 +8,16 @@ docker run \
--health-retries=4 \
--health-timeout=0.5s \
--health-start-period=10s \
-e ANSYSLMD_LICENSE_FILE=1055@$LICENSE_SERVER \
-e ANSYSLMD_LICENSE_FILE=1055@"$LICENSE_SERVER" \
-e ANSYS_LOCK="OFF" \
-p $PYMAPDL_PORT:50052 \
-p $PYMAPDL_DB_PORT:50055 \
-p "$PYMAPDL_PORT":50052 \
-p "$PYMAPDL_DB_PORT":50055 \
--shm-size=1gb \
-e I_MPI_SHM_LMT=shm \
-e P_SCHEMA=/ansys_inc/ansys/ac4/schema \
--oom-kill-disable \
--memory=6656MB \
--memory-swap=16896MB \
$MAPDL_IMAGE \
-$DISTRIBUTED_MODE -np 2 > log.txt &
grep -q 'Server listening on' <(timeout 60 tail -f log.txt)
"$MAPDL_IMAGE" \
-"$DISTRIBUTED_MODE" -np 2 > log.txt &
grep -q 'Server listening on' <(timeout 60 tail -f log.txt)
4 changes: 2 additions & 2 deletions .github/workflows/ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
xvfb-run python .ci/display_test.py
- name: "Login in Github Container registry"
uses: docker/login-action@v3.0.0
uses: docker/login-action@v3.1.0
with:
registry: ghcr.io
username: ${{ secrets.GH_USERNAME }}
Expand Down Expand Up @@ -221,7 +221,7 @@ jobs:
dest: documentation-html.zip

- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
generate_release_notes: true
files: |
Expand Down
6 changes: 3 additions & 3 deletions requirements/requirements_doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ git+https://github.com/ansys/pymapdl@main
numpy==1.26.4
nest-asyncio==1.6.0
pandas==2.2.1
plotly==5.19.0
plotly==5.20.0
pythreejs==2.4.2
pyvista[jupyter]==0.43.3
pyvista[jupyter]==0.43.4
vtk==9.3.0

# Documentation dependencies
Sphinx==7.2.6
numpydoc==1.6.0
ansys-sphinx-theme==0.14.0
ansys-sphinx-theme==0.14.1
sphinx-copybutton==0.5.2
jupyter_sphinx==0.5.3
jupyterlab>=3.2.8
Expand Down

0 comments on commit 4b47d9a

Please sign in to comment.