Skip to content

Commit

Permalink
Merge pull request #145 from omnideconv/pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
[pre-commit.ci] pre-commit autoupdate
  • Loading branch information
grst authored Oct 17, 2023
2 parents 0c5c619 + df374dd commit ad0597a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@ jobs:
uses: conda-incubator/setup-miniconda@v2
with:
auto-update-conda: true
mamba-version: "*"
channels: conda-forge,bioconda,defaults
miniforge-version: latest
use-mamba: true
channels: conda-forge,bioconda
channel-priority: true
python-version: 3.8

- name: Set-up channels and install conda build
run: |
mamba install -y conda-build conda-verify
mamba install -y conda-build conda-verify boa
shell: bash

- name: build and test package
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# R specific hooks: https://github.com/lorenzwalthert/precommit
repos:
- repo: https://github.com/lorenzwalthert/precommit
rev: v0.3.2.9007
rev: v0.3.2.9021
hooks:
- id: style-files
args: [--style_pkg=styler, --style_fun=tidyverse_style]
Expand All @@ -17,7 +17,7 @@ repos:
- id: end-of-file-fixer
exclude: '\.Rd'
- repo: https://github.com/pre-commit-ci/pre-commit-ci-config
rev: v1.5.1
rev: v1.6.1
hooks:
# Only reuiqred when https://pre-commit.ci is used for config validation
- id: check-pre-commit-ci-config
Expand All @@ -31,7 +31,7 @@ repos:
exclude: "inst/extdata/.*"
# `exclude: <regex>` to allow committing specific files
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.0-alpha.6
rev: v3.0.3
hooks:
- id: prettier

Expand Down
1 change: 0 additions & 1 deletion tests/testthat/test_mapping.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

test_that("cell_type mapping to a single method_cell_type are calculated correctly", {
fractions <- data.frame(sample1 = c("B cell" = .3, "T cell CD4+" = .5, "Myeloid dendritic cell" = .2))
cell_type <- "T cell CD4+"
Expand Down

0 comments on commit ad0597a

Please sign in to comment.