diff --git a/DESCRIPTION b/DESCRIPTION index ad31509..6de13e3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: quanteda.textmodels Type: Package Title: Scaling Models and Classifiers for Textual Data -Version: 0.9.8 +Version: 0.9.9 Description: Scaling models and classifiers for sparse matrix objects representing textual data in the form of a document-feature matrix. Includes original implementations of 'Laver', 'Benoit', and Garry's (2003) , diff --git a/NEWS.md b/NEWS.md index f0bf65e..13995ea 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,8 @@ +# quanteda.textmodels 0.9.9 + +* Fixes namespace issues caused by removing RcppArmadillo from quanteda 4.1.0. +* Fixes extraneous output from the spelling check. + # quanteda.textmodels 0.9.7 Fixes the compilation errors caused by changes to the TBB library and RcppParallel. This version links to quanteda v4.0 that does not rely on RcppParallel. diff --git a/cran-comments.md b/cran-comments.md index 8a4202f..7967d18 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,10 +1,7 @@ ## Purpose -Re-submission: Adds conditionality to tests involving packages that are only in -Suggests. - -To rescue quanteda.textmodels from CRAN archives, after fixing the issues with -it that led to its archiving on 25 August 2024. +* Fixes namespace issues caused by removing RcppArmadillo from quanteda 4.1.0. +* Fixes extraneous output from the spelling check. # Checks diff --git a/inst/WORDLIST b/inst/WORDLIST index f803632..9fe13e3 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -40,6 +40,7 @@ Proksch Proksch's QUANTESS Raghavan +RcppArmadillo RcppParallel Rtools SIGIR @@ -76,7 +77,6 @@ nb newdata's quanteda se -stat svd svds svm diff --git a/src/ca.cpp b/src/ca.cpp index b0780e2..f6a99d4 100644 --- a/src/ca.cpp +++ b/src/ca.cpp @@ -1,6 +1,7 @@ +#include #include "lib.h" using namespace quanteda; -using namespace arma; +// using namespace arma; //find the principle elements for the sparse residual matrix diff --git a/src/wordfish.cpp b/src/wordfish.cpp index 2256815..2710cad 100644 --- a/src/wordfish.cpp +++ b/src/wordfish.cpp @@ -1,3 +1,4 @@ +#include #include "lib.h" #include using namespace Rcpp; diff --git a/tests/spelling.Rout.save b/tests/spelling.Rout.save deleted file mode 100644 index 15f7451..0000000 --- a/tests/spelling.Rout.save +++ /dev/null @@ -1,24 +0,0 @@ - -R version 3.4.1 (2017-06-30) -- "Single Candle" -Copyright (C) 2017 The R Foundation for Statistical Computing -Platform: x86_64-apple-darwin15.6.0 (64-bit) - -R is free software and comes with ABSOLUTELY NO WARRANTY. -You are welcome to redistribute it under certain conditions. -Type 'license()' or 'licence()' for distribution details. - -R is a collaborative project with many contributors. -Type 'contributors()' for more information and -'citation()' on how to cite R or R packages in publications. - -Type 'demo()' for some demos, 'help()' for on-line help, or -'help.start()' for an HTML browser interface to help. -Type 'q()' to quit R. - -> if (requireNamespace("spelling", quietly = TRUE)) -+ spelling::spell_check_test(vignettes = TRUE, error = TRUE, skip_on_cran = TRUE) -All Done! -> -> proc.time() - user system elapsed - 0.372 0.039 0.408 diff --git a/tests/testthat.R b/tests/testthat.R index 47f6b61..d9facf3 100644 --- a/tests/testthat.R +++ b/tests/testthat.R @@ -1,6 +1,10 @@ +Sys.setenv("R_TESTS" = "") +Sys.setenv("_R_CHECK_LENGTH_1_CONDITION_" = TRUE) + library("testthat") -library("quanteda") +# library("quanteda") library("quanteda.textmodels") +quanteda::quanteda_options(reset = TRUE) # for strong tests for Matrix deprecations options(Matrix.warnDeprecatedCoerce = 2)