Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/R-CMD-check-current.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,33 @@

jobs:
R-CMD-check:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v6
with:
fetch-depth: 0

- name: Set up R
uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- name: Remove renv
run: rm -f renv.lock .Rprofile

- name: Set up Pandoc
uses: r-lib/actions/setup-pandoc@v2

- name: Set up dependencies
uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
needs: check

- name: Check package
uses: r-lib/actions/check-r-package@v2
with:
args: 'c("--no-manual")'

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {contents: read}
8 changes: 4 additions & 4 deletions .github/workflows/R-CMD-check-renv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,54 +10,54 @@

jobs:
R-CMD-check-renv:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v6
with:
fetch-depth: 0

- name: Set up R
uses: r-lib/actions/setup-r@v2
with:
r-version: "renv"
use-public-rspm: true

- name: Set up Pandoc
uses: r-lib/actions/setup-pandoc@v2

- name: Install additional system dependencies
run: |
sudo apt-get install -y libcurl4-openssl-dev libglpk40 jags

# remove requirements file to prevent renv from worrying about python
- name: Remove requirements.txt file
run: |
rm -f requirements.txt

- name: Set up Renv & install packages
uses: r-lib/actions/setup-renv@v2

- name: Clean up temp files
run: |
rm -rf /tmp/downloaded_packages
rm -rf /tmp/Rtmp*

- name: Remove unneeded system files
run: |
sudo rm -rf /opt/hostedtoolcache/CodeQL
sudo rm -rf /opt/hostedtoolcache/PyPy
sudo rm -rf /opt/hostedtoolcache/Ruby

- name: Install additional dependencies for testing
run: |
install.packages(c("remotes", "rcmdcheck"))
remotes::install_github("AlexsLemonade/scpcaData")
install.packages(c("pak", "rcmdcheck"))
pak::pak("AlexsLemonade/scpcaData")
shell: Rscript {0}

- name: Check package
uses: r-lib/actions/check-r-package@v2
with:
args: 'c("--no-manual")'

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {contents: read}
8 changes: 3 additions & 5 deletions .github/workflows/pr-commands.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
document:
if: ${{ github.event.issue.pull_request && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER') && startsWith(github.event.comment.body, '/document') }}
name: document
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6

- uses: r-lib/actions/pr-fetch@v2
with:
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6

- uses: r-lib/actions/pr-fetch@v2
with:
Expand Down Expand Up @@ -97,8 +97,6 @@ jobs:
run: styler::style_pkg()
shell: Rscript --no-init-file {0}



- name: commit
run: |
git config --local user.name "$GITHUB_ACTOR"
Expand Down
2 changes: 0 additions & 2 deletions tests/testthat/.gitignore

This file was deleted.

Binary file added tests/testthat/_snaps/sce_to_anndata/anndata.h5
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 1 addition & 3 deletions tests/testthat/test-sce_to_anndata.R
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ test_that("Conversion of SCE to AnnData works as expected", {
expect_equal(colnames(colData(sce)), colnames(colData(converted_sce)))
expect_equal(colnames(rowData(sce)), colnames(rowData(converted_sce)))


# expect that sample metadata has been removed from converted SCE
# expect that metadata_list has been removed from converted SCE
expect_setequal(
c("library_id", "sample_metadata", "metadata_dataframe", "metadata_S4_DataFrame"),
names(metadata(converted_sce))
Expand All @@ -68,7 +67,6 @@ test_that("Conversion of SCE to AnnData works as expected", {
"logical"
)


# test that H5 file is created with new assay name
# add logcounts
logcounts(sce) <- counts(sce)
Expand Down
Loading