Skip to content

Commit

Permalink
Merge pull request #4 from jasenfinch/devel
Browse files Browse the repository at this point in the history
v0.3.0
  • Loading branch information
jasenfinch committed Mar 23, 2023
2 parents e72d852 + f647532 commit a5cc08a
Show file tree
Hide file tree
Showing 72 changed files with 2,066 additions and 3,541 deletions.
3 changes: 3 additions & 0 deletions .Rbuildignore
Expand Up @@ -5,3 +5,6 @@
^LICENSE\.md$
^codecov\.yml$
^docs
^_pkgdown\.yml$
^docs$
^pkgdown$
89 changes: 25 additions & 64 deletions .github/workflows/R-CMD-check.yaml
@@ -1,15 +1,10 @@
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches:
- main
- master
- devel
branches: [main, master, devel]
pull_request:
branches:
- main
- master
branches: [main, master]

name: R-CMD-check

Expand All @@ -23,71 +18,37 @@ jobs:
fail-fast: false
matrix:
config:
#- {os: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: macOS-latest, r: 'release'}
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-r@v1
with:
r-version: ${{ matrix.config.r }}

- uses: r-lib/actions/setup-pandoc@v1

- name: Query dependencies
run: |
install.packages('remotes')
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
shell: Rscript {0}
- uses: r-lib/actions/setup-pandoc@v2

- name: Cache R packages
if: runner.os != 'Windows'
uses: actions/cache@v2
- uses: r-lib/actions/setup-r@v2
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-

- name: Install system dependencies
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true
- name: Install Linux system dependencies
if: runner.os == 'Linux'
run: |
while read -r cmd
do
eval sudo $cmd
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
sudo apt-get install -y libopenbabel-dev
sudo apt install libopenbabel-dev libeigen3-dev
- name: Install dependencies
run: |
remotes::install_deps(dependencies = TRUE)
remotes::install_cran(c("rcmdcheck","goodpractice"))
shell: Rscript {0}

- name: Check
env:
_R_CHECK_CRAN_INCOMING_REMOTE_: false
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
shell: Rscript {0}
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
needs: check

- name: Goodpractice
run: goodpractice::goodpractice()
shell: Rscript {0}

- name: Test coverage
run: covr::codecov()
shell: Rscript {0}

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
- uses: r-lib/actions/check-r-package@v2
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
upload-snapshots: true
51 changes: 51 additions & 0 deletions .github/workflows/pkgdown.yaml
@@ -0,0 +1,51 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]
release:
types: [published]
workflow_dispatch:

name: pkgdown

jobs:
pkgdown:
runs-on: ubuntu-latest
# Only restrict concurrency for non-PR jobs
concurrency:
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- name: Install Linux system dependencies
if: runner.os == 'Linux'
run: |
sudo apt install libopenbabel-dev libeigen3-dev
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
needs: website

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/github-pages-deploy-action@v4.4.1
with:
clean: false
branch: gh-pages
folder: docs
55 changes: 55 additions & 0 deletions .github/workflows/test-coverage.yaml
@@ -0,0 +1,55 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]

name: test-coverage

jobs:
test-coverage:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- name: Install Linux system dependencies
if: runner.os == 'Linux'
run: |
sudo apt install libopenbabel-dev libeigen3-dev
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::covr
needs: coverage

- name: Test coverage
run: |
covr::codecov(
quiet = FALSE,
clean = FALSE,
install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
)
shell: Rscript {0}

- name: Show testthat output
if: always()
run: |
## --------------------------------------------------------------------
find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Upload test results
if: failure()
uses: actions/upload-artifact@v3
with:
name: coverage-test-failures
path: ${{ runner.temp }}/package
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -2,3 +2,4 @@
.Rhistory
.RData
.Ruserdata
docs
48 changes: 24 additions & 24 deletions DESCRIPTION
@@ -1,46 +1,46 @@
Package: riches
Title: Strucutral and Functional Enrichment Analyses
Version: 0.2.1
Version: 0.3.0
Authors@R:
person(given = "Jasen",
family = "Finch",
role = c("aut", "cre"),
email = "jsf9@aber.ac.uk")
Description: Structural and functional enrichment for metabolomics data.
Description: Structural and functional enrichment for metabolomics data.
URL: https://jasenfinch.github.io/riches/
BugReports: https://github.com/jasenfinch/riches/issues
biocViews: Metabolomics
License: GPL-3
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
Depends: R (>= 3.5.0)
Imports: FELLA,
MFassign,
Imports:
broom,
cheminf,
construction,
dplyr,
ggthemes,
FELLA,
igraph,
magrittr,
stringr,
tidygraph,
metabolyseR,
methods,
mzAnnotation,
purrr,
metabolyseR,
ggplot2,
ggraph,
tibble
Remotes: jasenfinch/MFassign,
jasenfinch/mzAnnotation,
jasenfinch/metabolyseR
rlang,
stringr,
tibble,
tidygraph,
tidyr,
tidyselect
Remotes: aberHRML/assignments,
aberHRML/mzAnnotation,
jasenfinch/cheminf,
jasenfinch/construction,
jasenfinch/metabolyseR,
bioc::FELLA
LazyData: true
RoxygenNote: 7.1.1
Collate: allClasses.R
allGenerics.R
access.R
enrichmentParameters.R
example-data.R
functionalEnrichment.R
organismNetwork.R
plotGraph.R
riches.R
RoxygenNote: 7.2.3
Suggests:
assignments,
testthat,
covr

0 comments on commit a5cc08a

Please sign in to comment.