Skip to content

Commit

Permalink
preparing CRAN release
Browse files Browse the repository at this point in the history
  • Loading branch information
brry committed Apr 10, 2017
1 parent b85b1ad commit 33f5bd8
Show file tree
Hide file tree
Showing 11 changed files with 103 additions and 60 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: berryFunctions
Type: Package
Title: Function Collection Related to Plotting and Hydrology
Version: 1.14.35
Date: 2017-04-07
Version: 1.15.0
Date: 2017-04-10
Imports: grDevices, graphics, stats, utils, abind
Suggests: RColorBrewer, pbapply, knitr, rmarkdown, gstat, RCurl
Author: Berry Boessenkool
Expand Down
14 changes: 9 additions & 5 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ ToDo-list
- tryStack: mapply, do.call etc put function name in next element
- tryStack: return output invisibly?
- checkFile: eror in ->-> checkFile: n/n file(s) do not exist at getwd: \n truncMessage(files[nonexi])
- anhang() # open not in dropbox viewer



Expand All @@ -42,11 +41,16 @@ actual NEWS
-----------------------------


Version 1.. (2017-0-)
- after smallPlot calls, mtext, axis etc can be used normally again
New functions: almost.equal
Version 1.15.0 (2017-04-10)
- traceCall: vignette and knitr stuff removed from trace, speed gain through sys.calls
- after smallPlot calls, mtext, axis etc can be used normally again. Messages are improved.
- colPoints: lines bug fixed, new legend density bandwidth default
- seasonality: plotting defaults improved, plotting order changed, moving window now gaussian
- some functions gain quiet arguments and improved messages and argument defaults, see github url below
New functions: almost.equal, newFilename, createPres, pdfpng, popleaf, legendmt
Removed functions: dataDWD, readDWD (kept as help file with reference to rdwd until late 2017)
For all changes, see:
https://github.com/brry/berryFunctions/compare/master@{2017-01-16}...master@{2017-01-31}#files_bucket
https://github.com/brry/berryFunctions/compare/master@{2017-01-16}...master@{2017-04-07}#files_bucket


