Skip to content

Commit 3797d53

Browse files
njtierneynjtierney
authored
Merge pull request #747 from njtierney/tweaks-for-0-5-0
Tweaks for 0 5 0
2 parents 1092a05 + ab25df3 commit 3797d53

File tree

145 files changed

+3265
-3581
lines changed

Some content is hidden

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

145 files changed

+3265
-3581
lines changed

‎DESCRIPTION

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ Encoding: UTF-8
8484
Language: en-US
8585
Roxygen: list(markdown = TRUE)
8686
RoxygenNote: 7.3.2
87-
SystemRequirements: Python (>= 2.7.0) with header files and shared
88-
library; TensorFlow (v1.14; https://www.tensorflow.org/); TensorFlow
89-
Probability (v0.7.0; https://www.tensorflow.org/probability/)
87+
SystemRequirements: Python (>= 3.7.0) with header files and shared
88+
library; TensorFlow (>= v2.0.0; https://www.tensorflow.org/); TensorFlow
89+
Probability (v0.8.0; https://www.tensorflow.org/probability/)
9090
Collate:
9191
'package.R'
9292
'utils.R'

‎codemeta.json

+98-16
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
"identifier": "greta",
55
"description": "Write statistical models in R and fit them by MCMC and optimisation on CPUs and GPUs, using Google 'TensorFlow'. greta lets you write your own model like in BUGS, JAGS and Stan, except that you write models right in R, it scales well to massive datasets, and it’s easy to extend and build on. See the website for more information, including tutorials, examples, package documentation, and the greta forum.",
66
"name": "greta: Simple and Scalable Statistical Modelling in R",
7-
"codeRepository": "https://github.com/njtierney/greta",
7+
"relatedLink": ["https://greta-stats.org", "https://CRAN.R-project.org/package=greta"],
8+
"codeRepository": "https://github.com/greta-dev/greta",
89
"issueTracker": "https://github.com/greta-dev/greta/issues",
910
"license": "https://spdx.org/licenses/Apache-2.0",
10-
"version": "0.4.4",
11+
"version": "0.5.0",
1112
"programmingLanguage": {
1213
"@type": "ComputerLanguage",
1314
"name": "R",
1415
"url": "https://r-project.org"
1516
},
16-
"runtimePlatform": "R version 4.3.2 (2023-10-31)",
17+
"runtimePlatform": "R version 4.4.2 (2024-10-31)",
1718
"provider": {
1819
"@id": "https://cran.r-project.org",
1920
"@type": "Organization",
@@ -156,6 +157,18 @@
156157
},
157158
"sameAs": "https://CRAN.R-project.org/package=DiagrammeR"
158159
},
160+
{
161+
"@type": "SoftwareApplication",
162+
"identifier": "dplyr",
163+
"name": "dplyr",
164+
"provider": {
165+
"@id": "https://cran.r-project.org",
166+
"@type": "Organization",
167+
"name": "Comprehensive R Archive Network (CRAN)",
168+
"url": "https://cran.r-project.org"
169+
},
170+
"sameAs": "https://CRAN.R-project.org/package=dplyr"
171+
},
159172
{
160173
"@type": "SoftwareApplication",
161174
"identifier": "DiagrammeRsvg",
@@ -276,6 +289,18 @@
276289
},
277290
"sameAs": "https://CRAN.R-project.org/package=mvtnorm"
278291
},
292+
{
293+
"@type": "SoftwareApplication",
294+
"identifier": "purrr",
295+
"name": "purrr",
296+
"provider": {
297+
"@id": "https://cran.r-project.org",
298+
"@type": "Organization",
299+
"name": "Comprehensive R Archive Network (CRAN)",
300+
"url": "https://cran.r-project.org"
301+
},
302+
"sameAs": "https://CRAN.R-project.org/package=purrr"
303+
},
279304
{
280305
"@type": "SoftwareApplication",
281306
"identifier": "rmarkdown",
@@ -339,15 +364,27 @@
339364
},
340365
{
341366
"@type": "SoftwareApplication",
342-
"identifier": "tidyverse",
343-
"name": "tidyverse",
367+
"identifier": "tibble",
368+
"name": "tibble",
369+
"provider": {
370+
"@id": "https://cran.r-project.org",
371+
"@type": "Organization",
372+
"name": "Comprehensive R Archive Network (CRAN)",
373+
"url": "https://cran.r-project.org"
374+
},
375+
"sameAs": "https://CRAN.R-project.org/package=tibble"
376+
},
377+
{
378+
"@type": "SoftwareApplication",
379+
"identifier": "tidyr",
380+
"name": "tidyr",
344381
"provider": {
345382
"@id": "https://cran.r-project.org",
346383
"@type": "Organization",
347384
"name": "Comprehensive R Archive Network (CRAN)",
348385
"url": "https://cran.r-project.org"
349386
},
350-
"sameAs": "https://CRAN.R-project.org/package=tidyverse"
387+
"sameAs": "https://CRAN.R-project.org/package=tidyr"
351388
},
352389
{
353390
"@type": "SoftwareApplication",
@@ -372,14 +409,26 @@
372409
"url": "https://cran.r-project.org"
373410
},
374411
"sameAs": "https://CRAN.R-project.org/package=withr"
412+
},
413+
{
414+
"@type": "SoftwareApplication",
415+
"identifier": "rstudioapi",
416+
"name": "rstudioapi",
417+
"provider": {
418+
"@id": "https://cran.r-project.org",
419+
"@type": "Organization",
420+
"name": "Comprehensive R Archive Network (CRAN)",
421+
"url": "https://cran.r-project.org"
422+
},
423+
"sameAs": "https://CRAN.R-project.org/package=rstudioapi"
375424
}
376425
],
377426
"softwareRequirements": {
378427
"1": {
379428
"@type": "SoftwareApplication",
380429
"identifier": "R",
381430
"name": "R",
382-
"version": ">= 3.1.0"
431+
"version": ">= 4.1.0"
383432
},
384433
"2": {
385434
"@type": "SoftwareApplication",
@@ -409,7 +458,7 @@
409458
"@type": "SoftwareApplication",
410459
"identifier": "cli",
411460
"name": "cli",
412-
"version": ">= 3.0.0",
461+
"version": ">= 3.4.1",
413462
"provider": {
414463
"@id": "https://cran.r-project.org",
415464
"@type": "Organization",
@@ -513,10 +562,22 @@
513562
"sameAs": "https://CRAN.R-project.org/package=reticulate"
514563
},
515564
"13": {
565+
"@type": "SoftwareApplication",
566+
"identifier": "rlang",
567+
"name": "rlang",
568+
"provider": {
569+
"@id": "https://cran.r-project.org",
570+
"@type": "Organization",
571+
"name": "Comprehensive R Archive Network (CRAN)",
572+
"url": "https://cran.r-project.org"
573+
},
574+
"sameAs": "https://CRAN.R-project.org/package=rlang"
575+
},
576+
"14": {
516577
"@type": "SoftwareApplication",
517578
"identifier": "tensorflow",
518579
"name": "tensorflow",
519-
"version": ">= 2.7.0",
580+
"version": "== 2.16.0",
520581
"provider": {
521582
"@id": "https://cran.r-project.org",
522583
"@type": "Organization",
@@ -525,7 +586,29 @@
525586
},
526587
"sameAs": "https://CRAN.R-project.org/package=tensorflow"
527588
},
528-
"14": {
589+
"15": {
590+
"@type": "SoftwareApplication",
591+
"identifier": "tools",
592+
"name": "tools"
593+
},
594+
"16": {
595+
"@type": "SoftwareApplication",
596+
"identifier": "utils",
597+
"name": "utils"
598+
},
599+
"17": {
600+
"@type": "SoftwareApplication",
601+
"identifier": "whisker",
602+
"name": "whisker",
603+
"provider": {
604+
"@id": "https://cran.r-project.org",
605+
"@type": "Organization",
606+
"name": "Comprehensive R Archive Network (CRAN)",
607+
"url": "https://cran.r-project.org"
608+
},
609+
"sameAs": "https://CRAN.R-project.org/package=whisker"
610+
},
611+
"18": {
529612
"@type": "SoftwareApplication",
530613
"identifier": "yesno",
531614
"name": "yesno",
@@ -537,9 +620,9 @@
537620
},
538621
"sameAs": "https://CRAN.R-project.org/package=yesno"
539622
},
540-
"SystemRequirements": "Python (>= 2.7.0) with header files and shared\n library; TensorFlow (v1.14; https://www.tensorflow.org/); TensorFlow\n Probability (v0.7.0; https://www.tensorflow.org/probability/)"
623+
"SystemRequirements": "Python (>= 3.7.0) with header files and shared\n library; TensorFlow (>= v2.0.0; https://www.tensorflow.org/); TensorFlow\n Probability (v0.8.0; https://www.tensorflow.org/probability/)"
541624
},
542-
"fileSize": "2098.014KB",
625+
"fileSize": "1625.784KB",
543626
"citation": [
544627
{
545628
"@type": "ScholarlyArticle",
@@ -569,8 +652,7 @@
569652
}
570653
}
571654
],
572-
"relatedLink": "https://greta-stats.org",
573-
"releaseNotes": "https://github.com/njtierney/greta/blob/master/NEWS.md",
574-
"readme": "https://github.com/njtierney/greta/blob/master/README.md",
575-
"contIntegration": ["https://app.codecov.io/gh/greta-dev/greta?branch=master", "https://github.com/greta-dev/greta/actions"]
655+
"releaseNotes": "https://github.com/greta-dev/greta/blob/master/NEWS.md",
656+
"readme": "https://github.com/greta-dev/greta/blob/master/README.md",
657+
"contIntegration": ["https://github.com/greta-dev/greta/actions", "https://app.codecov.io/gh/greta-dev/greta?branch=master"]
576658
}

