Merge branch 'aaw-1855' into origin/aaw-1855

StatCan · Oct 25, 2023 · 653b455 · 653b455
2 parents 48e6578 + 5d25900
commit 653b455
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 8 deletions.
diff --git a/docker-bits/∞_CMD.Dockerfile b/docker-bits/∞_CMD.Dockerfile
@@ -4,7 +4,6 @@ USER root
 WORKDIR /home/$NB_USER
 EXPOSE 8888
 COPY start-custom.sh /usr/local/bin/
-COPY mc-tenant-wrapper.sh /usr/local/bin/mc
 COPY trino-wrapper.sh /usr/local/bin/trino
 COPY start-oms.sh /usr/local/bin/
 

diff --git a/output/docker-stacks-datascience-notebook/Dockerfile b/output/docker-stacks-datascience-notebook/Dockerfile
@@ -10,7 +10,6 @@ USER root
 WORKDIR /home/$NB_USER
 EXPOSE 8888
 COPY start-custom.sh /usr/local/bin/
-COPY mc-tenant-wrapper.sh /usr/local/bin/mc
 COPY trino-wrapper.sh /usr/local/bin/trino
 COPY start-oms.sh /usr/local/bin/
 

diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile
@@ -356,7 +356,6 @@ USER root
 WORKDIR /home/$NB_USER
 EXPOSE 8888
 COPY start-custom.sh /usr/local/bin/
-COPY mc-tenant-wrapper.sh /usr/local/bin/mc
 COPY trino-wrapper.sh /usr/local/bin/trino
 COPY start-oms.sh /usr/local/bin/
 

diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile
@@ -378,7 +378,6 @@ USER root
 WORKDIR /home/$NB_USER
 EXPOSE 8888
 COPY start-custom.sh /usr/local/bin/
-COPY mc-tenant-wrapper.sh /usr/local/bin/mc
 COPY trino-wrapper.sh /usr/local/bin/trino
 COPY start-oms.sh /usr/local/bin/
 

diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile
@@ -485,7 +485,6 @@ USER root
 WORKDIR /home/$NB_USER
 EXPOSE 8888
 COPY start-custom.sh /usr/local/bin/
-COPY mc-tenant-wrapper.sh /usr/local/bin/mc
 COPY trino-wrapper.sh /usr/local/bin/trino
 COPY start-oms.sh /usr/local/bin/
 

diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile
@@ -245,7 +245,6 @@ USER root
 WORKDIR /home/$NB_USER
 EXPOSE 8888
 COPY start-custom.sh /usr/local/bin/
-COPY mc-tenant-wrapper.sh /usr/local/bin/mc
 COPY trino-wrapper.sh /usr/local/bin/trino
 COPY start-oms.sh /usr/local/bin/
 

diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile
@@ -470,7 +470,6 @@ USER root
 WORKDIR /home/$NB_USER
 EXPOSE 8888
 COPY start-custom.sh /usr/local/bin/
-COPY mc-tenant-wrapper.sh /usr/local/bin/mc
 COPY trino-wrapper.sh /usr/local/bin/trino
 COPY start-oms.sh /usr/local/bin/
 

diff --git a/tests/general/test_packages.py b/tests/general/test_packages.py
@@ -96,7 +96,6 @@
     # import yaml, not import pyyaml
     "pyyaml",
     "graphviz",
-    "caret"
 ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,7 +96,6 @@ @@
         # import yaml, not import pyyaml
         "pyyaml",
         "graphviz",
-        "caret"
     ]
@@ Expand Down @@