WIP101

dakotablair · dakotablair · commit f66c8d8cbda7 · 2024-11-08T16:46:26.000-05:00
diff --git a/docker/ubuntu18.04/openmpi4.0.4/all_spack/Dockerfile.spack_dev_ddb b/docker/ubuntu18.04/openmpi4.0.4/all_spack/Dockerfile.spack_dev_ddb
@@ -1,10 +1,10 @@
 FROM chimbuko/chimbuko-spack-env:ubuntu18.04
 
-RUN apt-get update && apt-get install -y emacs-nox gdb tmux vim
+RUN apt-get update && apt-get install -y emacs-nox gdb jq tmux vim
 
 WORKDIR /src
 
-RUN echo 0.0.5
+RUN echo 0.0.9
 
 RUN git clone https://github.com/CODARcode/PerformanceAnalysis.git \
         --branch ckelly_develop_ddb \
@@ -45,7 +45,7 @@ RUN /build.spack.sh
 
 COPY scripts/docker/spack_dev_ddb.rcfile.sh /rcfile.sh
 
-# ENTRYPOINT ["/bin/bash"]  # see Dockerfile.spack_env
+ENTRYPOINT ["/bin/bash"]  # see Dockerfile.spack_env
 
 CMD ["--rcfile", "/rcfile.sh"]
 
diff --git a/docker/ubuntu18.04/openmpi4.0.4/all_spack/env.yaml b/docker/ubuntu18.04/openmpi4.0.4/all_spack/env.yaml
@@ -3,9 +3,9 @@ spack:
   - chimbuko-performance-analysis @git.bcb0f724d8579abeb620a0f9f4a9fdd839f3475f ^mochi-sonata~bedrock~unqlite_st ^cmake@3.27.7 
   - tau+mpi+openmp+adios2+python+binutils@git.9ec064a2f5ebc6deb63cfb3c10595ccba902b017=2.33.1
   - libfabric fabrics=sockets,tcp,udp,rxm
-  - chimbuko-visualization2 @git.dependency_upgrades=dev ^curl@8.4.0 ^python@3.8.18 ^py-cryptography@3.2.1 ^py-celery@4.4.7  ^py-flask@1.1.2 ^py-werkzeug@0.16.0 ^py-itsdangerous@2.0.1 ^py-flask-sqlalchemy@2.5.1 ^py-wheel@0.37.1 ^py-eventlet@0.30.0 ^py-setuptools@65.5.0
+  - chimbuko-visualization2 @git.dependency_upgrades=dev ^curl@8.4.0 ^python@3.8.18 ^py-setuptools@65.5.0
   concretizer:
-      unify: true
+      unify: when_possible
   compilers:
   - compiler:
       spec: gcc@=7.5.0
diff --git a/spack/repo/chimbuko/packages/chimbuko-visualization2/package.py b/spack/repo/chimbuko/packages/chimbuko-visualization2/package.py
@@ -14,7 +14,7 @@ class ChimbukoVisualization2(Package):
 
     depends_on('python@3.8')
     depends_on('py-mochi-sonata', type=('build', 'run'))
-    depends_on('py-celery@4.4.7:4.4', type=('build', 'run'))
+    # depends_on('py-celery@5.4:', type=('build', 'run'))
     # depends_on('py-certifi@2024.7.4:2024.7', type=('build', 'run'))
     depends_on('py-certifi', type=('build', 'run'))
     # depends_on('py-dnspython@2.6.1:2.6', type=('build', 'run'))

-Original file line number
+Diff line change
     depends_on('[email protected]')
     depends_on('py-mochi-sonata', type=('build', 'run'))
 -    depends_on('py-celery@4.4.7:4.4', type=('build', 'run'))
 +    # depends_on('py-celery@5.4:', type=('build', 'run'))
     # depends_on('[email protected]:2024.7', type=('build', 'run'))
     depends_on('py-certifi', type=('build', 'run'))
     # depends_on('[email protected]:2.6', type=('build', 'run'))