-----------------------------
Expand Down
3 changes: 1 addition & 2 deletions R/anhang.R
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#' open the Appendix of Rclick
#'
#' Open the Appendix of my R handbook found online at
#' \url{RclickHandbuch.wordpress.com} or directly at
#' \url{https://dl.dropbox.com/u/4836866/Rclick/Anhang.pdf}.
#' \url{RclickHandbuch.wordpress.com}
#'
#' @return None, opens pdf in default viewer using \code{\link{system2}}
#' @author Berry Boessenkool, \email{berry-b@@gmx.de}, Jul 2016
Expand Down
4 changes: 2 additions & 2 deletions R/seasonality.R
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#' and other elements depending on plot type, \code{like data3, data4, probs4, width4}.
#' @author Berry Boessenkool, \email{berry-b@@gmx.de}, Jul-Oct 2016
#' @seealso \code{\link{spiralDate}}, \code{\link{colPoints}},
#' \url{http://nwis.waterdata.usgs.gov/nwis/peak?search_site_no=01400500}
#' \url{https://waterdata.usgs.gov/nwis}
#' @keywords aplot
#' @export
#' @examples
Expand Down Expand Up @@ -325,7 +325,7 @@ if(4 %in% plot) # Qpercentile~doy, col=n ----
{
# deciding weights:
if(FALSE){ # kept here for reference only
width=1; x <- unique(round((-3*width):(3*width)))
width=1; x <- unique(ceiling((-3*width):(3*width)))
d <- dnorm(x,sd=width) ; plot(x, round(d*10/max(d)) )
# number of entries used (support) as multiple of width
xx <- seq(0.6,20,len=1000); plot(xx, sapply(xx, function(width){
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

Miscellaneous R functions. Notable: colPoints, horizHist, logAxis, pointZoom, smallPlot, lsc.

**See the [Vignette](https://cran.r-project.org/web/packages/berryFunctions/vignettes/berryFunctions.html) for an overview of the package.**
**See the [Vignette](https://cran.r-project.org/package=berryFunctions/vignettes/berryFunctions.html) for an overview of the package.**

[Recent changes](http://starlogs.net/#brry/berryFunctions) (Thanks, [Jenny](http://happygitwithr.com/comic-relief.html))


### installation
Install release version from CRAN:
[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version-last-release/berryFunctions)](http://cran.r-project.org/package=berryFunctions)
[![downloads](http://cranlogs.r-pkg.org/badges/berryFunctions)](http://www.r-pkg.org/services)
[![Rdoc](http://www.rdocumentation.org/badges/version/berryFunctions)](http://www.rdocumentation.org/packages/berryFunctions)
[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version-last-release/berryFunctions)](https://cran.r-project.org/package=berryFunctions)
[![downloads](https://cranlogs.r-pkg.org/badges/berryFunctions)](https://www.r-pkg.org/services)
[![Rdoc](https://www.rdocumentation.org/badges/version/berryFunctions)](https://www.rdocumentation.org/packages/berryFunctions)


```R
Expand All @@ -23,7 +23,7 @@ vignette("berryFunctions")

Update to the [current development version](https://github.com/brry/berryFunctions/blob/master/DESCRIPTION#L4-L5) from github:
```R
source("http://raw.githubusercontent.com/brry/berryFunctions/master/R/instGit.R")
source("https://raw.githubusercontent.com/brry/berryFunctions/master/R/instGit.R")
instGit("brry/berryFunctions")

# or use devtools:
Expand All @@ -33,7 +33,7 @@ devtools::install_github("brry/berryFunctions")

### trouble

If direct installation from CRAN doesn't work, your R version might be too old. In that case, an update is really recommendable: [r-project.org](http://www.r-project.org/). If you can't update R, try installing from source (github) via `instGit` or devtools as mentioned above. If that's not possible either, here's a manual workaround:
If direct installation from CRAN doesn't work, your R version might be too old. In that case, an update is really recommendable: [r-project.org](https://www.r-project.org/). If you can't update R, try installing from source (github) via `instGit` or devtools as mentioned above. If that's not possible either, here's a manual workaround:
click on **Clone or Download - Download ZIP** (top right, [link](https://github.com/brry/berryFunctions/archive/master.zip)), unzip the file to some place, then
```R
setwd("that/path")
Expand Down
10 changes: 5 additions & 5 deletions inst/doc/berryFunctions.html

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions man/anhang.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/seasonality.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 43 additions & 20 deletions revdep/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,63 @@

|setting |value |
|:--------|:----------------------------|
|version |R version 3.3.1 (2016-06-21) |
|version |R version 3.3.2 (2016-10-31) |
|system |x86_64, mingw32 |
|ui |RStudio (1.0.44) |
|ui |RStudio (1.0.136) |
|language |(EN) |
|collate |German_Germany.1252 |
|tz |Europe/Berlin |
|date |2017-01-17 |
|date |2017-04-07 |

## Packages

|package |* |version |date |source |
|:--------------|:--|:-------|:----------|:------------------------------|
|berryFunctions |* |1.14.0 |2017-01-17 |local (brry/berryFunctions@NA) |
|gstat | |1.1-4 |2017-01-11 |CRAN (R 3.3.2) |
|package |* |version |date |source |
|:--------------|:--|:--------|:----------|:------------------------------|
|abind | |1.4-5 |2016-07-21 |CRAN (R 3.3.2) |
|berryFunctions |* |1.14.35 |2017-04-07 |local (brry/berryFunctions@NA) |
|knitr | |1.15.1 |2016-11-22 |CRAN (R 3.3.3) |
|RColorBrewer | |1.1-2 |2014-12-07 |CRAN (R 3.3.2) |
|RCurl | |1.95-4.8 |2016-03-01 |CRAN (R 3.3.3) |
|rmarkdown | |1.4 |2017-03-24 |CRAN (R 3.3.3) |

# Check results
2 packages
3 packages

## extremeStat (0.6.0)
## extremeStat (1.3.0)
Maintainer: Berry Boessenkool <berry-b@gmx.de>

0 errors | 0 warnings | 0 notes
1 error | 0 warnings | 0 notes

```
checking examples ... ERROR
Running examples in 'extremeStat-Ex.R' failed
The error most likely occurred in:
## OSMscale (0.3.5)
> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: distLexBoot
> ### Title: Bootstrapping uncertainty intervals for return periods
> ### Aliases: distLexBoot
> ### Keywords: bootstrap distribution dplot hplot montecarlo ts
>
> ### ** Examples
>
>
> data(annMax)
> dlf <- distLextreme(annMax, selection=c("wak","gum","gev","nor"))
distLfit execution took 0.03 seconds.
> dlfB <- distLexBoot(dlf, nbest=4, conf.lev=0.5, n=10) # n low for quick example tests
Error in loadNamespace(name) : there is no package called 'pbapply'
Calls: distLexBoot ... tryCatch -> tryCatchList -> tryCatchOne -> <Anonymous>
Execution halted
```

## OSMscale (0.4.1)
Maintainer: Berry Boessenkool <berry-b@gmx.de>

0 errors | 1 warning | 0 notes
0 errors | 0 warnings | 0 notes

```
checking whether package 'OSMscale' can be installed ... WARNING
Found the following significant warnings:
Warning: namespace 'Matrix' is not available and has been replaced
Warning: namespace 'MatrixModels' is not available and has been replaced
Warning: namespace 'lme4' is not available and has been replaced
See 'C:/Users/boessenkool/Dropbox/Public/berryFunctions/revdep/checks/OSMscale.Rcheck/00install.out' for details.
```
## rdwd (0.7.0)
Maintainer: Berry Boessenkool <berry-b@gmx.de>

0 errors | 0 warnings | 0 notes

Binary file modified revdep/checks.rds
Binary file not shown.
48 changes: 33 additions & 15 deletions revdep/problems.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,53 @@

|setting |value |
|:--------|:----------------------------|
|version |R version 3.3.1 (2016-06-21) |
|version |R version 3.3.2 (2016-10-31) |
|system |x86_64, mingw32 |
|ui |RStudio (1.0.44) |
|ui |RStudio (1.0.136) |
|language |(EN) |
|collate |German_Germany.1252 |
|tz |Europe/Berlin |
|date |2017-01-17 |
|date |2017-04-07 |

## Packages

|package |* |version |date |source |
|:--------------|:--|:-------|:----------|:------------------------------|
|berryFunctions |* |1.14.0 |2017-01-17 |local (brry/berryFunctions@NA) |
|gstat | |1.1-4 |2017-01-11 |CRAN (R 3.3.2) |
|package |* |version |date |source |
|:--------------|:--|:--------|:----------|:------------------------------|
|abind | |1.4-5 |2016-07-21 |CRAN (R 3.3.2) |
|berryFunctions |* |1.14.35 |2017-04-07 |local (brry/berryFunctions@NA) |
|knitr | |1.15.1 |2016-11-22 |CRAN (R 3.3.3) |
|RColorBrewer | |1.1-2 |2014-12-07 |CRAN (R 3.3.2) |
|RCurl | |1.95-4.8 |2016-03-01 |CRAN (R 3.3.3) |
|rmarkdown | |1.4 |2017-03-24 |CRAN (R 3.3.3) |

# Check results
1 packages with problems

## OSMscale (0.3.5)
## extremeStat (1.3.0)
Maintainer: Berry Boessenkool <berry-b@gmx.de>

0 errors | 1 warning | 0 notes
1 error | 0 warnings | 0 notes

```
checking whether package 'OSMscale' can be installed ... WARNING
Found the following significant warnings:
Warning: namespace 'Matrix' is not available and has been replaced
Warning: namespace 'MatrixModels' is not available and has been replaced
Warning: namespace 'lme4' is not available and has been replaced
See 'C:/Users/boessenkool/Dropbox/Public/berryFunctions/revdep/checks/OSMscale.Rcheck/00install.out' for details.
checking examples ... ERROR
Running examples in 'extremeStat-Ex.R' failed
The error most likely occurred in:
> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: distLexBoot
> ### Title: Bootstrapping uncertainty intervals for return periods
> ### Aliases: distLexBoot
> ### Keywords: bootstrap distribution dplot hplot montecarlo ts
>
> ### ** Examples
>
>
> data(annMax)
> dlf <- distLextreme(annMax, selection=c("wak","gum","gev","nor"))
distLfit execution took 0.03 seconds.
> dlfB <- distLexBoot(dlf, nbest=4, conf.lev=0.5, n=10) # n low for quick example tests
Error in loadNamespace(name) : there is no package called 'pbapply'
Calls: distLexBoot ... tryCatch -> tryCatchList -> tryCatchOne -> <Anonymous>
Execution halted
```

0 comments on commit 33f5bd8

Please sign in to comment.