Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
ab5cafc
new quillt site
apreshill Jun 28, 2021
524e877
update readme
apreshill Jun 29, 2021
694b307
fragments
apreshill Jun 29, 2021
4cd2ce0
rm articles from top nav and structure functions for reference section
apreshill Jun 29, 2021
7c92064
trigger action?
apreshill Jun 29, 2021
455dc6d
temp fix to branches for gha build
apreshill Jun 29, 2021
0ff048c
usethis::use_readme_rmd() to fix some setup
cderv Jul 19, 2021
8f81237
Adding missing infrastructure for vignettes
cderv Jul 19, 2021
a20c951
Update README.Rmd
Jul 20, 2021
bc4bf34
Keep the table in README.Rmd simpler so that it is easier to modify
cderv Jul 21, 2021
3d77cc6
Add a pointer to bookdown book
cderv Jul 21, 2021
fc3e7fd
Don't create a new vignette
cderv Jul 21, 2021
751fc80
Update COC
cderv Jul 21, 2021
92c1bd9
let's try building a GIF and PDF to show in a gallery
cderv Jul 21, 2021
09f3c49
update workflow according to new template
cderv Jul 21, 2021
dec2773
Add resources for pkgdown website to GHA cache
cderv Jul 21, 2021
ff2676a
Add deps for website
cderv Jul 21, 2021
fa07940
Install magick system deps
cderv Jul 21, 2021
40fd86e
use tools::md5sum as rlang::hash_files is still on dev version
cderv Jul 21, 2021
84c663d
Add a function to get template folder path
cderv Jul 21, 2021
8176ac8
build example.yaml for the gallery directly during build
cderv Jul 21, 2021
1dc0d74
Install tinytex, full prebuilt version
cderv Jul 21, 2021
88941d2
Merge branch 'master' into apreshill-pkgdown
cderv Jul 21, 2021
8f35a6d
we need pdftools for magick
cderv Jul 21, 2021
5fcd6f5
We also need system deps for this
cderv Jul 21, 2021
7e8e7cc
Seems we also need gifski
cderv Jul 21, 2021
b34ec5c
swtich to macos because of ubuntu resource limitation
cderv Jul 21, 2021
d154c56
This should be eval = TRUE
cderv Jul 21, 2021
ea3e582
trigger build to check caching
cderv Jul 21, 2021
3b9fbb0
cache folder may need to be explicitly set for caching to work
cderv Jul 21, 2021
5bdea80
trigger build to check caching
cderv Jul 21, 2021
8d1bbda
trigger build to check caching
cderv Jul 21, 2021
bee037a
Ignore ctex and print everything for debug
cderv Jul 21, 2021
a90c000
trigger build to check caching
cderv Jul 21, 2021
03d9794
I am now sure the caching mechanism is working
cderv Jul 21, 2021
46d7688
cache as resource_files is not needed in fact
cderv Jul 21, 2021
d8a404d
trigger build to check caching
cderv Jul 21, 2021
77a9c09
Use a two columns layout for example page
cderv Jul 22, 2021
3fb7803
Use child document to be more specific on GHA cache invalidation
cderv Jul 26, 2021
760df20
Try with a linear layout
cderv Jul 26, 2021
42a304c
Push another layout for demo purposes
cderv Jul 26, 2021
11b3002
try a custom grid
cderv Jul 26, 2021
ff0b58c
for test in fork
cderv Jul 26, 2021
4a8bcd6
do not include chunks
cderv Jul 26, 2021
5dd181e
debug mode
cderv Jul 26, 2021
23c6dd9
debug mode
cderv Jul 26, 2021
1f5869a
Switch main page to standard grid
cderv Jul 26, 2021
d328faa
Restore cache from previous run and save cache at every run
cderv Jul 27, 2021
6fd4d33
Correct function
cderv Jul 27, 2021
20248a0
reduce density of image
cderv Jul 27, 2021
71317fa
missing $ to evaluate and invalidate cache
cderv Jul 27, 2021
e5422ca
Reduce image size and use two columns layout
cderv Jul 27, 2021
016940f
invalidate cache
cderv Jul 27, 2021
dbbe320
better layout for mobile
cderv Jul 27, 2021
071e703
New layout for examples
cderv Jul 27, 2021
5860047
invalidate the cache differently
cderv Jul 27, 2021
55e8743
Merged upstream/master into apreshill-pkgdown
cderv Jul 27, 2021
7cad4e7
Reduce list of author in footer. Only maintainer and founder.
cderv Jul 27, 2021
e07ff35
trigger build
cderv Jul 27, 2021
83b06d5
Filter the sidebar list
cderv Jul 27, 2021
0e4216f
Add new logo
cderv Jul 27, 2021
c890673
reset example to linear with no column
cderv Jul 27, 2021
ac713c5
update github action
cderv Jul 27, 2021
08a100e
Remove test articles
cderv Jul 27, 2021
43d47ea
Don't add a learn more link
cderv Jul 27, 2021
5316deb
typo in function name
cderv Jul 27, 2021
3b23864
Reformat NEWS.md to work better with pkgdown
cderv Jul 27, 2021
574e8ad
Remove 0.2.9000
cderv Jul 27, 2021
4a17fb4
Use quillt dev version main branch
cderv Jul 27, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,10 @@
^\.travis\.yml$
^\.github$
^README\.md$
^README\.Rmd$
^tools/
^_pkgdown\.yml$
^reference$
^pkgdown$
^vignettes$

