Skip to content

Commit fd39524

Browse files
MichaelChiricoMichaelChirico
authored
Merge branch '1-15-99' into MichaelChirico-patch-4
2 parents 886a337 + f2547b6 commit fd39524

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+6525
-4868
lines changed

‎.Rbuildignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
^_pkgdown\.yml$
2626
^src/Makevars$
2727
^CODEOWNERS$
28+
^GOVERNANCE\.md$
2829

2930
^\.RData$
3031
^\.Rhistory$

‎.dev/CRAN_Release.cmd‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ xgettext -o /dev/stdout ./*.c \
1616
Rscript -e "tools::update_pkg_po('.')"
1717

1818
# 2) Open a PR with the new templates & contact the translators
19-
# * zh_CN:
19+
# * zh_CN: @hongyuanjia
2020
## Translators to submit commits with translations to this PR
2121
## [or perhaps, if we get several languages, each to open
2222
## its own PR and merge to main translation PR]
2323

24-
## 3) Check validity
25-
## update_pkg_po('.') to be run again for the PR
26-
## [can this be done via Travis?]
24+
## 3) Check validity with tools::checkPoFiles("zh_CN")
25+
26+
## 4) Compile the new .mo binary files with potools::po_compile()
2727

2828
###############################################
2929
# Basic checks
@@ -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.99.tar.gz --as-cran
199-
R CMD INSTALL data.table_1.14.99.tar.gz --html
198+
R CMD check data.table_1.15.99.tar.gz --as-cran
199+
R CMD INSTALL data.table_1.15.99.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.99.tar.gz
206+
R CMD check data.table_1.15.99.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.99.tar.gz
223+
PKG_CFLAGS='-Xclang -fopenmp' PKG_LIBS=-lomp R CMD INSTALL data.table_1.15.99.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.99.tar.gz
225+
PKG_CFLAGS='-fopenmp' PKG_LIBS=-lz R CMD INSTALL data.table_1.15.99.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.99.tar.gz
269+
R310 CMD INSTALL ./data.table_1.15.99.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.99.tar.gz # ensure that -fopenmp is missing and there are no warnings
281+
R CMD INSTALL data.table_1.15.99.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.99.tar.gz
289+
R CMD check data.table_1.15.99.tar.gz
290290

291291

292292
#####################################################
@@ -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.99.tar.gz
344+
Rdevel-strict-[gcc|clang] CMD INSTALL data.table_1.15.99.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.99.tar.gz
348+
Rdevel-strict-[gcc|clang] CMD check data.table_1.15.99.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", "R.utils", "xts", "zoo", "yaml", "knitr", "ma
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.99.tar.gz
357+
Rdevel-strict-[gcc|clang] CMD check data.table_1.15.99.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.99.tar.gz
394+
Rdevel-valgrind CMD INSTALL data.table_1.15.99.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.99.tar.gz",repos=NULL)' | ./bin/R --slave
432+
echo 'install.packages("~/GitHub/data.table/data.table_1.15.99.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
@@ -622,10 +622,10 @@ bunzip2 inst/tests/*.Rraw.bz2 # decompress *.Rraw again so as not to commit com
622622
# 3. Add new heading in NEWS for the next dev version. Add "(submitted to CRAN on <today>)" on the released heading.
623623
# 4. Bump minor version in dllVersion() in init.c
624624
# 5. Bump 3 minor version numbers in Makefile
625-
# 6. Search and replace this .dev/CRAN_Release.cmd to update 1.14.99 to 1.15.99 inc below, 1.15.0 to 1.16.0 above, 1.14.0 to 1.15.0 below
625+
# 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
626626
# 7. Another final gd to view all diffs using meld. (I have `alias gd='git difftool &> /dev/null'` and difftool meld: http://meldmerge.org/)
627-
# 8. Push to master with this consistent commit message: "1.15.0 on CRAN. Bump to 1.14.10"
628-
# 9. Take sha from step 8 and run `git tag 1.15.0 96c..sha..d77` then `git push origin 1.15.0` (not `git push --tags` according to https://stackoverflow.com/a/5195913/403310)
627+
# 8. Push to master with this consistent commit message: "1.16.0 on CRAN. Bump to 1.16.99"
628+
# 9. Take sha from step 8 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)
629629
######
630630

631631
###### Bump dev for PATCH RELEASE

‎.devcontainer/.Rprofile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Sys.setenv(PROJ_PATH='/workspaces/data.table')
2+
if (file.exists('.dev/cc.R')) source('.dev/cc.R')

‎.devcontainer/Dockerfile‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.devcontainer/devcontainer.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
{
2-
"build": { "dockerfile": "Dockerfile" }
2+
"build": { "dockerfile": "r-devel-gcc/Dockerfile", "context": ".." },
3+
"customizations": { "vscode": {
4+
"extensions": [
5+
"REditorSupport.r",
6+
"ms-vscode.cpptools-extension-pack"
7+
]
8+
}}
39
}

‎.devcontainer/r-devel-clang-ubsan/Dockerfile‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
FROM rocker/r-devel-ubsan-clang:latest
2+
3+
RUN apt-get -qq update \
4+
&& apt-get install -y --no-install-recommends git
5+
6+
COPY DESCRIPTION .
7+
8+
# install dependencies without ubsan flags
9+
RUN Rscript -e ' \
10+
read.dcf("DESCRIPTION", c("Imports", "Suggests")) |> \
11+
tools:::.split_dependencies() |> \
12+
names() |> \
13+
setdiff(tools:::.get_standard_package_names()$base) |> \
14+
install.packages() \
15+
'
16+
17+
# setup cc()
18+
WORKDIR /root
19+
COPY .devcontainer/.Rprofile .
20+
21+
# set ubsan flags
22+
WORKDIR .R
23+
COPY .devcontainer/r-devel-clang-ubsan/Makevars .

‎.devcontainer/r-devel-clang-ubsan/Makevars‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
CC=clang -fsanitize=address,undefined -fno-sanitize=float-divide-by-zero -fno-sanitize=alignment -fno-omit-frame-pointer
2+
CXX=clang++ -fsanitize=address,undefined -fno-sanitize=float-divide-by-zero -fno-sanitize=alignment -fno-omit-frame-pointer -frtti
3+
CFLAGS=-g -O3 -Wall -pedantic
4+
FFLAGS=-g -O2
5+
CXXFLAGS=-g -O3 -Wall -pedantic
6+
LDFLAGS=-L/usr/lib/gcc/x86_64-linux-gnu/11/libubsan.so -lubsan

‎.devcontainer/r-devel-clang-ubsan/devcontainer.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"build": { "dockerfile": "Dockerfile", "context": "../.." },
3+
"customizations": { "vscode": {
4+
"extensions": [
5+
"REditorSupport.r",
6+
"ms-vscode.cpptools-extension-pack"
7+
]
8+
}}
9+
}

‎.devcontainer/r-devel-gcc/Dockerfile‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM registry.gitlab.com/jangorecki/dockerfiles/r-devel-gcc
2+
3+
RUN apt-get -qq update \
4+
&& apt-get install -y --no-install-recommends git
5+
6+
COPY DESCRIPTION .
7+
8+
RUN Rscript -e ' \
9+
read.dcf("DESCRIPTION", c("Imports", "Suggests")) |> \
10+
tools:::.split_dependencies() |> \
11+
names() |> \
12+
setdiff(tools:::.get_standard_package_names()$base) |> \
13+
install.packages() \
14+
'
15+
16+
# setup cc()
17+
WORKDIR /root
18+
COPY .devcontainer/.Rprofile .

0 commit comments

Comments
 (0)