Skip to content

Commit 6cc7991

Browse files
mattdowlemattdowle
committed
1.14.8 patch bump. Will tag patch-1.14 branch when publish date is confirmed.
1 parent cb8aeff commit 6cc7991

File tree

5 files changed

+31
-24
lines changed

5 files changed

+31
-24
lines changed

‎.dev/CRAN_Release.cmd‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,15 @@ R CMD build .
195195
export GITHUB_PAT="f1c.. github personal access token ..7ad"
196196
# avoids many too-many-requests in --as-cran's ping-all-URLs step (20 mins) inside the `checking CRAN incoming feasibility...` step.
197197
# Many thanks to Dirk for the tipoff that setting this env variable solves the problem, #4832.
198-
R CMD check data.table_1.14.7.tar.gz --as-cran
199-
R CMD INSTALL data.table_1.14.7.tar.gz --html
198+
R CMD check data.table_1.14.9.tar.gz --as-cran
199+
R CMD INSTALL data.table_1.14.9.tar.gz --html
200200

201201
# Test C locale doesn't break test suite (#2771)
202202
echo LC_ALL=C > ~/.Renviron
203203
R
204204
Sys.getlocale()=="C"
205205
q("no")
206-
R CMD check data.table_1.14.7.tar.gz
206+
R CMD check data.table_1.14.9.tar.gz
207207
rm ~/.Renviron
208208

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

221221
# User supplied PKG_CFLAGS and PKG_LIBS passed through, #4664
222222
# Next line from https://mac.r-project.org/openmp/. Should see the arguments passed through and then fail with gcc on linux.
223-
PKG_CFLAGS='-Xclang -fopenmp' PKG_LIBS=-lomp R CMD INSTALL data.table_1.14.7.tar.gz
223+
PKG_CFLAGS='-Xclang -fopenmp' PKG_LIBS=-lomp R CMD INSTALL data.table_1.14.9.tar.gz
224224
# Next line should work on Linux, just using superfluous and duplicate but valid parameters here to see them retained and work
225-
PKG_CFLAGS='-fopenmp' PKG_LIBS=-lz R CMD INSTALL data.table_1.14.7.tar.gz
225+
PKG_CFLAGS='-fopenmp' PKG_LIBS=-lz R CMD INSTALL data.table_1.14.9.tar.gz
226226

227227
R
228228
remove.packages("xml2") # we checked the URLs; don't need to do it again (many minutes)
@@ -266,7 +266,7 @@ alias R310=~/build/R-3.1.0/bin/R
266266
### END ONE TIME BUILD
267267

268268
cd ~/GitHub/data.table
269-
R310 CMD INSTALL ./data.table_1.14.7.tar.gz
269+
R310 CMD INSTALL ./data.table_1.14.9.tar.gz
270270
R310
271271
require(data.table)
272272
test.data.table(script="*.Rraw")
@@ -278,15 +278,15 @@ test.data.table(script="*.Rraw")
278278
vi ~/.R/Makevars
279279
# Make line SHLIB_OPENMP_CFLAGS= active to remove -fopenmp
280280
R CMD build .
281-
R CMD INSTALL data.table_1.14.7.tar.gz # ensure that -fopenmp is missing and there are no warnings
281+
R CMD INSTALL data.table_1.14.9.tar.gz # ensure that -fopenmp is missing and there are no warnings
282282
R
283283
require(data.table) # observe startup message about no OpenMP detected
284284
test.data.table()
285285
q("no")
286286
vi ~/.R/Makevars
287287
# revert change above
288288
R CMD build .
289-
R CMD check data.table_1.14.7.tar.gz
289+
R CMD check data.table_1.14.9.tar.gz
290290

291291

292292
#####################################################
@@ -320,7 +320,7 @@ make
320320

321321
cd ~/build/R-devel-strict-gcc
322322
# gcc-10 failed to build R-devel at some point, so using regular gcc-9 (9.3.0 as per focal/Pop!_OS 20.04)
323-
./configure --without-recommended-packages --disable-byte-compiled-packages --disable-openmp --enable-strict-barrier --disable-long-double CC="gcc-9 -fsanitize=undefined,address -fno-sanitize=float-divide-by-zero -fno-omit-frame-pointer"
323+
./configure --without-recommended-packages --disable-byte-compiled-packages --disable-openmp --enable-strict-barrier --disable-long-double CC="gcc-11 -fsanitize=undefined,address -fno-sanitize=float-divide-by-zero -fno-omit-frame-pointer"
324324
make
325325

326326
# See R-exts#4.3.3
@@ -341,11 +341,11 @@ alias Rdevel-strict-gcc='~/build/R-devel-strict-gcc/bin/R --vanilla'
341341
alias Rdevel-strict-clang='~/build/R-devel-strict-clang/bin/R --vanilla'
342342

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

