Merge branch 'main' into 04_explore_mapping_score

AlexsLemonade · Oct 29, 2024 · abe48ec · abe48ec
2 parents 2cbb62b + 6af112d
commit abe48ec
Show file tree

Hide file tree

Showing 57 changed files with 4,351 additions and 19 deletions.
diff --git a/.github/workflows/docker_cell-type-wilms-tumor-14.yml b/.github/workflows/docker_cell-type-wilms-tumor-14.yml
@@ -13,22 +13,22 @@ concurrency:
   cancel-in-progress: true
 
 on:
-  # pull_request:
-  #   branches:
-  #     - main
-  #   paths:
-  #     - "analyses/cell-type-wilms-tumor-14/Dockerfile"
-  #     - "analyses/cell-type-wilms-tumor-14/.dockerignore"
-  #     - "analyses/cell-type-wilms-tumor-14/renv.lock"
-  #     - "analyses/cell-type-wilms-tumor-14/conda-lock.yml"
-  # push:
-  #   branches:
-  #     - main
-  #   paths:
-  #     - "analyses/cell-type-wilms-tumor-14/Dockerfile"
-  #     - "analyses/cell-type-wilms-tumor-14/.dockerignore"
-  #     - "analyses/cell-type-wilms-tumor-14/renv.lock"
-  #     - "analyses/cell-type-wilms-tumor-14/conda-lock.yml"
+  pull_request:
+    branches:
+      - main
+    paths:
+      - "analyses/cell-type-wilms-tumor-14/Dockerfile"
+      - "analyses/cell-type-wilms-tumor-14/.dockerignore"
+      - "analyses/cell-type-wilms-tumor-14/renv.lock"
+      - "analyses/cell-type-wilms-tumor-14/conda-lock.yml"
+  push:
+    branches:
+      - main
+    paths:
+      - "analyses/cell-type-wilms-tumor-14/Dockerfile"
+      - "analyses/cell-type-wilms-tumor-14/.dockerignore"
+      - "analyses/cell-type-wilms-tumor-14/renv.lock"
+      - "analyses/cell-type-wilms-tumor-14/conda-lock.yml"
   workflow_dispatch:
     inputs:
       push-ecr:

diff --git a/analyses/cell-type-dsrct/.Rprofile b/analyses/cell-type-dsrct/.Rprofile
@@ -0,0 +1,4 @@
+# Don't activate renv in an OpenScPCA docker image
+if(Sys.getenv('OPENSCPCA_DOCKER') != 'TRUE'){
+  source('renv/activate.R')
+}
diff --git a/analyses/cell-type-dsrct/cell-type-dsrct.Rproj b/analyses/cell-type-dsrct/cell-type-dsrct.Rproj
@@ -0,0 +1,13 @@
+Version: 1.0
+
+RestoreWorkspace: No
+SaveWorkspace: No
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX