update containers

hiddenSymmetries · Jun 28, 2024 · bd5d9e9 · bd5d9e9
1 parent d824abb
commit bd5d9e9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/ci/Dockerfile.ubuntu b/ci/Dockerfile.ubuntu
@@ -40,20 +40,22 @@ RUN python3 -m pip install wheel
 RUN python3 -m venv /venv/
 
 RUN /venv/bin/pip install -U pip
-RUN /venv/bin/python -m pip install numpy scipy jax jaxlib f90nml mpi4py jupyter notebook ipython qsc sympy scikit-build ninja "pybind11[global]" cmake
-RUN /venv/bin/pip install git+https://github.com/zhucaoxiang/f90wrap
+RUN /venv/bin/python -m pip install numpy scipy jax jaxlib f90nml mpi4py jupyter notebook ipython qsc sympy scikit-build ninja "pybind11[global]" cmake f90wrap h5py
 ENV PATH="/venv/bin:${PATH}"
 
 RUN git clone --depth 1 https://github.com/PrincetonUniversity/SPEC.git /src/SPEC && \
  cd /src/SPEC && \
- /venv/bin/pip install -v . 2>&1 | tee spec_build.log
+ /venv/bin/pip install -v . 2>&1 | tee spec_build.log && \
+ cd Utilities/pythontools && \
+ /venv/bin/pip install -r requirements.txt
+ /venv/bin/pip install -v .
 
 RUN git clone --depth 1 https://github.com/hiddenSymmetries/VMEC2000.git /src/VMEC && \
  cd /src/VMEC && \
  cp cmake/machines/ubuntu.json cmake_config_file.json && \
  /venv/bin/pip install -v . 2>&1 | tee vmec_build.log
 
-RUN /venv/bin/pip install h5py pyoculus py_spec
+RUN /venv/bin/pip install pyoculus
 RUN /venv/bin/pip install vtk==9.2.6 pyqt5 matplotlib pyevtk plotly
 RUN /venv/bin/pip install mayavi
 RUN /venv/bin/pip install git+https://github.com/hiddenSymmetries/booz_xform

diff --git a/ci/singularity.def b/ci/singularity.def
@@ -44,8 +44,7 @@ Stage: devel
  python3 -m venv /venv/
  . /venv/bin/activate
  /venv/bin/pip install -U pip
- /venv/bin/pip install numpy scipy jax jaxlib f90nml jupyter notebook ipython qsc sympy scikit-build ninja "pybind11[global]" cmake
- /venv/bin/pip install git+https://github.com/zhucaoxiang/f90wrap
+ /venv/bin/pip install numpy scipy jax jaxlib f90nml jupyter notebook ipython qsc sympy scikit-build ninja "pybind11[global]" cmake f90wrap h5py
  PATH="/usr/local/bin:/venv/bin:${PATH}"
  LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH}"
 
@@ -60,7 +59,10 @@ Stage: devel
  cd SPEC && \
  /venv/bin/python setup.py bdist_wheel && \
  /venv/bin/pip install -v dist/*.whl && \
- cd .. && \
+ cd Utilities/pythontools && \
+ /venv/bin/pip install -r requirements.txt && \
+ /venv/bin/pip install . && \
+ cd ../../.. && \
  rm -rf SPEC
 
  git clone --depth 1 https://github.com/hiddenSymmetries/VMEC2000.git && \
@@ -70,7 +72,7 @@ Stage: devel
  cd .. && \
  rm -rf VMEC2000
 
- /venv/bin/pip install h5py pyoculus py_spec
+ /venv/bin/pip install pyoculus
  /venv/bin/pip install vtk==9.2.6 pyqt5 matplotlib pyevtk plotly
  /venv/bin/pip install mayavi
  /venv/bin/pip install git+https://github.com/hiddenSymmetries/booz_xform