Skip to content
Open
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
17 changes: 13 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,13 @@ jobs:
- restore_cache:
keys:
- cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "DESCRIPTION" }}
- run:
# see https://github.com/r-lib/remotes/issues/798
name: Update remotes pkg if on R 4.4
command: R --version | grep -qF 'version 4.4' && R -e 'devtools::install_git("https://github.com/r-lib/remotes.git")' || true
- run:
name: Install package dependencies
command: R -e "devtools::install_deps(dep = TRUE)"
command: R -e "devtools::install_deps(dep = TRUE); quit(status=sum(grepl('non-zero exit status', names(warnings()))))"
- save_cache:
key: cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "DESCRIPTION" }}
paths:
Expand All @@ -33,6 +37,7 @@ jobs:
name: Check versions
command: |
which R
R --version
R --quiet -e 'installed.packages()[, "Version"]'
which pandoc
pandoc --version
Expand All @@ -53,7 +58,7 @@ jobs:
command: Rscript exec/find_pandoc.R
- run:
name: "Run demo script"
command: bash exec/demo.sh $PWD/demo-files
command: bash exec/demo.sh $PWD/demo-files strict
- store_artifacts:
name: "Store Artifacts: demo: report"
path: demo-files/str-results/report.html
Expand All @@ -62,7 +67,7 @@ jobs:
path: demo-files/str-results/summary.csv
- run:
name: "Run demo script - empty case"
command: bash exec/demo_empty.sh $PWD/demo-empty-files
command: bash exec/demo_empty.sh $PWD/demo-empty-files strict
- store_artifacts:
name: "Store Artifacts: empty demo: report"
path: demo-empty-files/str-results/report.html
Expand All @@ -80,4 +85,8 @@ workflows:
- build:
matrix:
parameters:
rversion: ["3.6.3", "4.2.1", "4.2.2"]
rversion:
- "4.2.3"
- "4.3.3"
- "4.4.3"
- "4.5.2"
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: chiimp
Title: Computational, High-throughput Individual Identification through Microsatellite Profiling
Version: 0.4.1
Version: 0.4.2
Authors@R: person("Jesse", "Connell", email = "ancon@upenn.edu", role = c("aut", "cre"))
Description: An R package to analyze microsatellites in high-throughput sequencing datasets.
Depends: R (>= 3.6)
Expand Down Expand Up @@ -31,8 +31,8 @@ Imports:
viridis (>= 0.5),
yaml (>= 2.2)
Remotes:
github::sherrillmix/dnar,
github::sherrillmix/dnaplotr
git::https://github.com/sherrillmix/dnar.git,
git::https://github.com/sherrillmix/dnaplotr.git
RoxygenNote: 7.2.0
Suggests:
testthat,
Expand Down
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# chiimp 0.4.2

* Updated software dependency handling to use generic git URLs
* Enforce strict error handling in test scripts

# chiimp 0.4.1

* Overhauled unit tests with more modular saved inputs and expected outputs
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ high-throughput sequencing datasets.

For automated installation and program usage see [GUIDE.pdf] here or in a
[released version](https://github.com/ShawHahnLab/chiimp/releases), and the [worked examples].
The most recent released version is [0.4.1](https://github.com/ShawHahnLab/chiimp/releases/tag/0.4.1).
The most recent released version is [0.4.2](https://github.com/ShawHahnLab/chiimp/releases/tag/0.4.2).
For usage as an R package also see the built-in package documentation. The
package-level page (`?chiimp`) provides an overview with links to specific
functions.
Expand Down
4 changes: 4 additions & 0 deletions exec/demo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
# Wrapper script to set up and execute a demo, using the "chiimp" executable
# R script and the test data.

if [[ "$2" == "strict" ]]; then
set -e
fi

cd "$(dirname $BASH_SOURCE)"
dir=$(pwd -P)
inst="../inst"
Expand Down
4 changes: 4 additions & 0 deletions exec/demo_empty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
#
# Special case: all empty input files

if [[ "$2" == "strict" ]]; then
set -e
fi

cd "$(dirname $BASH_SOURCE)"
dir=$(pwd -P)
inst="../inst"
Expand Down