Skip to content

Commit

Permalink
Prepare for seurat 5 compatibility (#40)
Browse files Browse the repository at this point in the history
* Prepare for seurat 5 compatibility
* Remove unnecessary fixed versions
  • Loading branch information
bbimber authored Jan 22, 2024
1 parent 5557153 commit aabaf6e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 21 deletions.
16 changes: 3 additions & 13 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ jobs:
- name: Setup CoNGA
run: |
# NOTE: seaborn added for: https://github.com/scverse/scanpy/issues/2680
python3 -m pip install --user scanpy fastcluster seaborn==0.12.2
python3 -m pip install --user scanpy
cd ../
git clone -b rhesus https://github.com/phbradley/conga.git conga
cd conga/tcrdist_cpp
Expand Down Expand Up @@ -105,17 +104,8 @@ jobs:
run: |
getOption('repos');
print(paste0("R_BIOC_VERSION: ", Sys.getenv("R_BIOC_VERSION")));
# TODO: remove this once Seurat 5 is supported. Install RIRA and CellMembrane first, since it depends on seurat 4.4 and the upgrade would otherwise force-update it:
devtools::install_version('Seurat', version = '4.4.0', ask = FALSE, upgrade = 'never', type = 'source', repos = 'https://cloud.r-project.org')
devtools::install_github(repo = 'bimberlabinternal/RIRA', ref = 'master', dependencies = TRUE, upgrade = 'never')
devtools::install_github(repo = 'bimberlabinternal/CellMembrane', ref = 'master', dependencies = TRUE, upgrade = 'never')
devtools::install_github(repo = 'bimberlab/cellhashR', ref = 'master', dependencies = TRUE, upgrade = 'never')
remotes::install_deps(dependencies = TRUE, upgrade = "never")
# Force 4.x for Seurat
devtools::install_version('Seurat', version = '4.4.0', ask = FALSE, upgrade = 'never')
remotes::install_deps(dependencies = TRUE, upgrade = "always")
remotes::install_cran("rcmdcheck")
# Due to Matrix/SeuratObject: https://github.com/mojaveazure/seurat-object/issues/166
install.packages('SeuratObject', ask = FALSE, force = TRUE, type = 'source', repos = 'https://cloud.r-project.org')
shell: Rscript {0}

- name: Session info
Expand All @@ -140,5 +130,5 @@ jobs:
if: failure()
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
name: ${{ runner.os }}-r${{ matrix.config.r }}-bioc${{ matrix.config.bioc }}-results
path: check
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Encoding: UTF-8
Depends:
R (>= 4.3.0)
Imports:
Seurat (<= 4.4.0),
Seurat,
dplyr,
naturalsort,
Rlabkey,
Expand Down
9 changes: 2 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ RUN echo "local({r <- getOption('repos') ;r['CRAN'] = 'https://packagemanager.rs
wget \
git \
&& python3 -m pip install --upgrade pip \
# NOTE: seaborn added for: https://github.com/scverse/scanpy/issues/2680
&& pip3 install umap-learn phate scanpy fastcluster seaborn==0.12.2 \
&& pip3 install umap-learn phate scanpy \
&& mkdir /conga \
&& cd /conga \
&& git clone https://github.com/phbradley/conga.git \
Expand Down Expand Up @@ -46,11 +45,7 @@ RUN --mount=type=secret,id=GITHUB_PAT \
&& export GITHUB_PAT="$(cat /run/secrets/GITHUB_PAT)" \
&& echo "GH: $GITHUB_PAT" \
&& Rscript -e "BiocManager::install(ask = F, upgrade = 'always');" \
# Force 4.x for Seurat
&& Rscript -e "devtools::install_version('Seurat', version = '4.4.0', upgrade = 'never')" \
&& Rscript -e "devtools::install_deps(pkg = '.', dependencies = TRUE, upgrade = 'never');" \
# Due to Matrix/SeuratObject: https://github.com/mojaveazure/seurat-object/issues/166
&& Rscript -e "install.packages('SeuratObject', ask = FALSE, force = TRUE, type = 'source', repos = 'https://cloud.r-project.org')" \
&& Rscript -e "devtools::install_deps(pkg = '.', dependencies = TRUE, upgrade = 'always');" \
&& R CMD build . \
&& R CMD INSTALL --build *.tar.gz \
&& rm -Rf /tmp/downloaded_packages/ /tmp/*.rds

0 comments on commit aabaf6e

Please sign in to comment.