#7: Apply TD reviews

DARMA-tasking · Sep 28, 2024 · 445e680 · 445e680
1 parent 20a88e9
commit 445e680
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/ci/docker/build-and-test-ubuntu.dockerfile b/ci/docker/build-and-test-ubuntu.dockerfile
@@ -8,12 +8,6 @@ FROM ${BASE_IMAGE} AS base
 ENV CONDA_PATH=/opt/conda
 ENV PATH=$PATH:$CONDA_PATH/bin
 
-# Setup python requirements for JSON datafile validation
-RUN pip install PyYAML
-RUN pip install Brotli
-RUN pip install schema
-RUN pip install nanobind
-
 COPY . /opt/src/vt-tv
 RUN mkdir -p /opt/build/vt-tv
 

diff --git a/ci/setup_conda.sh b/ci/setup_conda.sh
@@ -41,10 +41,6 @@ do
 
     . $CONDA_PATH/etc/profile.d/conda.sh && conda activate py${python_version}
     echo "Python version: $(python --version)"
-    pip install PyYAML
-    pip install Brotli
-    pip install schema
-    pip install nanobind
     conda deactivate
     echo "::endgroup::"
 done
diff --git a/src/vt-tv/utility/json_reader.cc b/src/vt-tv/utility/json_reader.cc
@@ -290,13 +290,13 @@ bool JSONReader::validate_datafile(std::string file_path)
 
   // Prepare command line
   std::string cmd;
-  cmd +="python";
-  cmd +=" ";
-  cmd +=SRC_DIR;
-  cmd +="/scripts/json_datafile_validator.py";
-  cmd +=" ";
-  cmd +=" --file_path=";
-  cmd +=file_path.data();
+  cmd += "python";
+  cmd += " ";
+  cmd += SRC_DIR;
+  cmd += "/scripts/json_datafile_validator.py";
+  cmd += " ";
+  cmd += " --file_path=";
+  cmd += file_path.data();
 
   // Exit code
   int exit_code = std::system(cmd.c_str());