From b75a7d68e444ca6fb798b985381a581304969767 Mon Sep 17 00:00:00 2001 From: Kenneth Benoit Date: Wed, 23 Mar 2022 10:23:02 +0000 Subject: [PATCH] Update for 0.94.1 release --- .Rbuildignore | 1 + README.Rmd | 2 +- README.md | 4 ++-- cran-comments.md | 6 +++--- src/RcppExports.cpp | 5 +++++ 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.Rbuildignore b/.Rbuildignore index bffdac3..339f3ed 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -8,3 +8,4 @@ ^\.lintr$ ^CRAN-RELEASE$ ^revdep$ +^CRAN-SUBMISSION$ diff --git a/README.Rmd b/README.Rmd index 59055a1..c28de4a 100644 --- a/README.Rmd +++ b/README.Rmd @@ -21,7 +21,7 @@ library("badger") [![Downloads](https://cranlogs.r-pkg.org/badges/quanteda.textplots)](https://CRAN.R-project.org/package=quanteda.textplots) [![Total Downloads](https://cranlogs.r-pkg.org/badges/grand-total/quanteda.textplots?color=orange)](https://CRAN.R-project.org/package=quanteda.textplots) [![R build status](https://github.com/quanteda/quanteda.textplots/workflows/R-CMD-check/badge.svg)](https://github.com/quanteda/quanteda.textplots/actions) -[![codecov](https://codecov.io/gh/quanteda/quanteda.textplots/branch/master/graph/badge.svg)](https://codecov.io/gh/quanteda/quanteda.textplots) +[![codecov](https://codecov.io/gh/quanteda/quanteda.textplots/branch/master/graph/badge.svg)](https://app.codecov.io/gh/quanteda/quanteda.textplots) [![DOI](http://joss.theoj.org/papers/10.21105/joss.00774/status.svg)](https://doi.org/10.21105/joss.00774) diff --git a/README.md b/README.md index cbb6e6c..01e9994 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,13 @@ [![CRAN Version](https://www.r-pkg.org/badges/version/quanteda.textplots)](https://CRAN.R-project.org/package=quanteda.textplots) -[![](https://img.shields.io/badge/devel%20version-0.94-royalblue.svg)](https://github.com/quanteda/quanteda.textplots) +[![](https://img.shields.io/badge/devel%20version-0.94.1-royalblue.svg)](https://github.com/quanteda/quanteda.textplots) [![Downloads](https://cranlogs.r-pkg.org/badges/quanteda.textplots)](https://CRAN.R-project.org/package=quanteda.textplots) [![Total Downloads](https://cranlogs.r-pkg.org/badges/grand-total/quanteda.textplots?color=orange)](https://CRAN.R-project.org/package=quanteda.textplots) [![R build status](https://github.com/quanteda/quanteda.textplots/workflows/R-CMD-check/badge.svg)](https://github.com/quanteda/quanteda.textplots/actions) -[![codecov](https://codecov.io/gh/quanteda/quanteda.textplots/branch/master/graph/badge.svg)](https://codecov.io/gh/quanteda/quanteda.textplots) +[![codecov](https://codecov.io/gh/quanteda/quanteda.textplots/branch/master/graph/badge.svg)](https://app.codecov.io/gh/quanteda/quanteda.textplots) [![DOI](http://joss.theoj.org/papers/10.21105/joss.00774/status.svg)](https://doi.org/10.21105/joss.00774) diff --git a/cran-comments.md b/cran-comments.md index e008ac1..19676ad 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,13 +1,13 @@ # Submission notes -Updates to remove minor warnings and to ensure compatibility with forthcoming quanteda v3. This version works with both quanteda v2.1.2 (on CRAN at the time of submission) and forthcoming v3. +Update to avoid breaking test with the forthcoming release of Matrix 1.4-1. # Checks ## Test environments -* local macOS 10.15.7, R 4.0.4 -* Ubuntu 18.04 LTS and 18.10, R 4.0.4 +* local macOS 12.3, R 4.1.3 +* Ubuntu 20.04 LTS, R 4.1.3 * Windows release via devtools::check_win_release() * Windows devel via devtools::check_win_devel() diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp index d802c93..5fe1227 100644 --- a/src/RcppExports.cpp +++ b/src/RcppExports.cpp @@ -5,6 +5,11 @@ using namespace Rcpp; +#ifdef RCPP_USE_GLOBAL_ROSTREAM +Rcpp::Rostream& Rcpp::Rcout = Rcpp::Rcpp_cout_get(); +Rcpp::Rostream& Rcpp::Rcerr = Rcpp::Rcpp_cerr_get(); +#endif + // qatd_cpp_is_overlap bool qatd_cpp_is_overlap(SEXP x1_, SEXP y1_, SEXP w1_, SEXP h1_, SEXP boxe_); RcppExport SEXP _quanteda_textplots_qatd_cpp_is_overlap(SEXP x1_SEXP, SEXP y1_SEXP, SEXP w1_SEXP, SEXP h1_SEXP, SEXP boxe_SEXP) {