From 999da4f144e083d28ef788dcffcf99dab0ead308 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Wed, 12 Aug 2020 17:24:01 -0500
Subject: [PATCH] Install yapf through pip for later version
---
containers/builder/Dockerfile | 2 +-
containers/builder/spack.yaml | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/containers/builder/Dockerfile b/containers/builder/Dockerfile
index bb0d7f0ed..b36f3d2fd 100644
--- a/containers/builder/Dockerfile
+++ b/containers/builder/Dockerfile
@@ -41,7 +41,7 @@ RUN cd /opt/spack-environment && spack env activate . \
&& pip install --trusted-host pypi.org \
--trusted-host files.pythonhosted.org \
--no-cache-dir \
- ipython matplotlib scipy
+ ipython matplotlib scipy yapf
## Build elements prone to change here, to allow us to rebuild
## from runner cache efficiently
diff --git a/containers/builder/spack.yaml b/containers/builder/spack.yaml
index b14cd597a..579065a54 100644
--- a/containers/builder/spack.yaml
+++ b/containers/builder/spack.yaml
@@ -11,7 +11,6 @@ spack:
- py-pip
- py-numpy
- py-pyyaml
- - py-yapf
- xrootd@4.12.3 cxxstd=17 +python
- root@6.22.00 cxxstd=17 +dataframe +fftw +fortran +gdml +http +mlp +pythia8 +root7 +tmva +vc +xrootd +ssl ^mesa+opengl -llvm -osmesa
- pythia8@8244
--
GitLab