Skip to content

Commit ed39d81

Browse files
authored
Merge branch 'master' into develop
2 parents 28c2aa7 + 26e9beb commit ed39d81

File tree

7 files changed

+73
-30
lines changed

7 files changed

+73
-30
lines changed

.github/workflows/pkgdown.yaml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
on:
2+
push:
3+
branches: master
4+
5+
name: pkgdown
6+
7+
jobs:
8+
pkgdown:
9+
runs-on: macOS-latest
10+
env:
11+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
12+
steps:
13+
- uses: actions/checkout@v2
14+
15+
- uses: r-lib/actions/setup-r@master
16+
17+
- uses: r-lib/actions/setup-pandoc@master
18+
19+
- name: Query dependencies
20+
run: |
21+
install.packages('remotes')
22+
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
23+
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
24+
shell: Rscript {0}
25+
26+
- name: Cache R packages
27+
uses: actions/cache@v1
28+
with:
29+
path: ${{ env.R_LIBS_USER }}
30+
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
31+
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
32+
33+
- name: Install dependencies
34+
run: |
35+
remotes::install_deps(dependencies = TRUE)
36+
remotes::install_dev("pkgdown")
37+
remotes::install_github("tidyverse/tidytemplate")
38+
shell: Rscript {0}
39+
40+
- name: Install package
41+
run: R CMD INSTALL .
42+
43+
- name: Deploy package
44+
run: |
45+
git config --local user.email "[email protected]"
46+
git config --local user.name "GitHub Actions"
47+
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'

README.Rmd

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
output: github_document
33
---
44

5-
# infer R Package <img src="https://github.com/tidymodels/infer/blob/master/figs/infer_gnome.png?raw=true" align="right" width=125 />
5+
# infer R Package <img src="https://github.com/tidymodels/infer/blob/master/figs/infer_gnome.png?raw=true" align="right" width=250 />
66

77

88

@@ -43,23 +43,13 @@ To install the current stable version of `infer` from CRAN:
4343
install.packages("infer")
4444
```
4545

46-
4746
To install the developmental stable version of `infer`, make sure to install `remotes` first. The `pkgdown` website for this version is at <https://https://infer.tidymodels.org/>.
4847

4948
```{r, eval = FALSE}
5049
install.packages("remotes")
5150
remotes::install_github("tidymodels/infer")
5251
```
5352

54-
To install the experimental version of `infer` (do so at your own risk), make sure to install `remotes` first.
55-
56-
```{r, eval = FALSE}
57-
install.packages("remotes")
58-
remotes::install_github("tidymodels/infer", ref = "develop")
59-
```
60-
61-
To see documentation for the experimental version of `infer`, the `pkgdown` site is available at <https://infer-dev.netlify.com>.
62-
6353
### Contributing
6454

6555
------------------------------------------------------------------------
@@ -104,11 +94,15 @@ null_distn <- gss %>%
10494

10595
Visualizing the observed statistic alongside the null distribution,
10696

107-
```{r, message = FALSE, warning = FALSE}
97+
```{r viz, message = FALSE, warning = FALSE, eval = FALSE}
10898
visualize(null_distn) +
10999
shade_p_value(obs_stat = F_hat, direction = "greater")
110100
```
111101

102+
```{r viz-graphic, message = FALSE, warning = FALSE, echo = FALSE}
103+
knitr::include_graphics("https://raw.githubusercontent.com/tidymodels/infer/master/README_files/figure-gfm/viz-1.png")
104+
```
105+
112106
Calculating the p-value from the null distribution and observed statistic,
113107

114108
```{r, message = FALSE, warning = FALSE}

README.md

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# infer R Package <img src="https://github.com/tidymodels/infer/blob/master/figs/infer_gnome.png?raw=true" align="right" width=125 />
2+
# infer R Package <img src="https://github.com/tidymodels/infer/blob/master/figs/infer_gnome.png?raw=true" align="right" width=250 />
33

44
-----
55

@@ -53,17 +53,6 @@ install.packages("remotes")
5353
remotes::install_github("tidymodels/infer")
5454
```
5555

56-
To install the experimental version of `infer` (do so at your own risk),
57-
make sure to install `remotes` first.
58-
59-
``` r
60-
install.packages("remotes")
61-
remotes::install_github("tidymodels/infer", ref = "develop")
62-
```
63-
64-
To see documentation for the experimental version of `infer`, the
65-
`pkgdown` site is available at <https://infer-dev.netlify.com>.
66-
6756
### Contributing
6857

6958
-----
@@ -80,8 +69,8 @@ For questions and discussions about tidymodels packages, modeling, and
8069
machine learning, please [post on RStudio
8170
Community](https://rstd.io/tidymodels-community). If you think you have
8271
encountered a bug, please [submit an
83-
issue](https://github.com/tidymodels/infer/issues). Either way, learn how
84-
to create and share a [reprex](https://rstd.io/reprex) (a minimal,
72+
issue](https://github.com/tidymodels/infer/issues). Either way, learn
73+
how to create and share a [reprex](https://rstd.io/reprex) (a minimal,
8574
reproducible example), to clearly communicate about your code. Check out
8675
further details on [contributing guidelines for tidymodels
8776
packages](https://www.tidymodels.org/contribute/) and [how to get
@@ -147,7 +136,7 @@ visualize(null_distn) +
147136
shade_p_value(obs_stat = F_hat, direction = "greater")
148137
```
149138

150-
![](README_files/figure-gfm/unnamed-chunk-6-1.png)<!-- -->
139+
![](https://raw.githubusercontent.com/tidymodels/infer/master/README_files/figure-gfm/viz-1.png)<!-- -->
151140

152141
Calculating the p-value from the null distribution and observed
153142
statistic,
-12.9 KB
Binary file not shown.

README_files/figure-gfm/viz-1.png

21.9 KB
Loading

_pkgdown.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
1+
url: https://infer.tidymodels.org
2+
13
template:
4+
package: tidytemplate
25
params:
3-
docsearch:
4-
api_key: 33338960d0dcb55ff924a40c2f749a0d
5-
index_name: infer
6+
theme: tidymodels
7+
part_of: <a href="https://github.com/tidymodels">tidymodels</a>
8+
footer: infer is a part of the <strong>tidymodels</strong> ecosystem, a collection of modeling packages designed with common APIs and a shared philosophy.
9+
10+
# https://github.com/tidyverse/tidytemplate for css
11+
12+
development:
13+
mode: auto
14+
15+
figures:
16+
fig.width: 8
17+
fig.height: 5.75
618

719
home:
820
title: infer - Tidy Statistical Inference

docs/CNAME

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
infer.tidymodels.org

0 commit comments

Comments
 (0)