Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions .devcontainer/codespaces-dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ ENV ON_CODESPACES=true
ENV CODESPACES_MODE=dev

# Installing libs for testing and docs
RUN apt-get -qq update && apt install -qq -y libgl1-mesa-glx xvfb libgomp1 && \
RUN apt-get -qq update && apt install -qq -y
libgl1-mesa-glx \
libgomp1 \
python3-pip \
python3.11-venv \
xvfb \
&& \
apt-get -qq clean && rm -rf /var/lib/apt/lists/* && \
usermod -s /bin/bash $USERNAME && \
usermod -a -G sudo $USERNAME && \
Expand All @@ -33,7 +39,7 @@ USER $USERNAME
COPY requirements.txt requirements.txt

# Installing Python environment
RUN python3.10 -m venv ./.venv && \
RUN python3.11 -m venv ./.venv && \
. ./.venv/bin/activate && \
pip install pre-commit && \
pip install ansys-mapdl-core && \
Expand Down
16 changes: 9 additions & 7 deletions .devcontainer/codespaces-dev/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
ansys-dpf-core==0.10.1
ansys-tools-visualization-interface==0.8.3
autopep8==2.3.1
matplotlib==3.9.2
autopep8==2.3.2
matplotlib==3.10.1
pandas==2.2.3
pyansys-tools-report==0.8.1
pyfakefs==5.7.1
pyansys-tools-report==0.8.2
pyfakefs==5.8.0
pyiges[full]==0.3.1
pytest-cov==6.0.0
pytest-memprof<0.3.0
pytest-profiling==1.8.1
pytest-pyvista==0.1.9
pytest-random-order==1.1.1
pytest-reportlog==0.4.0
pytest-rerunfailures==15.0
pytest==8.3.3
scipy==1.14.1
pytest-timeout==2.3.1
pytest==8.3.5
scipy==1.15.2
vtk==9.3.1
16 changes: 14 additions & 2 deletions .devcontainer/codespaces-docs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ghcr.io/ansys/mapdl:v24.1-ubuntu-student

ENV USERNAME=mapdl
USER root

Expand All @@ -8,7 +9,18 @@ ENV ON_CODESPACES=true
ENV CODESPACES_MODE=docs

# Installing libs for testing and docs
RUN apt-get -qq update && apt install -qq -y zip pandoc libgl1-mesa-glx xvfb texlive-latex-extra latexmk graphviz texlive-xetex && \
RUN apt-get -qq update && apt install -qq -y \
graphviz \
latexmk \
libgl1-mesa-glx \
pandoc \
python3-pip \
python3.11-venv \
texlive-latex-extra \
texlive-xetex \
xvfb \
zip \
&& \
apt-get -qq clean && rm -rf /var/lib/apt/lists/* && \
usermod -s /bin/bash $USERNAME && \
usermod -a -G sudo $USERNAME && \
Expand All @@ -32,7 +44,7 @@ USER $USERNAME
COPY requirements.txt requirements.txt

# Installing Python environment
RUN python3.10 -m venv ./.venv && \
RUN python3.11 -m venv ./.venv && \
. ./.venv/bin/activate && \
pip install pre-commit && \
pip install ansys-mapdl-core && \
Expand Down
23 changes: 12 additions & 11 deletions .devcontainer/codespaces-docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
ansys-dpf-core==0.10.1
ansys-mapdl-reader==0.54.2
ansys-sphinx-theme==0.16.6
ansys-sphinx-theme==1.4.2
ansys-tools-visualization-interface==0.8.3
grpcio==1.68.0
imageio-ffmpeg==0.5.1
imageio==2.36.0
grpcio==1.70.0
imageio-ffmpeg==0.6.0
imageio==2.37.0
jupyter_sphinx==0.5.3
jupyter==1.1.1
jupyterlab>=3.2.8
matplotlib==3.9.2
matplotlib==3.10.1
nbformat==5.10.4
numpydoc==1.8.0
pandas==2.2.3
plotly==5.24.1
plotly==6.0.1
pyiges[full]==0.3.1
pypandoc==1.14
pypandoc==1.15
pytest-sphinx==0.6.3
pythreejs==2.4.2
sphinx-autobuild==2024.10.3
sphinx-autodoc-typehints==3.1.0
sphinx-copybutton==0.5.2
sphinx-design==0.6.1
sphinx-gallery==0.18.0
sphinx-gallery==0.19.0
sphinx-jinja==2.0.2
sphinx-notfound-page==1.0.4
sphinx-reredirects==0.1.4
sphinx==8.1.3
sphinx-notfound-page==1.1.0
sphinx==8.2.3
sphinxcontrib-websupport==2.0.0
sphinxemoji==0.3.1
vtk==9.3.1
18 changes: 15 additions & 3 deletions .devcontainer/devcontainer-local/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/ansys/mapdl:v24.1-ubuntu-student
FROM ghcr.io/ansys/mapdl:v25.2-ubuntu-cicd

ENV USERNAME=mapdl
USER root
Expand All @@ -8,7 +8,19 @@ ENV DEBIAN_FRONTEND=noninteractive
ENV ON_CODESPACES=false

# Installing libs for testing and docs
RUN apt-get -qq update && apt-get install -qq -y libgl1-mesa-glx xvfb libgomp1 zip pandoc libgl1-mesa-glx xvfb texlive-latex-extra latexmk graphviz texlive-xetex && \
RUN apt-get -qq update && apt-get install -qq -y \
graphviz \
latexmk \
libgl1-mesa-glx \
libgomp1 \
pandoc \
python3-pip \
python3.11-venv \
texlive-latex-extra \
texlive-xetex \
xvfb \
zip \
&& \
apt-get -qq clean && rm -rf /var/lib/apt/lists/* && \
usermod -s /bin/bash $USERNAME && \
usermod -a -G sudo $USERNAME
Expand All @@ -31,7 +43,7 @@ USER $USERNAME
COPY requirements.txt requirements.txt

# Installing Python environment
RUN python3.10 -m venv ./.venv && \
RUN python3.11 -m venv ./.venv && \
. ./.venv/bin/activate && \
pip install pre-commit && \
pip install ansys-mapdl-core && \
Expand Down
41 changes: 23 additions & 18 deletions .devcontainer/devcontainer-local/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,38 +1,43 @@

ansys-dpf-core==0.10.1
ansys-mapdl-reader==0.54.2
ansys-sphinx-theme==1.2.2
ansys-sphinx-theme==1.4.2
ansys-tools-visualization-interface==0.8.3
autopep8==2.3.1
grpcio==1.68.0
imageio-ffmpeg==0.5.1
imageio==2.36.0
autopep8==2.3.2
grpcio==1.70.0
imageio-ffmpeg==0.6.0
imageio==2.37.0
jupyter_sphinx==0.5.3
jupyter==1.1.1
jupyterlab>=3.2.8
matplotlib==3.9.2
matplotlib==3.10.1
nbformat==5.10.4
numpydoc==1.8.0
pandas==2.2.3
plotly==5.24.1
pyansys-tools-report==0.8.1
pyfakefs==5.7.1
plotly==6.0.1
pyansys-tools-report==0.8.2
pyfakefs==5.8.0
pyiges[full]==0.3.1
pypandoc==1.14
pypandoc==1.15
pytest-cov==6.0.0
pytest-memprof<0.3.0
pytest-profiling==1.8.1
pytest-pyvista==0.1.9
pytest-random-order==1.1.1
pytest-reportlog==0.4.0
pytest-rerunfailures==15.0
pytest-sphinx==0.6.3
pytest==8.3.3
pytest-timeout==2.3.1
pytest==8.3.5
pythreejs==2.4.2
scipy==1.14.1
scipy==1.15.2
sphinx-autobuild==2024.10.3
sphinx-autodoc-typehints==3.1.0
sphinx-copybutton==0.5.2
sphinx-design==0.6.1
sphinx-gallery==0.18.0
sphinx-gallery==0.19.0
sphinx-jinja==2.0.2
sphinx-notfound-page==1.0.4
sphinx-reredirects==0.1.4
sphinx==8.1.3
sphinx-notfound-page==1.1.0
sphinx==8.2.3
sphinxcontrib-websupport==2.0.0
sphinxemoji==0.3.1
sphinxemoji==0.3.1
vtk==9.3.1
1 change: 1 addition & 0 deletions doc/changelog.d/3822.maintenance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
feat: update Dockerfiles and requirements for improved library support and version upgrades