Skip to content

Commit a29c209

Browse files
authored
Bump master to 1.18.99 (#7513)
* 1.18.0 on CRAN. Bump to 1.18.99 * bump version to dev
1 parent e13f993 commit a29c209

File tree

7 files changed

+621
-638
lines changed

7 files changed

+621
-638
lines changed

.dev/CRAN_Release.cmd

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ rm -rf ./data.table.Rcheck
4747

4848
checkbashisms ./configure # for portability; e.g. Solaris 10 running Bourne shell; #3964
4949

50-
# Ensure no non-ASCII, other than in README.md is ok
50+
# Ensure no non-ASCII, other than in README.md DESCRIPTION vignettes *.yml and *.po are ok
5151
# tests.Rraw in particular have failed CRAN Solaris (only) due to this.
52-
grep -RI --exclude-dir=".git" --exclude="*.md" --exclude="*~" --color='auto' -P -n "[\x80-\xFF]" ./
52+
grep -RI --exclude-dir=".git" --exclude-dir="vignettes" --exclude="*.yml" --exclude="*.md" --exclude="*.po" --exclude="*~" --exclude="DESCRIPTION" --color='auto' -P -n "[\x80-\xFF]" ./
5353

5454
# Unicode is now ok. This unicode in tests.Rraw is passing on CRAN.
55-
grep -RI --exclude-dir=".git" --exclude="*.md" --exclude="*~" --color='auto' -n "[\]u[0-9]" ./
55+
# grep -RI --exclude-dir=".git" --exclude="*.md" --exclude="*~" --color='auto' -n "[\]u[0-9]" ./
5656

5757
# Ensure no calls to omp_get_max_threads() also since access should be via getDTthreads()
5858
grep --exclude="./src/openmp-utils.c" omp_get_max_threads ./src/*
@@ -80,14 +80,14 @@ grep "Rprintf" ./src/init.c
8080
# workaround for IBM AIX - ensure no globals named 'nearest' or 'class'.
8181
# See https://github.com/Rdatatable/data.table/issues/1351
8282
grep "nearest *=" ./src/*.c # none
83-
grep "class *=" ./src/*.c # quite a few but none global
83+
grep "class *=" ./src/*.c # only one
8484

8585
# ensure no use of z_const from zconf.h; #3939
8686
grep "z_const" ./src/*.[hc] # none other than the comment
8787

8888
# No undefined type punning of the form: *(long long *)&REAL(column)[i]
8989
# Failed clang 3.9.1 -O3 due to this, I think.
90-
grep "&REAL" ./src/*.c
90+
grep "&REAL" ./src/*.c # one instance in init.c
9191

9292
# No [UN]PROTECT_PTR, #3232
9393
grep "PROTECT_PTR" ./src/*.c
@@ -107,13 +107,13 @@ grep -n "[^A-Za-z0-9]F[^A-Za-z0-9]" ./inst/tests/tests.Rraw
107107
grep -Enr "\bifelse" R
108108

109109
# use substr() instead of substring(), #4447
110-
grep -Fnr "substring" R
110+
grep -Fnr "substring" R # one instance in test.data.table.R
111111

112112
# No system.time in main tests.Rraw. Timings should be in benchmark.Rraw
113-
grep -Fn "system.time" ./inst/tests/*.Rraw | grep -Fv "benchmark.Rraw" | grep -Fv "this system.time usage ok"
113+
grep -Fn "system.time" ./inst/tests/*.Rraw | grep -Fv "benchmark.Rraw" | grep -Fv "this system.time usage ok" # only in froll.Rraw
114114

115115
# No tryCatch in *.Rraw -- tryCatch should be handled only in test() itself to avoid silently missed warnings/errors/output
116-
grep -Fn "tryCatch" ./inst/tests/*.Rraw
116+
grep -Fn "tryCatch" ./inst/tests/*.Rraw # only one outside of test() ./inst/tests/tests.Rraw:21594
117117

118118
# All % in *.Rd should be escaped otherwise text gets silently chopped
119119
grep -n "[^\]%" ./man/*.Rd
@@ -168,8 +168,8 @@ R CMD build .
168168
export GITHUB_PAT="f1c.. github personal access token ..7ad"
169169
# avoids many too-many-requests in --as-cran's ping-all-URLs step (20 mins) inside the `checking CRAN incoming feasibility...` step.
170170
# Many thanks to Dirk for the tipoff that setting this env variable solves the problem, #4832.
171-
R CMD check data.table_1.16.99.tar.gz --as-cran
172-
R CMD INSTALL data.table_1.16.99.tar.gz --html
171+
R CMD check data.table_1.18.99.tar.gz --as-cran
172+
R CMD INSTALL data.table_1.18.99.tar.gz --html
173173

174174
# Test C locale doesn't break test suite (#2771)
175175
echo LC_ALL=C > ~/.Renviron
@@ -193,9 +193,9 @@ q("no")
193193

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

200200
R
201201
remove.packages("xml2") # we checked the URLs; don't need to do it again (many minutes)
@@ -239,7 +239,7 @@ alias R340=~/build/R-3.4.0/bin/R
239239
### END ONE TIME BUILD
240240

241241
cd ~/GitHub/data.table
242-
R340 CMD INSTALL ./data.table_1.16.99.tar.gz
242+
R340 CMD INSTALL ./data.table_1.18.99.tar.gz
243243
R340
244244
require(data.table)
245245
test.data.table(script="*.Rraw")
@@ -251,15 +251,15 @@ test.data.table(script="*.Rraw")
251251
vi ~/.R/Makevars
252252
# Make line SHLIB_OPENMP_CFLAGS= active to remove -fopenmp
253253
R CMD build .
254-
R CMD INSTALL data.table_1.16.99.tar.gz # ensure that -fopenmp is missing and there are no warnings
254+
R CMD INSTALL data.table_1.18.99.tar.gz # ensure that -fopenmp is missing and there are no warnings
255255
R
256256
require(data.table) # observe startup message about no OpenMP detected
257257
test.data.table()
258258
q("no")
259259
vi ~/.R/Makevars
260260
# revert change above
261261
R CMD build .
262-
R CMD check data.table_1.16.99.tar.gz
262+
R CMD check data.table_1.18.99.tar.gz
263263

264264

265265
#####################################################
@@ -568,7 +568,7 @@ du -k inst/tests # 0.75MiB after
568568
R CMD build .
569569
export GITHUB_PAT="f1c.. github personal access token ..7ad"
570570
Rdevel -q -e "packageVersion('xml2')" # ensure installed
571-
Rdevel CMD check data.table_1.17.0.tar.gz --as-cran # use latest Rdevel as it may have extra checks
571+
Rdevel CMD check data.table_1.18.0.tar.gz --as-cran # use latest Rdevel as it may have extra checks
572572
bunzip2 inst/tests/*.Rraw.bz2 # decompress *.Rraw again so as not to commit compressed *.Rraw to git
573573

574574
#
@@ -596,12 +596,12 @@ bunzip2 inst/tests/*.Rraw.bz2 # decompress *.Rraw again so as not to commit com
596596
# 0. Start a new branch `cran-x.y.0` with the code as submitted to CRAN
597597
# - Check that 'git status' shows 4 files in modified and uncommitted state: DESCRIPTION, NEWS.md, init.c and this .dev/CRAN_Release.cmd
598598
# - The branch should have one commit with precisely these 4 files being edited
599-
# 1. Follow up with a commit with this consistent commit message like: "1.17.0 on CRAN. Bump to 1.17.99" to this branch bumping to the next dev version
599+
# 1. Follow up with a commit with this consistent commit message like: "1.18.0 on CRAN. Bump to 1.18.99" to this branch bumping to the next dev version
600600
# - Bump minor version in DESCRIPTION to next odd number. Note that DESCRIPTION was in edited and uncommitted state so even number never appears in git.
601601
# - Add new heading in NEWS for the next dev version. Add "(submitted to CRAN on <today>)" on the released heading.
602602
# - Bump minor version in dllVersion() in init.c
603603
# - Bump 3 minor version numbers in Makefile
604-
# - 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
604+
# - Search and replace this .dev/CRAN_Release.cmd to update 1.17.99 to 1.18.99 inc below, 1.17.0 to 1.18.0
605605
# - Another final gd to view all diffs using meld. (I have `alias gd='git difftool &> /dev/null'` and difftool meld: http://meldmerge.org/)
606606
# 2. Ideally, no PRs are reviewed while a CRAN submission is pending. Any reviews that do happen MUST target this branch, NOT master!
607607
# 3. Once the submission lands on CRAN, merge this branch WITHOUT SQUASHING!

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.17.99
2+
Version: 1.18.99
33
Title: Extension of `data.frame`
44
Depends: R (>= 3.4.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.17.99.tar.gz
21+
$(RM) data.table_1.18.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.17.99.tar.gz
31+
$(R) CMD INSTALL data.table_1.18.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.17.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.18.99.tar.gz --as-cran --ignore-vignettes --no-stop-on-test-error
4444

4545
.PHONY: revision
4646
revision:

NEWS.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
**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.**
44

5-
## data.table [v1.17.99](https://github.com/Rdatatable/data.table/milestone/35) (in development)
5+
## data.table [v1.18.99](https://github.com/Rdatatable/data.table/milestone/37?closed=1) (in development)
6+
7+
8+
## data.table [v1.18.0](https://github.com/Rdatatable/data.table/milestone/37?closed=1) 23 December 2025
69

710
### BREAKING CHANGE
811

0 commit comments

Comments
 (0)