Skip to content

Commit 5a36f2f

Browse files
committed
Biostrings 2.77.1
- All the functions that went to pwalign in BioC 3.19 and got formally deprecated in Biostrings in BioC 3.21 are now defunct. - After being deprecated in BioC 3.19, XStringPartialMatches objects and matchprobes() are now defunct. - Remove needwunsQS() (was defunct in BioC 3.19).
1 parent 44e8aa3 commit 5a36f2f

File tree

13 files changed

+18
-315
lines changed

13 files changed

+18
-315
lines changed

DESCRIPTION

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ biocViews: SequenceMatching, Alignment, Sequencing, Genetics,
77
DataImport, DataRepresentation, Infrastructure
88
URL: https://bioconductor.org/packages/Biostrings
99
BugReports: https://github.com/Bioconductor/Biostrings/issues
10-
Version: 2.77.0
10+
Version: 2.77.1
1111
License: Artistic-2.0
1212
Encoding: UTF-8
1313
Authors@R: c(
@@ -93,7 +93,6 @@ Collate: utils.R
9393
XStringQuality-class.R
9494
QualityScaledXStringSet.R
9595
pmatchPattern.R
96-
needwunsQS.R
9796
MultipleAlignment.R
9897
matchprobes.R
9998
moved_to_pwalign.R

NAMESPACE

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@ exportMethods(
298298
### XStringQuality-class.R
299299
### QualityScaledXStringSet.R
300300
### pmatchPattern.R
301-
### needwunsQS.R
302301
### MultipleAlignment.R
303302

304303
exportClasses(
@@ -341,10 +340,7 @@ export(
341340
readAAMultipleAlignment,
342341
consensusViews,
343342
write.phylip,
344-
detail,
345-
346-
## Old stuff (Deprecated or Defunct):
347-
needwunsQS
343+
detail
348344
)
349345

350346
exportMethods(

R/XStringPartialMatches-class.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ setClass("XStringPartialMatches",
1818
setGeneric("subpatterns",
1919
function(x)
2020
{
21-
.Deprecated()
21+
.Defunct()
2222
standardGeneric("subpatterns")
2323
}
2424
)
@@ -33,8 +33,8 @@ setMethod("subpatterns", "XStringPartialMatches", function(x) x@subpatterns)
3333
setMethod("show", "XStringPartialMatches",
3434
function(object)
3535
{
36-
msg <- "XStringPartialMatches objects are deprecated"
37-
.Deprecated(msg=wmsg(msg))
36+
msg <- "XStringPartialMatches objects are defunct"
37+
.Defunct(msg=wmsg(msg))
3838
subject <- subject(object)
3939
lsub <- length(subject)
4040
cat(" Views on a ", lsub, "-letter ",
@@ -63,8 +63,8 @@ setMethod("show", "XStringPartialMatches",
6363
setMethod("[", "XStringPartialMatches",
6464
function(x, i, j, ..., drop)
6565
{
66-
msg <- "XStringPartialMatches objects are deprecated"
67-
.Deprecated(msg=wmsg(msg))
66+
msg <- "XStringPartialMatches objects are defunct"
67+
.Defunct(msg=wmsg(msg))
6868
ans <- callNextMethod()
6969
ans@subpatterns <- ans@subpatterns[i]
7070
ans

R/matchprobes.R

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
matchprobes <- function(query, records, probepos=FALSE) {
2-
msg <- "matchprobes() is deprecated. Please use matchPdict() instead."
3-
.Deprecated(msg=msg)
4-
.Call2("MP_matchprobes", toupper(query), toupper(records), probepos, PACKAGE="Biostrings")
2+
msg <- "matchprobes() is defunct. Please use matchPdict() instead."
3+
.Defunct(msg=msg)
54
}
65

76
longestConsecutive <- function(seq, letter) {

R/moved_to_pwalign.R

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,12 @@
11
### Everything in this file has moved to the pwalign package
22

33

4-
### TODO: Move this to S4Vectors (or BiocBaseUtils).
5-
.load_package_gracefully <- function(package, ...)
6-
{
7-
if (!requireNamespace(package, quietly=TRUE))
8-
stop("Could not load package ", package, ". Is it installed?\n\n ",
9-
wmsg("Note that ", ..., " requires the ", package, " package. ",
10-
"Please install it with:"),
11-
"\n\n BiocManager::install(\"", package, "\")")
12-
}
13-
144
.call_fun_in_pwalign <- function(fun, ...)
155
{
16-
.load_package_gracefully("pwalign", "starting with BioC 3.19, ",
17-
"calling ", fun, "()")
186
msg <- c(fun, "() has moved from Biostrings to the pwalign package, ",
19-
"and is formally deprecated in Biostrings >= 2.75.1. ",
20-
"Please call pwalign::", fun, "() to get rid of this warning.")
21-
.Deprecated(msg=wmsg(msg))
22-
FUN <- base::get(fun, envir=asNamespace("pwalign"), inherits=FALSE)
23-
do.call(FUN, list(...))
7+
"and is formally defunct in Biostrings >= 2.77.1. ",
8+
"Please call pwalign::", fun, "() to get rid of this error.")
9+
.Defunct(msg=wmsg(msg))
2410
}
2511

2612
writePairwiseAlignments <-

R/needwunsQS.R

Lines changed: 0 additions & 7 deletions
This file was deleted.

man/matchprobes.Rd

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
\name{matchprobes}
22
\alias{matchprobes}
3-
\title{(Deprecated) A function to match a query sequence to the sequences
3+
\title{(Defunct) A function to match a query sequence to the sequences
44
of a set of probes.}
55
\description{
6+
WARNING: The \code{matchprobes()} function is defunct in
7+
\pkg{Biostrings} >= 2.77.1.
8+
69
The \code{query} sequence, a character string (probably representing
710
a transcript of interest), is scanned for the presence of exact
811
matches to the sequences in the character vector \code{records}.

man/needwunsQS.Rd

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/Biostrings.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,8 +1110,3 @@ SEXP lcsuffix(
11101110
char compbase(char c);
11111111
SEXP MP_longestConsecutive(SEXP x, SEXP letter);
11121112

1113-
1114-
/* matchprobes.c (belonged originally to old matchprobes package) */
1115-
1116-
SEXP MP_matchprobes(SEXP query, SEXP records, SEXP probepos);
1117-

src/R_init_Biostrings.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,6 @@ static const R_CallMethodDef callMethods[] = {
140140
/* strutils.c (belonged originally to old matchprobes package) */
141141
CALLMETHOD_DEF(MP_longestConsecutive, 2),
142142

143-
/* matchprobes.c (belonged originally to old matchprobes package) */
144-
CALLMETHOD_DEF(MP_matchprobes, 3),
145-
146143
{NULL, NULL, 0}
147144
};
148145

0 commit comments

Comments
 (0)