From 7eba3cace2d94d9ba50b5bef25610f7904aac7d1 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Sun, 1 Sep 2024 08:05:06 -0500 Subject: [PATCH 1/3] Use Authors@R (#1327) --- ChangeLog | 31 +++++++++++++++++++++++++++++++ DESCRIPTION | 23 ++++++++++++++++++----- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a7c7bd3e..1dafcc1ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +2024-08-31 Dirk Eddelbuettel + + * DESCRIPTION (Authors@R): Added + +2024-08-28 Dirk Eddelbuettel + + * R/Rcpp.package.skeleton.R: Create DESCRIPTION with Auhors@R fiel + * inst/tinytest/test_rcpp_package_skeleton.R: Adjust tests + +2024-08-20 Dirk Eddelbuettel + + * inst/tinytest/test_sugar.R: Skip one more NA related test on arm64 + and macOS as failure is seen at r-universe on arm64 + + * .github/workflows/macos.yaml: Add basic r-ci setup but dialed-down + to macOS only (as Linux is covered via multiple Docker setups) + +2024-08-19 Dirk Eddelbuettel + + * Contributing.md: Refreshed content + +2024-07-30 Dirk Eddelbuettel + + * vignettes/rmd/Rcpp-modules.Rmd (are): Add short two-sentence + illustration following GitHub issue #1322 + +2024-07-24 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): Roll micro version + * inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem + 2024-07-11 Dirk Eddelbuettel * DESCRIPTION (Date, Version): Release 1.0.13 diff --git a/DESCRIPTION b/DESCRIPTION index 01d48eef7..11b2f29b6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,10 +1,23 @@ Package: Rcpp Title: Seamless R and C++ Integration -Version: 1.0.13 -Date: 2024-07-11 -Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou, - Nathan Russell, Inaki Ucar, Douglas Bates and John Chambers -Maintainer: Dirk Eddelbuettel +Version: 1.0.13-1 +Date: 2024-11-01 +Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org", + comment = c(ORCID = "0000-0001-6419-907X")), + person("Romain", "Francois", role = "aut", + comment = c(ORCID = "0000-0002-2444-4226")), + person("JJ", "Allaire", role = "aut", + comment = c(ORCID = "0000-0003-0174-9868")), + person("Kevin", "Ushey", role = "aut", + comment = c(ORCID = "0000-0003-2880-7407")), + person("Qiang", "Kou", role = "aut", + comment = c(ORCID = "0000-0001-6786-5453")), + person("Nathan", "Russell", role = "aut"), + person("Iñaki", "Ucar", role = "aut", + comment = c(ORCID = "0000-0001-6403-5550")), + person("Doug", "Bates", role = "aut", + comment = c(ORCID = "0000-0001-8316-9503")), + person("John", "Chambers", role = "aut")) Description: The 'Rcpp' package provides R functions as well as C++ classes which offer a seamless integration of R and C++. Many R data types and objects can be mapped back and forth to C++ equivalents which facilitates both writing of new From f558d92838c431797dcc474d213a736df8d24f49 Mon Sep 17 00:00:00 2001 From: Kevin Ushey Date: Thu, 31 Oct 2024 09:38:38 -0700 Subject: [PATCH 2/3] require R 4.5.0 (closes #1341) (#1342) --- ChangeLog | 58 ++++++++++++++++++++++++++++++++++++ inst/include/Rcpp/r/compat.h | 4 +-- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1dafcc1ed..30004e2da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,61 @@ +2024-10-31 Kevin Ushey + + * inst/include/Rcpp/r/compat.h: Require R (>= 4.5.0) for new APIs + +2024-10-26 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): Roll micro version to 1.0.13.4 + * inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem + + * .github/workflows/ci.yaml (jobs): Roll checkout action to v4 + +2024-10-26 Gábor Csárdi + + * inst/include/Rcpp/exceptions_impl.h: check for DragonFlyBSD to fix + compilation + +2024-10-07 Iñaki Ucar + + * inst/include/Rcpp/platform/compiler.h: Uncomment + HAS_VARIADIC_TEMPLATES macro definition + * src/api.cpp: Simplify checks for variadic templates + * inst/include/Rcpp/DataFrame.h: Idem + * inst/include/Rcpp/DottedPair.h: Idem + * inst/include/Rcpp/Function.h: Idem + * inst/include/Rcpp/InternalFunctionWithStdFunction.h: Idem + * inst/include/Rcpp/Language.h: Idem + * inst/include/Rcpp/Pairlist.h: Idem + * inst/include/Rcpp/grow.h: Idem + * inst/include/Rcpp/internal/call.h: Idem + * inst/include/Rcpp/module/class.h: Idem + * inst/include/Rcpp/traits/index_sequence.h: Idem + * inst/include/Rcpp/traits/named_object.h: Idem + * inst/include/Rcpp/vector/Vector.h: Idem + * inst/include/Rcpp/Module.h: Idem + add missing is_void method + * inst/tinytest/test_module.R: Add test for void functions and + methods + +2024-10-04 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): Roll micro version to 1.0.13.3 + * inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem + +2024-09-29 Dirk Eddelbuettel + + * inst/include/Rcpp/vector/Vector.h: Remove a cast as R_xlen_t + is returned now + +2024-09-17 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): Roll micro version + * inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem + +2024-09-12 Iñaki Ucar + + * vignettes/.gitignore: Refinement to ignore more files under rmd/ + * vignettes/pdf/*: Rebuilt with Ghostscript 10.03.1 + * vignettes/*.pdf: Idem + 2024-08-31 Dirk Eddelbuettel * DESCRIPTION (Authors@R): Added diff --git a/inst/include/Rcpp/r/compat.h b/inst/include/Rcpp/r/compat.h index 218f3d7bc..720471b89 100644 --- a/inst/include/Rcpp/r/compat.h +++ b/inst/include/Rcpp/r/compat.h @@ -24,13 +24,13 @@ #include -#if R_VERSION >= R_Version(4, 4, 2) +#if R_VERSION >= R_Version(4, 5, 0) # define RCPP_STRING_PTR STRING_PTR_RO #else # define RCPP_STRING_PTR STRING_PTR #endif -#if R_VERSION >= R_Version(4, 4, 2) +#if R_VERSION >= R_Version(4, 5, 0) # define RCPP_VECTOR_PTR VECTOR_PTR_RO #else # define RCPP_VECTOR_PTR VECTOR_PTR From f96d3c6da9e9f719169918c746249d7ffca67dc2 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Fri, 1 Nov 2024 08:11:47 -0500 Subject: [PATCH 3/3] Release 1.0.13-1 --- ChangeLog | 87 +++----------------------------------- inst/NEWS.Rd | 14 ++++++ inst/include/Rcpp/config.h | 4 +- 3 files changed, 23 insertions(+), 82 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30004e2da..93847d47f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,92 +1,19 @@ -2024-10-31 Kevin Ushey - - * inst/include/Rcpp/r/compat.h: Require R (>= 4.5.0) for new APIs - -2024-10-26 Dirk Eddelbuettel - - * DESCRIPTION (Version, Date): Roll micro version to 1.0.13.4 - * inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem - - * .github/workflows/ci.yaml (jobs): Roll checkout action to v4 - -2024-10-26 Gábor Csárdi - - * inst/include/Rcpp/exceptions_impl.h: check for DragonFlyBSD to fix - compilation +2024-11-01 Dirk Eddelbuettel -2024-10-07 Iñaki Ucar + * DESCRIPTION (Date, Version): Release 1.0.13-1 - * inst/include/Rcpp/platform/compiler.h: Uncomment - HAS_VARIADIC_TEMPLATES macro definition - * src/api.cpp: Simplify checks for variadic templates - * inst/include/Rcpp/DataFrame.h: Idem - * inst/include/Rcpp/DottedPair.h: Idem - * inst/include/Rcpp/Function.h: Idem - * inst/include/Rcpp/InternalFunctionWithStdFunction.h: Idem - * inst/include/Rcpp/Language.h: Idem - * inst/include/Rcpp/Pairlist.h: Idem - * inst/include/Rcpp/grow.h: Idem - * inst/include/Rcpp/internal/call.h: Idem - * inst/include/Rcpp/module/class.h: Idem - * inst/include/Rcpp/traits/index_sequence.h: Idem - * inst/include/Rcpp/traits/named_object.h: Idem - * inst/include/Rcpp/vector/Vector.h: Idem - * inst/include/Rcpp/Module.h: Idem + add missing is_void method - * inst/tinytest/test_module.R: Add test for void functions and - methods - -2024-10-04 Dirk Eddelbuettel - - * DESCRIPTION (Version, Date): Roll micro version to 1.0.13.3 - * inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem + * Hot-fix release containing two PRs on top of 1.0.13: + - #1342: Permit R 4.4.2 builds by correcting to R 4.5.0 for RO PTR + - #1327: Switch to Authors@R in DESCRIPTION -2024-09-29 Dirk Eddelbuettel - - * inst/include/Rcpp/vector/Vector.h: Remove a cast as R_xlen_t - is returned now - -2024-09-17 Dirk Eddelbuettel - - * DESCRIPTION (Version, Date): Roll micro version - * inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem - -2024-09-12 Iñaki Ucar +2024-10-31 Kevin Ushey - * vignettes/.gitignore: Refinement to ignore more files under rmd/ - * vignettes/pdf/*: Rebuilt with Ghostscript 10.03.1 - * vignettes/*.pdf: Idem + * inst/include/Rcpp/r/compat.h: Require R (>= 4.5.0) for new APIs 2024-08-31 Dirk Eddelbuettel * DESCRIPTION (Authors@R): Added -2024-08-28 Dirk Eddelbuettel - - * R/Rcpp.package.skeleton.R: Create DESCRIPTION with Auhors@R fiel - * inst/tinytest/test_rcpp_package_skeleton.R: Adjust tests - -2024-08-20 Dirk Eddelbuettel - - * inst/tinytest/test_sugar.R: Skip one more NA related test on arm64 - and macOS as failure is seen at r-universe on arm64 - - * .github/workflows/macos.yaml: Add basic r-ci setup but dialed-down - to macOS only (as Linux is covered via multiple Docker setups) - -2024-08-19 Dirk Eddelbuettel - - * Contributing.md: Refreshed content - -2024-07-30 Dirk Eddelbuettel - - * vignettes/rmd/Rcpp-modules.Rmd (are): Add short two-sentence - illustration following GitHub issue #1322 - -2024-07-24 Dirk Eddelbuettel - - * DESCRIPTION (Version, Date): Roll micro version - * inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem - 2024-07-11 Dirk Eddelbuettel * DESCRIPTION (Date, Version): Release 1.0.13 diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd index bae7c5063..ab37ed69e 100644 --- a/inst/NEWS.Rd +++ b/inst/NEWS.Rd @@ -3,6 +3,20 @@ \newcommand{\ghpr}{\href{https://github.com/RcppCore/Rcpp/pull/#1}{##1}} \newcommand{\ghit}{\href{https://github.com/RcppCore/Rcpp/issues/#1}{##1}} +\section{Changes in Rcpp release version 1.0.13-1 (2024-11-01)}{ + \itemize{ + \item Changes in Rcpp API: + \itemize{ + \item Use read-only \code{VECTOR_PTR} and \code{STRING_PTR} only with + with R 4.5.0 or later (Kevin in \ghpr{1342} fixing \ghit{1341}) + } + \item Changes in Rcpp Deployment: + \itemize{ + \item Authors@R is now used in DESCRIPTION as mandated by CRAN + } + } +} + \section{Changes in Rcpp release version 1.0.13 (2024-07-11)}{ \itemize{ \item Changes in Rcpp API: diff --git a/inst/include/Rcpp/config.h b/inst/include/Rcpp/config.h index 1f34603ac..5ae0684f3 100644 --- a/inst/include/Rcpp/config.h +++ b/inst/include/Rcpp/config.h @@ -30,7 +30,7 @@ #define RCPP_VERSION_STRING "1.0.13" // the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it) -#define RCPP_DEV_VERSION RcppDevVersion(1,0,13,0) -#define RCPP_DEV_VERSION_STRING "1.0.13.0" +#define RCPP_DEV_VERSION RcppDevVersion(1,0,13,1) +#define RCPP_DEV_VERSION_STRING "1.0.13.1" #endif