Skip to content

Commit 6c69c15

Browse files
1.16.0 on CRAN. Bump to 1.16.99 (#6417)
* Bump to dev version * bump dev version in init.c * Makefile to new dev version * CRAN_Release to dev version --------- Co-authored-by: Tyson Barrett <[email protected]>
1 parent 3a7b7a2 commit 6c69c15

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

.dev/CRAN_Release.cmd

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@ R CMD build .
189189
export GITHUB_PAT="f1c.. github personal access token ..7ad"
190190
# avoids many too-many-requests in --as-cran's ping-all-URLs step (20 mins) inside the `checking CRAN incoming feasibility...` step.
191191
# Many thanks to Dirk for the tipoff that setting this env variable solves the problem, #4832.
192-
R CMD check data.table_1.15.99.tar.gz --as-cran
193-
R CMD INSTALL data.table_1.15.99.tar.gz --html
192+
R CMD check data.table_1.16.99.tar.gz --as-cran
193+
R CMD INSTALL data.table_1.16.99.tar.gz --html
194194

195195
# Test C locale doesn't break test suite (#2771)
196196
echo LC_ALL=C > ~/.Renviron
197197
R
198198
Sys.getlocale()=="C"
199199
q("no")
200-
R CMD check data.table_1.15.99.tar.gz
200+
R CMD check data.table_1.16.99.tar.gz
201201
rm ~/.Renviron
202202

203203
# Test non-English does not break test.data.table() due to translation of messages; #3039, #630
@@ -214,9 +214,9 @@ q("no")
214214

215215
# User supplied PKG_CFLAGS and PKG_LIBS passed through, #4664
216216
# Next line from https://mac.r-project.org/openmp/. Should see the arguments passed through and then fail with gcc on linux.
217-
PKG_CFLAGS='-Xclang -fopenmp' PKG_LIBS=-lomp R CMD INSTALL data.table_1.15.99.tar.gz
217+
PKG_CFLAGS='-Xclang -fopenmp' PKG_LIBS=-lomp R CMD INSTALL data.table_1.16.99.tar.gz
218218
# Next line should work on Linux, just using superfluous and duplicate but valid parameters here to see them retained and work
219-
PKG_CFLAGS='-fopenmp' PKG_LIBS=-lz R CMD INSTALL data.table_1.15.99.tar.gz
219+
PKG_CFLAGS='-fopenmp' PKG_LIBS=-lz R CMD INSTALL data.table_1.16.99.tar.gz
220220

221221
R
222222
remove.packages("xml2") # we checked the URLs; don't need to do it again (many minutes)
@@ -260,7 +260,7 @@ alias R330=~/build/R-3.3.0/bin/R
260260
### END ONE TIME BUILD
261261

262262
cd ~/GitHub/data.table
263-
R330 CMD INSTALL ./data.table_1.15.99.tar.gz
263+
R330 CMD INSTALL ./data.table_1.16.99.tar.gz
264264
R330
265265
require(data.table)
266266
test.data.table(script="*.Rraw")
@@ -272,15 +272,15 @@ test.data.table(script="*.Rraw")
272272
vi ~/.R/Makevars
273273
# Make line SHLIB_OPENMP_CFLAGS= active to remove -fopenmp
274274
R CMD build .
275-
R CMD INSTALL data.table_1.15.99.tar.gz # ensure that -fopenmp is missing and there are no warnings
275+
R CMD INSTALL data.table_1.16.99.tar.gz # ensure that -fopenmp is missing and there are no warnings
276276
R
277277
require(data.table) # observe startup message about no OpenMP detected
278278
test.data.table()
279279
q("no")
280280
vi ~/.R/Makevars
281281
# revert change above
282282
R CMD build .
283-
R CMD check data.table_1.15.99.tar.gz
283+
R CMD check data.table_1.16.99.tar.gz
284284

285285

286286
#####################################################
@@ -335,11 +335,11 @@ alias Rdevel-strict-gcc='~/build/R-devel-strict-gcc/bin/R --vanilla'
335335
alias Rdevel-strict-clang='~/build/R-devel-strict-clang/bin/R --vanilla'
336336

337337
cd ~/GitHub/data.table
338-
Rdevel-strict-[gcc|clang] CMD INSTALL data.table_1.15.99.tar.gz
338+
Rdevel-strict-[gcc|clang] CMD INSTALL data.table_1.16.99.tar.gz
339339
# Check UBSAN and ASAN flags appear in compiler output above. Rdevel was compiled with them so they should be
340340
# passed through to here. However, our configure script seems to get in the way and gets them from {R_HOME}/bin/R
341341
# So I needed to edit my ~/.R/Makevars to get CFLAGS the way I needed.
342-
Rdevel-strict-[gcc|clang] CMD check data.table_1.15.99.tar.gz
342+
Rdevel-strict-[gcc|clang] CMD check data.table_1.16.99.tar.gz
343343
# Use the (failed) output to get the list of currently needed packages and install them
344344
Rdevel-strict-[gcc|clang]
345345
isTRUE(.Machine$sizeof.longdouble==0) # check noLD is being tested
@@ -348,7 +348,7 @@ install.packages(c("bit64", "bit", "R.utils", "xts", "zoo", "yaml", "knitr", "ma
348348
Ncpus=4)
349349
# Issue #5491 showed that CRAN is running UBSAN on .Rd examples which found an error so we now run full R CMD check
350350
q("no")
351-
Rdevel-strict-[gcc|clang] CMD check data.table_1.15.99.tar.gz
351+
Rdevel-strict-[gcc|clang] CMD check data.table_1.16.99.tar.gz
352352
# UBSAN errors occur on stderr and don't affect R CMD check result. Made many failed attempts to capture them. So grep for them.
353353
find data.table.Rcheck -name "*Rout*" -exec grep -H "runtime error" {} \;
354354

@@ -385,7 +385,7 @@ cd R-devel-valgrind
385385
make
386386
cd ~/GitHub/data.table
387387
vi ~/.R/Makevars # make the -O2 -g line active, for info on source lines with any problems
388-
Rdevel-valgrind CMD INSTALL data.table_1.15.99.tar.gz
388+
Rdevel-valgrind CMD INSTALL data.table_1.16.99.tar.gz
389389
R_DONT_USE_TK=true Rdevel-valgrind -d "valgrind --tool=memcheck --leak-check=full --track-origins=yes --show-leak-kinds=definite,possible --gen-suppressions=all --suppressions=./.dev/valgrind.supp -s"
390390
# the default for --show-leak-kinds is 'definite,possible' which we're setting explicitly here as a reminder. CRAN uses the default too.
391391
# including 'reachable' (as 'all' does) generates too much output from R itself about by-design permanent blocks
@@ -423,7 +423,7 @@ cd ~/build/rchk/trunk
423423
. ../scripts/config.inc
424424
. ../scripts/cmpconfig.inc
425425
vi ~/.R/Makevars # set CFLAGS=-O0 -g so that rchk can provide source line numbers
426-
echo 'install.packages("~/GitHub/data.table/data.table_1.15.99.tar.gz",repos=NULL)' | ./bin/R --slave
426+
echo 'install.packages("~/GitHub/data.table/data.table_1.16.99.tar.gz",repos=NULL)' | ./bin/R --slave
427427
# objcopy warnings (if any) can be ignored: https://github.com/kalibera/rchk/issues/17#issuecomment-497312504
428428
. ../scripts/check_package.sh data.table
429429
cat packages/lib/data.table/libs/*check
@@ -589,7 +589,7 @@ du -k inst/tests # 0.75MB after
589589
R CMD build .
590590
export GITHUB_PAT="f1c.. github personal access token ..7ad"
591591
Rdevel -q -e "packageVersion('xml2')" # ensure installed
592-
Rdevel CMD check data.table_1.16.0.tar.gz --as-cran # use latest Rdevel as it may have extra checks
592+
Rdevel CMD check data.table_1.17.0.tar.gz --as-cran # use latest Rdevel as it may have extra checks
593593
bunzip2 inst/tests/*.Rraw.bz2 # decompress *.Rraw again so as not to commit compressed *.Rraw to git
594594

595595
#
@@ -621,10 +621,10 @@ bunzip2 inst/tests/*.Rraw.bz2 # decompress *.Rraw again so as not to commit com
621621
# 3. Add new heading in NEWS for the next dev version. Add "(submitted to CRAN on <today>)" on the released heading.
622622
# 4. Bump minor version in dllVersion() in init.c
623623
# 5. Bump 3 minor version numbers in Makefile
624-
# 6. Search and replace this .dev/CRAN_Release.cmd to update 1.15.99 to 1.16.99 inc below, 1.16.0 to 1.17.0 above, 1.15.0 to 1.16.0 below
624+
# 6. Search and replace this .dev/CRAN_Release.cmd to update 1.16.99 to 1.16.99 inc below, 1.16.0 to 1.17.0 above, 1.15.0 to 1.16.0 below
625625
# 7. Another final gd to view all diffs using meld. (I have `alias gd='git difftool &> /dev/null'` and difftool meld: http://meldmerge.org/)
626-
# 8. Push to master with this consistent commit message: "1.16.0 on CRAN. Bump to 1.16.99"
627-
# 9. Take sha from the previous step and run `git tag 1.16.0 96c..sha..d77` then `git push origin 1.16.0` (not `git push --tags` according to https://stackoverflow.com/a/5195913/403310)
626+
# 8. Push to master with this consistent commit message: "1.17.0 on CRAN. Bump to 1.17.99"
627+
# 9. Take sha from the previous step and run `git tag 1.17.0 96c..sha..d77` then `git push origin 1.16.0` (not `git push --tags` according to https://stackoverflow.com/a/5195913/403310)
628628
######
629629

630630
###### Branching policy for PATCH RELEASE

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: data.table
2-
Version: 1.15.99
2+
Version: 1.16.99
33
Title: Extension of `data.frame`
44
Depends: R (>= 3.3.0)
55
Imports: methods

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ some:
1818

1919
.PHONY: clean
2020
clean:
21-
$(RM) data.table_1.15.99.tar.gz
21+
$(RM) data.table_1.16.99.tar.gz
2222
$(RM) src/*.o
2323
$(RM) src/*.so
2424

@@ -28,7 +28,7 @@ build:
2828

2929
.PHONY: install
3030
install:
31-
$(R) CMD INSTALL data.table_1.15.99.tar.gz
31+
$(R) CMD INSTALL data.table_1.16.99.tar.gz
3232

3333
.PHONY: uninstall
3434
uninstall:
@@ -40,7 +40,7 @@ test:
4040

4141
.PHONY: check
4242
check:
43-
_R_CHECK_CRAN_INCOMING_REMOTE_=false $(R) CMD check data.table_1.15.99.tar.gz --as-cran --ignore-vignettes --no-stop-on-test-error
43+
_R_CHECK_CRAN_INCOMING_REMOTE_=false $(R) CMD check data.table_1.16.99.tar.gz --as-cran --ignore-vignettes --no-stop-on-test-error
4444

4545
.PHONY: revision
4646
revision:

src/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,6 @@ SEXP initLastUpdated(SEXP var) {
369369

370370
SEXP dllVersion(void) {
371371
// .onLoad calls this and checks the same as packageVersion() to ensure no R/C version mismatch, #3056
372-
return(ScalarString(mkChar("1.15.99")));
372+
return(ScalarString(mkChar("1.16.99")));
373373
}
374374

0 commit comments

Comments
 (0)