Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
knausb committed Jul 20, 2020
2 parents d5c2c2b + 2877803 commit a4cf2cc
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Description: Facilitates easy manipulation of variant call format (VCF) data.
data may be written to a VCF file (*.vcf.gz). It also may be converted into
other popular R objects (e.g., genlight, DNAbin). VcfR provides a link between
VCF data and familiar R software.
Version: 1.11.0
Version: 1.12.0
Authors@R: c(
person(c("Brian", "J."), "Knaus", role = c("cre", "aut"),
email = "[email protected]", comment = c(ORCID = "0000-0003-1665-4343")),
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ I think I encountered a situation where 4-96 was not enough so I've bumped it to
This may have been addressed at 64a308ba50b9119108e8946737460de5997b805b by adding `samples` to vcfR method `[`.
* In issue #92 (vcfR2genlight big data #92), JimWhiting91 has documented that `extract.gt()` could be greatly improved with multithreading. While he used `mclapply()` I do not feel this is the best solution because it does not work on Windows. I think a better solution would be [RCppParallel](https://rcppcore.github.io/RcppParallel/) because this should work on all CRAN platforms.

# vcfR 1.12.0
Released on CRAN 2020-XX-XX
* Incorporated help from https://stackoverflow.com/a/62721142 to use checkbashisms when checking on Debian flavors of Linux

# vcfR 1.11.0
Released on CRAN 2020-06-05
* Now compatible with R 4.0.0 and dplyr 1.0.0
Expand Down
11 changes: 10 additions & 1 deletion configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
#!/bin/sh

# Thank you to the community for help!
#
checkbashisms --force
# How to install checkbashisms.
# https://github.com/simonwhitaker/linter-checkbashisms
#
# What to include in configure.
# https://stackoverflow.com/a/62721142

if [ -f /usr/bin/checkbashisms ]; then
checkbashisms --force
fi

# EOF.

0 comments on commit a4cf2cc

Please sign in to comment.