126 changes: 126 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity and
orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the overall
community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards
of acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies
when an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at codeofconduct@rstudio.com.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series of
actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or permanent
ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within the
community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0,
available at <https://www.contributor-covenant.org/version/2/0/code_of_conduct.html>.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
<https://www.contributor-covenant.org/faq>. Translations are available at <https://www.contributor-covenant.org/translations>.
21 changes: 21 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Contributing to rticles

We welcome contributions to the **rticles** package.

You can contribute in many ways:

* By opening issues to give feedback and share ideas.
* By fixing typos in documentations
* By submitting Pull Request (PR) to fix some opened issues
* By submitting Pull Request (PR) to suggest some new features. (It is considered good practice to open issues before to discuss ideas)


## To submit a contribution using a Pull Request:

1. [Fork](https://github.com/rstudio/bookdown/fork) the repository and make your changes in a new branch specific to the PR. It is ok to edit a file in this repository using the `Edit` button on Github if the change is simple enough.

2. For significant changes (e.g not required for fixing typos), ensure that you have signed the [individual](https://rstudioblog.files.wordpress.com/2017/05/rstudio_individual_contributor_agreement.pdf) or [corporate](https://rstudioblog.files.wordpress.com/2017/05/rstudio_corporate_contributor_agreement.pdf) contributor agreement as appropriate. You can send the signed copy to <jj@rstudio.com>.

3. Submit the [pull request](https://help.github.com/articles/using-pull-requests). It is ok to submit as draft in your are still working on it but would like some feedback from us. It always good to share in the open that you are working on it.

We'll try to be as responsive as possible in reviewing and accepting pull requests. Appreciate your contributions very much!
88 changes: 88 additions & 0 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
on:
push:
branches:
- main
- master
pull_request:
branches:
- main
- master

name: pkgdown

jobs:
pkgdown:
if: ${{ github.event_name == 'push' || startsWith(github.head_ref, 'pkgdown') }}
runs-on: macos-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@v1
id: install-r

- uses: r-lib/actions/setup-pandoc@v1

- uses: r-lib/actions/setup-tinytex@v1
env:
# install full prebuilt version
TINYTEX_INSTALLER: TinyTeX

- name: Install pak and query dependencies
run: |
install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/")
saveRDS(pak::pkg_deps(".", dependencies = TRUE), ".github/r-depends.rds")
shell: Rscript {0}

- name: Cache R packages
uses: actions/cache@v2
with:
path: |
${{ env.R_LIBS_USER }}/*
!${{ env.R_LIBS_USER }}/pak
key: macos-latest-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }}
restore-keys: macos-latest-${{ steps.install-r.outputs.installed-r-version }}-1-

- name: Install package and dependencies
run: |
pak::local_install_dev_deps(upgrade = TRUE, dependencies = c("all", "Config/Needs/website"))
pak::pkg_install("r-lib/pkgdown")
pak::pkg_install("rstudio/quillt")
shell: Rscript {0}

- name: Install package
run: R CMD INSTALL .

- name: Cache some pkgdown assets
uses: actions/cache@v2
with:
path: |
vignettes/articles/resources/*.gif
vignettes/articles/resources/*.pdf
vignettes/articles/cache/*.rds
key: ${{ hashFiles('vignettes/articles/_child_examples.Rmd') }}-1-${{ github.sha }}
restore-keys: |
${{ hashFiles('vignettes/articles/_child_examples.Rmd') }}-1-


- name: Build pkgdown site
run: pkgdown::build_site(new_process = FALSE)
shell: Rscript {0}

- name: Deploy to Netlify
id: netlify-deploy
uses: nwtgck/actions-netlify@v1.1
with:
publish-dir: 'reference'
production-branch: master
github-token: ${{ secrets.GITHUB_TOKEN }}
deploy-message:
'Deploy from GHA: ${{ github.event.head_commit.message }} (${{ github.sha }})'
enable-pull-request-comment: false
enable-commit-comment: false
enable-commit-status: true
alias: deploy-preview-${{ github.event.number }}
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
.Rhistory
.RData
*.log
reference
inst/doc
6 changes: 4 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ Version: 0.20.3
Authors@R: c(
person("JJ", "Allaire", role = "aut", email = "jj@rstudio.com"),
person("Yihui", "Xie", role = c("aut", "cre"), email = "xie@yihui.name", comment = c(ORCID = "0000-0003-0645-5666")),
person("Christophe", "Dervieux", role = c("aut"), email = "cderv@rstudio.com", comment = c(ORCID = "0000-0003-4474-2498")),
person(family = "RStudio", role = c("cph", "fnd")),
person(family = "R Foundation", role = c("aut", "cph")),
person("Hadley", "Wickham", role = "aut", email = "hadley@rstudio.com"),
person(family = "Journal of Statistical Software", role = c("aut", "cph")),
person(family = "RStudio", role = "cph"),
person("Ramnath ", "Vaidyanathan", role = c("aut", "cph"), email = "ramnath.vaidya@gmail.com"),
person(family = "Association for Computing Machinery", role = c("aut", "cph")),
person("Carl", "Boettiger", role = c("aut", "cph"), email = "cboettig@gmail.com"),
Expand Down Expand Up @@ -44,7 +45,6 @@ Authors@R: c(
person("Shixiang", "Wang", role = c("aut", "ctb"), email = "w_shixiang@163.com", comment = c(ORCID = "0000-0001-9855-7357")),
person('Jay', 'Hesselberth', role = c('aut', 'ctb'), email = 'jay.hesselberth@gmail.com', comment = c(ORCID = '0000-0002-6299-179X')),
person("Alfredo", "Hernández", role = c("ctb"), email = "aldomann.designs@gmail.com", comment = c(ORCID = "0000-0002-2660-4545")),
person("Christophe", "Dervieux", role = c("aut"), email = "cderv@rstudio.com", comment = c(ORCID = "0000-0003-4474-2498")),
person("Stefano", "Coretta", role = c("ctb"), email = "stefano.coretta@gmail.com", comment = c(ORCID = "0000-0001-9627-5532", github = "stefanocoretta")),
person("Alvaro", "Uzaheta", role = c("ctb"), email = "alvaro.uzaheta@gess.ethz.ch", comment = c(github = "auzaheta"))
)
Expand All @@ -58,3 +58,5 @@ BugReports: https://github.com/rstudio/rticles/issues
RoxygenNote: 7.1.1
Suggests: testit, bookdown, xtable
Encoding: UTF-8
VignetteBuilder: knitr
Config/Needs/website: magick, pdftools, gifski, rstudio/quillt
Loading