Merge pull request #69 from quanteda/fix-quanteda-v4_1_0

Fixes for quanteda v4.1.0
quanteda · Sep 3, 2024 · 96c6ae6 · 96c6ae6
2 parents daa5501 + c6e5772
commit 96c6ae6
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 33 deletions.
diff --git 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) <doi:10.1017/S0003055403000698>,

diff --git 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
@@ -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
@@ -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
@@ -1,6 +1,7 @@
+#include <RcppArmadillo.h>
 #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
@@ -1,3 +1,4 @@
+#include <RcppArmadillo.h>
 #include "lib.h"
 #include <math.h>
 using namespace Rcpp;

diff --git a/tests/spelling.Rout.save b/tests/spelling.Rout.save
diff --git 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)