From 06d055b7295838925890a958c30eb76be9510895 Mon Sep 17 00:00:00 2001
From: mattdowle <mattjdowle@gmail.com>
Date: Sat, 26 May 2018 09:00:20 -0700
Subject: [PATCH] 1.11.4 submitted to CRAN. Bump to 1.11.5

---
 CRAN_Release.cmd | 19 ++++++++++---------
 DESCRIPTION      |  2 +-
 Makefile         |  6 +++---
 NEWS.md          | 11 ++++++++++-
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/CRAN_Release.cmd b/CRAN_Release.cmd
index 0a1bd39961..3bc016155b 100644
--- a/CRAN_Release.cmd
+++ b/CRAN_Release.cmd
@@ -20,7 +20,7 @@ rm -rf ./data.table.Rcheck
 # tests.Rraw in particular have failed CRAN Solaris (only) due to this.
 grep -RI --exclude-dir=".git" --exclude="*.md" --exclude="*~" --color='auto' -P -n "[\x80-\xFF]" ./
 
-# No unicode either?! Put these tests in DtNonAsciiTests package. Trying this again to see what happens now that Solaris is dead. Tests 1864.1 and 1864.2
+# Unicode is now ok. This unicode in tests.Rraw is passing on CRAN.
 grep -RI --exclude-dir=".git" --exclude="*.md" --exclude="*~" --color='auto' -n "[\]u[0-9]" ./
 
 # Ensure no calls to omp_set_num_threads() [to avoid affecting other packages and base R]
@@ -95,6 +95,7 @@ grep ScalarString *.c
 # If a PROTECT is not needed then a comment is added explaining why and including "PROTECT" in the comment to pass this grep
 grep allocVector *.c | grep -v PROTECT | grep -v SET_VECTOR_ELT | grep -v setAttrib | grep -v return
 
+cd ~/GitHub/data.table
 R
 cc(clean=TRUE)  # to compile with -pedandic. Also use very latest gcc (currently gcc-7) as CRAN does
 saf = options()$stringsAsFactors
@@ -102,21 +103,21 @@ options(stringsAsFactors=!saf)    # check tests (that might be run by user) are
 test.data.table()
 q("no")
 R CMD build .
-R CMD check data.table_1.11.1.tar.gz --as-cran    # remove.packages("xml2") first to prevent the 150 URLs in NEWS.md being pinged by --as-cran
-R CMD INSTALL data.table_1.11.1.tar.gz
+R CMD check data.table_1.11.3.tar.gz --as-cran    # remove.packages("xml2") first to prevent the 150 URLs in NEWS.md being pinged by --as-cran
+R CMD INSTALL data.table_1.11.3.tar.gz
 R
 require(data.table)
 test.data.table()
-test.data.table(verbose=TRUE)  # since main.R no longer tests verbose mode
+test.data.table(verbose=TRUE)   # since main.R no longer tests verbose mode
 gctorture2(step=50)
-system.time(test.data.table())
+system.time(test.data.table())  # apx 75min
 
 # Test C locale doesn't break test suite (#2771)
 echo LC_ALL=C > ~/.Renviron
 R
 Sys.getlocale()=="C"
 q("no")
-R CMD check data.table_1.11.1.tar.gz
+R CMD check data.table_1.11.3.tar.gz
 rm ~/.Renviron
 
 # Upload to win-builder: release, dev & old-release
@@ -138,7 +139,7 @@ alias R310=~/build/R-3.1.0/bin/R
 ### END ONE TIME BUILD
 
 cd ~/GitHub/data.table
-R310 CMD INSTALL ./data.table_1.11.1.tar.gz
+R310 CMD INSTALL ./data.table_1.11.3.tar.gz
 R310
 require(data.table)
 test.data.table()
@@ -150,7 +151,7 @@ test.data.table()
 vi ~/.R/Makevars
 # Make line SHLIB_OPENMP_CFLAGS= active to remove -fopenmp
 R CMD build .
-R CMD INSTALL data.table_1.11.1.tar.gz   # ensure that -fopenmp is missing and there are no warnings
+R CMD INSTALL data.table_1.11.3.tar.gz   # ensure that -fopenmp is missing and there are no warnings
 R
 require(data.table)   # observe startup message about no OpenMP detected
 test.data.table()
@@ -512,7 +513,7 @@ ls -1 *.tar.gz | grep -E 'Chicago|dada2|flowWorkspace|LymphoSeq' | parallel R CM
 Bump versions in DESCRIPTION and NEWS (without 'on CRAN date' text as that's not yet known) to even release number
 DO NOT push to GitHub. Prevents even a slim possibility of user getting premature version. Even release numbers must have been obtained from CRAN and only CRAN. (Too many support problems in past before this procedure brought in.)
 R CMD build .
-R CMD check --as-cran data.table_1.11.2.tar.gz   # install.packages("xml2") first to check the 150 URLs in NEWS.md under --as-cran, then remove xml2 again
+R CMD check --as-cran data.table_1.11.4.tar.gz   # install.packages("xml2") first to check the 150 URLs in NEWS.md under --as-cran, then remove xml2 again
 Resubmit to winbuilder (R-release, R-devel and R-oldrelease)
 Submit to CRAN. Message template :
 -----
diff --git a/DESCRIPTION b/DESCRIPTION
index 0d82874660..591a7342d5 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: data.table
-Version: 1.11.3
+Version: 1.11.5
 Title: Extension of `data.frame`
 Authors@R: c(
   person("Matt","Dowle",      role=c("aut","cre"), email="mattjdowle@gmail.com"),
diff --git a/Makefile b/Makefile
index 7ac7670962..c197064d7f 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ some:
 
 .PHONY: clean
 clean:
-	rm -f data.table_1.11.3.tar.gz
+	rm -f data.table_1.11.5.tar.gz
 
 .PHONY: build
 build:
@@ -26,7 +26,7 @@ build:
 
 .PHONY: install
 install:
-	$(R) CMD INSTALL data.table_1.11.3.tar.gz
+	$(R) CMD INSTALL data.table_1.11.5.tar.gz
 
 .PHONY: test
 test:
@@ -34,5 +34,5 @@ test:
 
 .PHONY: check
 check:
-	$(R) CMD check data.table_1.11.3.tar.gz --as-cran --ignore-vignettes --no-stop-on-test-error
+	$(R) CMD check data.table_1.11.5.tar.gz --as-cran --ignore-vignettes --no-stop-on-test-error
 
diff --git a/NEWS.md b/NEWS.md
index d98f1768a6..8447ebea26 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,7 +1,16 @@
 
 **If you are viewing this file on CRAN, please check latest news on GitHub [here](https://github.com/Rdatatable/data.table/blob/master/NEWS.md).**
 
-### Changes in v1.11.3  (in development)
+### Changes in v1.11.5  (in development)
+
+#### NEW FEATURES
+
+#### BUG FIXES
+
+#### NEWS
+
+
+### Changes in v1.11.4
 
 1. Empty RHS of `:=` is no longer an error when the `i` clause returns no rows to assign to anyway, [#2829](https://github.com/Rdatatable/data.table/issues/2829). Thanks to @cguill95 for reporting and to @MarkusBonsch for fixing.