Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/simpler description #1029

Merged
merged 2 commits into from
Dec 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2019-12-01 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll minor version
* inst/include/Rcpp/config.h: Idem

* DESCRIPTION (Suggests): Remove knitr, rmarkdown, pinp
* DESCRIPTION (VignetteBuilder): Remove knitr

2019-11-26 Dirk Eddelbuettel <edd@debian.org>

* inst/tinytest/test_embedded_r.R: Use sink to suppress noisy output,
Expand Down
7 changes: 3 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: Rcpp
Title: Seamless R and C++ Integration
Version: 1.0.3.2
Date: 2019-11-19
Version: 1.0.3.3
Date: 2019-12-01
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
Nathan Russell, Douglas Bates and John Chambers
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Expand All @@ -16,8 +16,7 @@ Description: The 'Rcpp' package provides R functions as well as C++ classes whic
<doi:10.1080/00031305.2017.1375990>); see 'citation("Rcpp")' for details.
Depends: R (>= 3.0.0)
Imports: methods, utils
Suggests: tinytest, inline, rbenchmark, knitr, rmarkdown, pinp, pkgKitten (>= 0.1.2)
VignetteBuilder: knitr
Suggests: tinytest, inline, rbenchmark, pkgKitten (>= 0.1.2)
URL: http://www.rcpp.org, http://dirk.eddelbuettel.com/code/rcpp.html, https://github.com/RcppCore/Rcpp
License: GPL (>= 2)
BugReports: https://github.com/RcppCore/Rcpp/issues
Expand Down
4 changes: 2 additions & 2 deletions inst/include/Rcpp/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define RCPP_VERSION_STRING "1.0.3"

// the current source snapshot
#define RCPP_DEV_VERSION RcppDevVersion(1,0,3,2)
#define RCPP_DEV_VERSION_STRING "1.0.3.2"
#define RCPP_DEV_VERSION RcppDevVersion(1,0,3,3)
#define RCPP_DEV_VERSION_STRING "1.0.3.3"

#endif