From 73f6eccc65c3401a0e4fb9c9d38a06f9e4ed6985 Mon Sep 17 00:00:00 2001 From: Daniel Falbel Date: Wed, 3 Apr 2019 11:19:34 -0300 Subject: [PATCH 1/5] bump version and tf version --- DESCRIPTION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 3cca25213..fcdb1dd1f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: keras Type: Package Title: R Interface to 'Keras' -Version: 2.2.4.9001 +Version: 2.2.4.1 Authors@R: c( person("JJ", "Allaire", role = c("aut", "cre"), email = "jj@rstudio.com"), person("François", "Chollet", role = c("aut", "cph")), @@ -28,7 +28,7 @@ Depends: Imports: generics (>= 0.0.1), reticulate (>= 1.10), - tensorflow (>= 1.10.0.9001), + tensorflow (>= 1.13.1), tfruns (>= 1.0), magrittr, zeallot, From be9695ffdde984322525f25639f9695a2732b9f7 Mon Sep 17 00:00:00 2001 From: Daniel Falbel Date: Wed, 3 Apr 2019 11:19:34 -0300 Subject: [PATCH 2/5] bump version and tf version --- DESCRIPTION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 3cca25213..fcdb1dd1f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: keras Type: Package Title: R Interface to 'Keras' -Version: 2.2.4.9001 +Version: 2.2.4.1 Authors@R: c( person("JJ", "Allaire", role = c("aut", "cre"), email = "jj@rstudio.com"), person("François", "Chollet", role = c("aut", "cph")), @@ -28,7 +28,7 @@ Depends: Imports: generics (>= 0.0.1), reticulate (>= 1.10), - tensorflow (>= 1.10.0.9001), + tensorflow (>= 1.13.1), tfruns (>= 1.0), magrittr, zeallot, From 29a4496757d80bb06398fbd2537b17d1c040c750 Mon Sep 17 00:00:00 2001 From: Daniel Falbel Date: Fri, 5 Apr 2019 10:53:44 -0300 Subject: [PATCH 3/5] use tf from CRAN --- DESCRIPTION | 2 -- 1 file changed, 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index fcdb1dd1f..c50496b12 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -39,8 +39,6 @@ Suggests: testthat, knitr, rmarkdown -Remotes: - rstudio/tensorflow SystemRequirements: Keras >= 2.0 (https://keras.io) Roxygen: list(markdown = TRUE) RoxygenNote: 6.1.1 From fb8a299ab7e5d057ff46ca7015b3c1c9bdd792b4 Mon Sep 17 00:00:00 2001 From: Daniel Falbel Date: Fri, 5 Apr 2019 11:39:37 -0300 Subject: [PATCH 4/5] update description --- DESCRIPTION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index c50496b12..2cd27f31c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,14 +3,14 @@ Type: Package Title: R Interface to 'Keras' Version: 2.2.4.1 Authors@R: c( - person("JJ", "Allaire", role = c("aut", "cre"), email = "jj@rstudio.com"), + person("Daniel", "Falbel", role = c("ctb", "cph", "cre"), email = "daniel@rstudio.com"), + person("JJ", "Allaire", role = c("aut", "cph")), person("François", "Chollet", role = c("aut", "cph")), person(family = "RStudio", role = c("ctb", "cph", "fnd")), person(family = "Google", role = c("ctb", "cph", "fnd")), person("Yuan", "Tang", role = c("ctb", "cph"), email = "terrytangyuan@gmail.com", comment = c(ORCID = "0000-0001-5243-233X")), - person("Daniel", "Falbel", role = c("ctb", "cph")), person("Wouter", "Van Der Bijl", role = c("ctb", "cph")), person("Martin", "Studer", role = c("ctb", "cph")), person("Sigrid", "Keydana", role = c("ctb")) From ff1aa9f398ad758aa9a6edc8d419226ea68ea6ef Mon Sep 17 00:00:00 2001 From: Daniel Falbel Date: Fri, 5 Apr 2019 11:49:43 -0300 Subject: [PATCH 5/5] switch mantainer --- man/keras-package.Rd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man/keras-package.Rd b/man/keras-package.Rd index 774741275..c37358f63 100644 --- a/man/keras-package.Rd +++ b/man/keras-package.Rd @@ -36,10 +36,11 @@ Useful links: } \author{ -\strong{Maintainer}: JJ Allaire \email{jj@rstudio.com} +\strong{Maintainer}: Daniel Falbel \email{daniel@rstudio.com} [contributor, copyright holder] Authors: \itemize{ + \item JJ Allaire [copyright holder] \item François Chollet [copyright holder] } @@ -48,7 +49,6 @@ Other contributors: \item RStudio [contributor, copyright holder, funder] \item Google [contributor, copyright holder, funder] \item Yuan Tang \email{terrytangyuan@gmail.com} (0000-0001-5243-233X) [contributor, copyright holder] - \item Daniel Falbel [contributor, copyright holder] \item Wouter Van Der Bijl [contributor, copyright holder] \item Martin Studer [contributor, copyright holder] \item Sigrid Keydana [contributor]