Skip to content

Commit 00946ce

Browse files
authored
Merge pull request #279 from AlexsLemonade/jashapiro/prep-v4
Prep for v0.4
2 parents c38a48c + 95f1404 commit 00946ce

11 files changed

Lines changed: 393 additions & 412 deletions

.Rbuildignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
# rendered notebooks
1717
^inst/rmd/.*\.html$
1818

19-
# Docker folder
19+
# Docker items
20+
^Dockerfile$
21+
^.dockerignore$
2022
^docker$
2123

2224
# development

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: scpcaTools
22
Type: Package
33
Title: Single cell data tools for ScPCA
4-
Version: 0.3.2
4+
Version: 0.4.0
55
Authors@R: c(
66
person("Ally", "Hawkins",
77
email = "ally.hawkins@ccdatalab.org",
@@ -25,7 +25,7 @@ Description: Tools for processing single cell data associated with the
2525
License: BSD_3_clause + file LICENSE
2626
Encoding: UTF-8
2727
LazyData: true
28-
RoxygenNote: 7.3.1
28+
RoxygenNote: 7.3.2
2929
Depends:
3030
R (>= 4.3.0)
3131
Imports:

Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ LABEL org.opencontainers.image.source https://github.com/AlexsLemonade/scpcaTool
1010
ENV RENV_CONFIG_CACHE_ENABLED FALSE
1111
RUN Rscript -e "install.packages(c('renv'))"
1212

13+
# Install Rhtslib manually for renv/Bioc incompatibility (possibly temporary)
14+
RUN Rscript -e "BiocManager::install('Rhtslib')"
15+
1316
COPY docker/renv_slim.lock renv.lock
1417
# restore renv and remove cache files
1518
RUN Rscript -e 'renv::restore()'\

0 commit comments

Comments
 (0)