@@ -391,7 +391,7 @@ cd R-devel-valgrind
391391
make
392392
cd ~/GitHub/data.table
393393
vi ~/.R/Makevars # make the -O2 -g line active, for info on source lines with any problems
394-
Rdevel-valgrind CMD INSTALL data.table_1.14.7.tar.gz
394+
Rdevel-valgrind CMD INSTALL data.table_1.14.9.tar.gz
395395
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"
396396
# the default for --show-leak-kinds is 'definite,possible' which we're setting explicitly here as a reminder. CRAN uses the default too.
397397
# including 'reachable' (as 'all' does) generates too much output from R itself about by-design permanent blocks
@@ -429,7 +429,7 @@ cd ~/build/rchk/trunk
429429
. ../scripts/config.inc
430430
. ../scripts/cmpconfig.inc
431431
vi ~/.R/Makevars # set CFLAGS=-O0 -g so that rchk can provide source line numbers
432-
echo 'install.packages("~/GitHub/data.table/data.table_1.14.7.tar.gz",repos=NULL)' | ./bin/R --slave
432+
echo 'install.packages("~/GitHub/data.table/data.table_1.14.9.tar.gz",repos=NULL)' | ./bin/R --slave
433433
# objcopy warnings (if any) can be ignored: https://github.com/kalibera/rchk/issues/17#issuecomment-497312504
434434
. ../scripts/check_package.sh data.table
435435
cat packages/lib/data.table/libs/*check
@@ -594,7 +594,7 @@ du -k inst/tests # 0.75MB after
594594
R CMD build .
595595
export GITHUB_PAT="f1c.. github personal access token ..7ad"
596596
Rdevel -q -e "packageVersion('xml2')" # ensure installed
597-
Rdevel CMD check data.table_1.14.8.tar.gz --as-cran # use latest Rdevel as it may have extra checks
597+
Rdevel CMD check data.table_1.14.10.tar.gz --as-cran # use latest Rdevel as it may have extra checks
598598
#
599599
bunzip2 inst/tests/*.Rraw.bz2 # decompress *.Rraw again so as not to commit compressed *.Rraw to git
600600
#
@@ -621,8 +621,8 @@ When CRAN's email contains "Pretest results OK pending a manual inspection" (or
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 dllVersion() in init.c
623623
5. Bump 3 version numbers in Makefile
624-
6. Search and replace this .dev/CRAN_Release.cmd to update 1.14.7 to 1.14.9 inc below, 1.14.8 to 1.14.10 above, 1.14.6 to 1.14.8 below
624+
6. Search and replace this .dev/CRAN_Release.cmd to update 1.14.9 to 1.14.11 inc below, 1.14.10 to 1.14.12 above, 1.14.8 to 1.14.10 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.14.6 on CRAN. Bump to 1.14.7"
627-
9. Take sha from step 8 and run `git tag 1.14.6 96c..sha..d77` then `git push origin 1.14.6` (not `git push --tags` according to https://stackoverflow.com/a/5195913/403310)
626+
8. Push to master with this consistent commit message: "1.14.8 on CRAN. Bump to 1.14.10"
627+
9. Take sha from step 8 and run `git tag 1.14.8 96c..sha..d77` then `git push origin 1.14.8` (not `git push --tags` according to https://stackoverflow.com/a/5195913/403310)
628628
######

‎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.14.7
2+
Version: 1.14.9
33
Title: Extension of `data.frame`
44
Depends: R (>= 3.1.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.14.7.tar.gz
21+
$(RM) data.table_1.14.9.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.14.7.tar.gz
31+
$(R) CMD INSTALL data.table_1.14.9.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.14.7.tar.gz --as-cran --ignore-vignettes --no-stop-on-test-error
43+
_R_CHECK_CRAN_INCOMING_REMOTE_=false $(R) CMD check data.table_1.14.9.tar.gz --as-cran --ignore-vignettes --no-stop-on-test-error
4444

4545
.PHONY: revision
4646
revision:

‎NEWS.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
**If you are viewing this file on CRAN, please check [latest news on GitHub](https://github.com/Rdatatable/data.table/blob/master/NEWS.md) where the formatting is also better.**
22

3-
# data.table [v1.14.7](https://github.com/Rdatatable/data.table/milestone/20) (in development)
3+
# data.table [v1.14.9](https://github.com/Rdatatable/data.table/milestone/20) (in development)
44

55
## NEW FEATURES
66

@@ -611,6 +611,13 @@
611611
15. Thanks to @ssh352, Václav Tlapák, Cole Miller, András Svraka and Toby Dylan Hocking for reporting and bisecting a significant performance regression in dev. This was fixed before release thanks to a PR by Jan Gorecki, [#5463](https://github.com/Rdatatable/data.table/pull/5463).
612612
613613
614+
# data.table [v1.14.8](https://github.com/Rdatatable/data.table/milestone/28?closed=1)
615+
616+
## BUG FIXES
617+
618+
## NOTES
619+
620+
614621
# data.table [v1.14.6](https://github.com/Rdatatable/data.table/milestone/27?closed=1) (16 Nov 2022)
615622
616623
## BUG FIXES

‎src/init.c‎

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

352352
SEXP dllVersion(void) {
353353
// .onLoad calls this and checks the same as packageVersion() to ensure no R/C version mismatch, #3056
354-
return(ScalarString(mkChar("1.14.7")));
354+
return(ScalarString(mkChar("1.14.9")));
355355
}
356356

0 commit comments

Comments
 (0)