‎cran-comments.md

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
11
## Test environments
2-
* local R installation, R 4.3.3
2+
* local R installation, R 4.4.2
33
* win-builder (devel)
44

55
## R CMD check results
66

7-
0 errors | 0 warnings | 0 notes
7+
0 errors | 0 warnings | 1 notes
88

9-
* Days since last update: 38
9+
> Found the following (possibly) invalid URLs:
10+
URL: http://www.phidot.org/software/mark/docs/book/
11+
From: inst/doc/example_models.html
12+
Status: 403
13+
Message: Forbidden
14+
15+
We could not find an issue with this link, or an alternative link.
16+
17+
* Days since last update: 244 days
1018

1119
## Submission notes
1220

13-
This release is due to a bug we discovered with trailing commas from the `glue` package (https://github.com/tidyverse/glue/issues/320). It is a very small change, but it is very critical. We have also
21+
This release is a substantial overhaul of the internals of greta to migrate the internals from tensorflow 1 to tensorflow 2.
1422

1523
## revdepcheck results
1624

17-
We checked 3 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
25+
We checked 1 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
1826

1927
* We saw 0 new problems
2028
* We failed to check 0 packages

‎inst/CITATION

+10-18
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1-
citHeader("To cite greta in publications use:")
2-
3-
citEntry(entry = "Article",
4-
title = "{greta}: simple and scalable statistical modelling in R",
5-
author = personList(as.person("Nick Golding")),
6-
journal = "Journal of Open Source Software",
7-
year = "2019",
8-
volume = "4",
9-
number = "40",
10-
pages = "1601",
11-
url = "http://dx.doi.org/10.21105/joss.01601",
12-
doi = "10.21105/joss.01601",
13-
14-
textVersion =
15-
paste("Nick Golding (2019).",
16-
"greta: simple and scalable statistical modelling in R.",
17-
"Journal of Open Source Software, 4(40), 1601.",
18-
"URL http://dx.doi.org/10.21105/joss.01601.")
1+
bibentry(
2+
bibtype = "Article",
3+
title = "{greta}: simple and scalable statistical modelling in R",
4+
author = "Nick Golding",
5+
journal = "Journal of Open Source Software",
6+
year = 2019,
7+
volume = 4,
8+
number = 40,
9+
pages = 1601,
10+
doi = "10.21105/joss.01601"
1911
)

‎revdep/checks.noindex/libraries.csv

+43-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,44 @@
11
package,old,new,delta
2-
greta,0.4.3,0.4.4,*
3-
future,NA,1.33.1,*
4-
Rcpp,NA,1.0.12,*
2+
greta,0.4.5,0.5.0,*
3+
abind,1.4-8,1.4-8,
4+
backports,1.5.0,1.5.0,
5+
base64enc,0.1-3,0.1-3,
6+
callr,3.7.6,3.7.6,
7+
cli,3.6.3,3.6.3,
8+
coda,0.19-4.1,0.19-4.1,
9+
config,0.3.2,0.3.2,
10+
crayon,1.5.3,1.5.3,
11+
digest,0.6.37,0.6.37,
12+
future,1.34.0,1.34.0,
13+
globals,0.16.3,0.16.3,
14+
glue,1.8.0,1.8.0,
15+
here,1.0.1,1.0.1,
16+
hms,1.1.3,1.1.3,
17+
jsonlite,1.8.9,1.8.9,
18+
lifecycle,1.0.4,1.0.4,
19+
listenv,0.9.1,0.9.1,
20+
magrittr,2.0.3,2.0.3,
21+
parallelly,1.38.0,1.38.0,
22+
pkgconfig,2.0.3,2.0.3,
23+
png,0.1-8,0.1-8,
24+
prettyunits,1.2.0,1.2.0,
25+
processx,3.8.4,3.8.4,
26+
progress,1.2.3,1.2.3,
27+
ps,1.8.1,1.8.1,
28+
R6,2.5.1,2.5.1,
29+
rappdirs,0.3.3,0.3.3,
30+
Rcpp,1.0.13-1,1.0.13-1,
31+
RcppTOML,0.2.2,0.2.2,
32+
reticulate,1.39.0,1.39.0,
33+
rlang,1.1.4,1.1.4,
34+
rprojroot,2.0.4,2.0.4,
35+
rstudioapi,0.17.1,0.17.1,
36+
tensorflow,2.16.0,2.16.0,
37+
tfautograph,0.3.2,0.3.2,
38+
tfruns,1.5.3,1.5.3,
39+
tidyselect,1.2.1,1.2.1,
40+
vctrs,0.6.5,0.6.5,
41+
whisker,0.4.1,0.4.1,
42+
withr,3.0.2,3.0.2,
43+
yaml,2.3.10,2.3.10,
44+
yesno,0.1.3,0.1.3,

0 commit comments

Comments
 (0)