Merge pull request #247 from ycphs/release

Updates for new release
ycphs · Dec 11, 2021 · a403e72 · a403e72
2 parents 8086854 + 8fcf0ec
commit a403e72
Show file tree

Hide file tree

Showing 10 changed files with 422 additions and 676 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: openxlsx
 Title: Read, Write and Edit xlsx Files
-Version: 4.2.4.9000
-Date: 2021-06-08
+Version: 4.2.5
+Date: 2021-12-11
 Authors@R: 
     c(person(given = "Philipp",
              family = "Schauberger",

diff --git a/NEWS.md b/NEWS.md
@@ -1,28 +1,27 @@
-# openxlsx (development version)
+# openxlsx 4.2.5
 
 ## Fixes
 
 * `openxlsx_setOp()` now works with named list ([#215](https://github.com/ycphs/openxlsx/issues/215))  
 * `loadWorkbook()` imports `inlineStr`. Values remain `inlineStr` when writing the workbook with `saveWorkbook()`. Similar `read.xlsx` and `readWorkbook` import `inlineStr`.
 * `read.xlsx()` no longer changes random seed ([#183](https://github.com/ycphs/openxlsx/issues/183))
 * fixed a regression that caused fonts to be read in incorrectly ([#207](https://github.com/ycphs/openxlsx/issues/207))
-* add option to save as read only recommended ([#201](https://github.com/ychps/openxlsx/issues/201))
-* fixed writing hyperlink formulas ([#200](https://github.com/ychps/openxlsx/issues/200))
+* add option to save as read only recommended ([#201](https://github.com/ycphs/openxlsx/issues/201))
+* fixed writing hyperlink formulas ([#200](https://github.com/ycphs/openxlsx/issues/200))
 * `write.xlsx()` now throws an error if it doesn't have write permissions ([#190](https://github.com/ycphs/openxlsx/issues/190))
 * `write.xlsx()` now again uses the default of `overwrite = TRUE` for saving files ([#249](https://github.com/ycphs/openxlsx/issues/249))
-* `Workbook$show()` no longer fails when called in a 0 sheet workbook([#240](https://github.com/ychps/openxlsx/issues/240))
-* `read.xlsx()` again accepts `.xlsm` files ([#205](https://github.com/ychps/openxlsx/issues/205),
-[#209](https://github.com/ychps/openxlsx/issues/209))
-* `makeHyperlinkString()` does no longer require a sheet argument ([#57](https://github.com/ychps/openxlsx/issues/57), [#58](https://github.com/ychps/openxlsx/issues/58))
-* improvements in how `openxlsx` creates temporary directories (see [#262](https://github.com/ychps/openxlsx/issues/262))
-* `writeData()` calls `force(x)` to evaluate the object before options are set ([#264](https://github.com/ycphs/openxlsx/issues/264))
-* `createComment()` now correctly handles `integers` in `width` and `height` ([#275](https://github.com/ycphs/openxlsx/issues/275))
-* `setStyles()` accepts `halign="justify"`
-([#305](https://github.com/ycphs/openxlsx/issues/305))
 
 ## Improvements
 
 * `options()` are more consistently set in functions (see: [#289](https://github.com/ychps/openxlsx/issues/262))
+* `Workbook$show()` no longer fails when called in a 0 sheet workbook([#240](https://github.com/ycphs/openxlsx/issues/240))
+* `read.xlsx()` again accepts `.xlsm` files ([#205](https://github.com/ycphs/openxlsx/issues/205),
+[#209](https://github.com/ycphs/openxlsx/issues/209))
+* `makeHyperlinkString()` does no longer require a sheet argument ([#57](https://github.com/ycphs/openxlsx/issues/57), [#58](https://github.com/ycphs/openxlsx/issues/58))
+* improvements in how `openxlsx` creates temporary directories (see [#262](https://github.com/ycphs/openxlsx/issues/262))
+* `writeData()` calls `force(x)` to evaluate the object before options are set ([#264](https://github.com/ycphs/openxlsx/issues/264))
+* `createComment()` now correctly handles `integers` in `width` and `height` ([#275](https://github.com/ycphs/openxlsx/issues/275))
+* `setStyles()` accepts `halign="justify"` ([#305](https://github.com/ycphs/openxlsx/issues/305))
 
 # openxlsx 4.2.4
 
@@ -85,7 +84,7 @@
 
 ## Bug Fixes
 
-* Solved CRAN check errors based on the change discussed in [PR#17277](https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=17277)
+* Solved CRAN check errors based on the change discussed in [PR#17277](https://bugs.r-project.org/show_bug.cgi?id=17277)
 
 # openxlsx 4.2.0
 

diff --git a/R/writeData.R b/R/writeData.R
@@ -22,7 +22,7 @@
 #' a surrounding border is drawn with a border around each row. If
 #' "`columns`", a surrounding border is drawn with a border between
 #' each column. If "`all`" all cell borders are drawn.
-#' @param borderColour Colour of cell border.  A valid colour (belonging to `colours()` or a hex colour code, eg see [here](https://www.webfx.com/web-design/color-picker/)).
+#' @param borderColour Colour of cell border.  A valid colour (belonging to `colours()` or a hex colour code, eg see [here](https://www.w3schools.com/web-design/color-picker/)).
 #' @param borderStyle Border line style
 #' \itemize{
 #'    \item{**none**}{ no border}

diff --git a/README.md b/README.md
@@ -2,8 +2,7 @@
 ========
 
 
-
-[![codecov](https://codecov.io/gh/ycphs/openxlsx/branch/master/graph/badge.svg)](https://codecov.io/gh/ycphs/openxlsx)
+[![codecov](https://codecov.io/gh/ycphs/openxlsx/branch/master/graph/badge.svg)](https://app.codecov.io/gh/ycphs/openxlsx)
 [![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/openxlsx)](https://cran.r-project.org/package=openxlsx)
 [![CRAN RStudio mirror downloads](https://cranlogs.r-pkg.org/badges/openxlsx)](https://cran.r-project.org/package=openxlsx)
 ![R-CMD-check](https://github.com/ycphs/openxlsx/workflows/R-CMD-check/badge.svg?branch=master)

diff --git a/man/writeData.Rd b/man/writeData.Rd
diff --git a/vignettes/Introduction.R b/vignettes/Introduction.R
@@ -242,8 +242,8 @@
 #  
 #  ## read historical prices from yahoo finance
 #  ticker <- "CBA.AX"
-#  csv.url <- paste("http://ichart.finance.yahoo.com/table.csv?s=",
-#  ticker, "&a=01&b=9&c=2009&d=01&e=9&f=2014&g=d&ignore=.csv")
+#  csv.url <- paste0("https://query1.finance.yahoo.com/v7/finance/download/",
+#  ticker, "?period1=1597597610&period2=1629133610&interval=1d&events=history&includeAdjustedClose=true")
 #  prices <- read.csv(url(csv.url), as.is = TRUE)
 #  prices$Date <- as.Date(prices$Date)
 #  close <- prices$Close

diff --git a/vignettes/Introduction.Rmd b/vignettes/Introduction.Rmd
@@ -325,8 +325,8 @@ wb <- createWorkbook()
 
 ## read historical prices from yahoo finance
 ticker <- "CBA.AX"
-csv.url <- paste("http://ichart.finance.yahoo.com/table.csv?s=",
-ticker, "&a=01&b=9&c=2009&d=01&e=9&f=2014&g=d&ignore=.csv")
+csv.url <- paste0("https://query1.finance.yahoo.com/v7/finance/download/",
+ticker, "?period1=1597597610&period2=1629133610&interval=1d&events=history&includeAdjustedClose=true")
 prices <- read.csv(url(csv.url), as.is = TRUE)
 prices$Date <- as.Date(prices$Date)
 close <- prices$Close