Merge pull request #279 from AlexsLemonade/jashapiro/prep-v4

Prep for v0.4
AlexsLemonade · Jul 9, 2024 · 00946ce · 00946ce
2 parents c38a48c + 95f1404
commit 00946ce
Show file tree

Hide file tree

Showing 11 changed files with 393 additions and 412 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -16,7 +16,9 @@
 # rendered notebooks
 ^inst/rmd/.*\.html$
 
-# Docker folder
+# Docker items
+^Dockerfile$
+^.dockerignore$
 ^docker$
 
 # development

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: scpcaTools
 Type: Package
 Title: Single cell data tools for ScPCA
-Version: 0.3.2
+Version: 0.4.0
 Authors@R: c(
     person("Ally", "Hawkins",
            email = "ally.hawkins@ccdatalab.org",
@@ -25,7 +25,7 @@ Description: Tools for processing single cell data associated with the
 License: BSD_3_clause + file LICENSE
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 Depends:
     R (>= 4.3.0)
 Imports:

diff --git a/Dockerfile b/Dockerfile
@@ -10,6 +10,9 @@ LABEL org.opencontainers.image.source https://github.com/AlexsLemonade/scpcaTool
 ENV RENV_CONFIG_CACHE_ENABLED FALSE
 RUN Rscript -e "install.packages(c('renv'))"
 
+# Install Rhtslib manually for renv/Bioc incompatibility (possibly temporary)
+RUN Rscript -e "BiocManager::install('Rhtslib')"
+
 COPY docker/renv_slim.lock renv.lock
 # restore renv and remove cache files
 RUN Rscript -e 'renv::restore()'\