Skip to content

Commit 3c40ea2

Browse files
authored
Merge branch 'devel' into update_build_deploy
2 parents 6ce7aab + 16166ad commit 3c40ea2

17 files changed

+115
-113
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Bioconductor Packages: Guidelines for Developers and Reviewers
1313

1414
This book contains our guidelines for packages contributed to the [_Bioconductor_](https://bioconductor.org/) suite of packages.
1515
These guidelines are always a work in progress - corrections, suggestions and general improvements are welcome as [issue submissions in this repository](https://github.com/Bioconductor/pkgrevdocs/issues/new).
16-
Open discussions are welcome in our [Slack](https://bioc-community.herokuapp.com/).
16+
Open discussions are welcome in our [Zulip](https://community-bioc.zulipchat.com/).
1717
You can also suggest changes by editing the `.Rmd` files that are at the root of this repository and submitting a [pull request](https://github.com/Bioconductor/pkgrevdocs/pulls).
1818
An "Edit this page" link in the side bar on the right of each book chapter will take you directly to the relevant page on the GitHub repository to make such changes.
1919
Please target your pull requests to the `devel` branch.

_bookdown.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@ rmd_files: ["index.Rmd",
4444
"c-and-fortran.Rmd",
4545
"mavericks.Rmd",
4646
"debug-rd-links.Rmd",
47-
"news-for-bookdown.Rmd"]
47+
"news-for-bookdown.Rmd",
48+
"references.Rmd"]
4849
clean: [packages.bib]

debug-rd-links.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ W checking Rd cross-references (<...>ms)
2727
## What worked
2828

2929
First, the `SummarizedExperiment` package was added to the `Depends:` section
30-
of the DESCRIPTION file.
30+
of the `DESCRIPTION` file.
3131

3232
```
3333
Depends:

description-file.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ package type (i.e., `Software`, `AnnotationData`, `ExperimentData`, or
192192
`Workflow`). `biocViews` terms are case-sensitive.
193193

194194
The field name "biocViews" is case-sensitive and must begin with a lower-case
195-
'b'. Please use a single line with biocViews seperated by commas
195+
'b'. Please use a single line with `biocViews` separated by commas
196196

197197
(i.e,`biocViews: GeneTarget, SingleCell`).
198198

documentation.Rmd

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ it is always possible to extend existing classes.
2424
## Vignettes {#vignettes}
2525

2626
A vignette demonstrates how to accomplish non-trivial tasks embodying the core
27-
functionality of your package. There are two common types of vignettes.
27+
functionality of your package. There are three types of vignettes.
2828

2929
* (Recommended) An *R markdown* vignette is similar to a *Sweave* vignette, but
3030
uses [markdown](http://daringfireball.net/projects/markdown/) instead of
@@ -34,11 +34,20 @@ functionality of your package. There are two common types of vignettes.
3434
vignettes][CRAN vigs] for technical details. See the
3535
`r BiocStyle::Biocpkg("BiocStyle")` package for a convenient way to use common
3636
macros and a standard _Bioconductor_ style vignette.
37-
38-
* A *Sweave* vignette is an `.Rnw` file that contains $\LaTeX$ and chunks of <i
39-
class="fab fa-r-project"></i> code. The code chunk starts with a line
37+
38+
* Quarto is a new format for vignettes that uses the
39+
[Quarto](https://quarto.org/) system. It is similar to R Markdown but offers
40+
more advanced features and flexibility. Similar to R Markdown, Quarto
41+
vignettes can be rendered to various formats, including HTML and PDF, and are
42+
suitable for multi-language documentation needs. Note that an installation
43+
of the `quarto` command line tool is required to build Quarto vignettes.
44+
45+
* A *Sweave* vignette is an `.Rnw` file that contains $\LaTeX$ and chunks of
46+
<i class="fab fa-r-project"></i> code. The code chunk starts with a line
4047
`<<>>=`, and ends with `@`. Each chunk is evaluated during `R CMD build`,
41-
prior to $\LaTeX$ compilation to a PDF document.
48+
prior to $\LaTeX$ compilation to a PDF document. Note that this format
49+
requires $\LaTeX$ dependencies for rendering that are not be available in
50+
standard _Bioconductor_ containers.
4251

4352
A vignette provides reproducibility: the vignette produces the same results as
4453
copying the corresponding commands into an <i class="fab fa-r-project"></i>
@@ -49,21 +58,20 @@ markdown) undermine the benefit of vignettes and are generally **not allowed**;
4958
exceptions can be made with proper justification and are at the discretion of
5059
[_Bioconductor_ reviewers][reviewer-list].
5160

52-
All packages are required to have at least one Rmd or Rnw vignette. Vignettes go
53-
in the `vignettes/` directory of the package. Vignettes are often used as
54-
standalone documents, so best practices are to include an informative title, the
55-
primary author of the vignette, the last modification date of the vignette, and
56-
a link to the package landing page. We encourage the use of `r
57-
BiocStyle::Biocpkg("BiocStyle")` for formatting with `html_document` as
58-
rendering target. Something like the following in the vignette will accomplish
59-
the above suggestion:
61+
All packages are required to have at least one Rmd, qmd, or Rnw vignette.
62+
Vignettes go in the `vignettes/` directory of the package. Vignettes are often
63+
used as standalone documents, so best practices are to include an informative
64+
title, the primary author of the vignette, the last modification date of the
65+
vignette, and a link to the package landing page. We encourage the use of
66+
`r BiocStyle::Biocpkg("BiocStyle")` with `html_document` as the rendering
67+
function. For example, in an R Markdown vignette one can use the following
68+
specification in the yaml front matter:
6069

61-
```
70+
```yaml
6271
output:
6372
BiocStyle::html_document:
6473
toc: true
6574
toc_depth: 2
66-
6775
```
6876
6977
If you want to write more than one vignette, you may want to control
@@ -76,10 +84,10 @@ e.g. using numbers `1-9`, if you have a single digit number of
7684
vignettes, or `01-99` if you have ten or more vignettes. For example,
7785
the first vignette could specify in the header:
7886

79-
```
87+
```yaml
8088
vignette: >
8189
%\VignetteEngine{knitr::rmarkdown}
82-
%\VignetteIndexEntry{1. Quick start to MyPackage}
90+
%\VignetteIndexEntry{1. Quick Start: An Introduction}
8391
%\VignetteEncoding{UTF-8}
8492
```
8593

@@ -126,12 +134,11 @@ Include a section with the `SessionInfo()` at the end of the vignette.
126134

127135
### `vignettes/` directory and intermediate files
128136

129-
Only the source vignette file (`.Rnw` or `.Rmd`) and any necessary static images
130-
should be in the vignette directory. No intermediate files should be
131-
present. This include complete processed vignette products as well; the vignette
132-
should be created through the `R CMD build` of a package. To include other types
133-
of documentation please use the `inst/doc` or other appropriately named `inst`
134-
directory.
137+
Only the source vignette file (`.Rnw`, `.qmd`, or `.Rmd`) and any necessary
138+
static images should be in the `vignettes/` directory. No intermediate files
139+
should be present, including vignette products. Vignettes are created through
140+
by running `R CMD build` on a package. To include other types of documentation
141+
please use the `inst/doc` or other appropriately named `inst` directory.
135142

136143
### References
137144

general-package-development.Rmd

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,12 @@ Do not use filenames that differ only in case, as not all file systems are case-
4242

4343
### Package size {#package-size}
4444

45-
The source package resulting from running `R CMD build` should occupy less than 5 MB on disk.
46-
If your package includes (e.g. in the vignettes) some screenshots, this limit can be reached quite quickly. Their size can be reduced (often as much as 70%) in a lossy but quality-preserving manner by using tools such as [pngquant](https://pngquant.org/) (available as a command line utility and as a GUI on most systems).
45+
The source package resulting from running `R CMD build` should occupy less than
46+
5 MB on disk. If your package includes some screenshots (e.g., in the
47+
vignettes), this limit can be reached quite quickly. Their size can be reduced
48+
(often as much as 70%) with lossy compression using tools such as
49+
[pngquant](https://pngquant.org/) (available as a command line utility and as a
50+
GUI on most systems).
4751

4852
### Check duration {#check-duration}
4953

git-version-control.Rmd

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,20 @@ Builds occur once per day, and take approximately 24 hours. See the
7979

8080
Traditional Annotation packages are not stored in GIT due to the size of
8181
annotation files. To update an existing Annotation package please send an email
82-
to [email protected]. A member of the Bioconductor team will be in
82+
to <[email protected]>. A member of the Bioconductor team will be in
8383
contact to receive the updated package.
8484

8585
Newer annotation packages can be stored in GIT as it is a requirement to use the
8686
`r BiocStyle::Biocpkg("AnnotationHub")` server hosted data. The larger sized
8787
files are not included directly in the package. To contribute a new Annotation
88-
package please contact [email protected] for guidance and read the
88+
package please contact <[email protected]> for guidance and read the
8989
documentation on [Create A Hub Package][].
9090

9191
Currently direct updates to annotation packages, even those stored on git, are
9292
not supported. If you wish to updated an annotation package, make required
9393
changes and push to git.bioconductor.org. Then send an email to
94-
[email protected] or [email protected] requesting the package be propagated.
94+
<[email protected]> or <[email protected]> requesting the package
95+
be propagated.
9596

9697
## Subversion to Git Transition
9798

@@ -704,7 +705,7 @@ _Bioconductor_ repositories.
704705
705706
__Goal:__ You want to start fresh after failing to resolve conflicts
706707
or some other issue. If you intend to go nuclear, please contact the
707-
[email protected] mailing list.
708+
<[email protected]> mailing list.
708709
709710
#### Force _Bioconductor_ `devel` to GitHub `devel`
710711
@@ -1058,9 +1059,9 @@ maintain the package and avoid deprecation and removal.
10581059
package be updated. Include the package name and the contact information for
10591060
the new maintainer.
10601061
1061-
3. Update Package DESCRIPTION file
1062+
3. Update Package `DESCRIPTION` file
10621063
1063-
The DESCRIPTION file of the package should be updated to the new maintainer
1064+
The `DESCRIPTION` file of the package should be updated to the new maintainer
10641065
information and pushed to the Bioconductor git.bioconductor.org repository.
10651066
10661067
### Remove Large Data Files and Clean Git Tree
@@ -1435,7 +1436,7 @@ repository.
14351436
#### More questions?
14361437
14371438
If you have additional questions which are not answered here already,
1438-
please send an email to [email protected].
1439+
please send an email to <[email protected]>.
14391440
14401441
### Helpful resources:
14411442

important-bioc-features.Rmd

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
## biocViews {#biocviews}
44

55
Packages added to the _Bioconductor_ Project require a `biocViews:`
6-
field in their DESCRIPTION file. The field name "biocViews" is
6+
field in their `DESCRIPTION` file. The field name "biocViews" is
77
case-sensitive and must begin with a lower-case 'b'.
88

9-
biocViews terms are "keywords" used to describe a given package. They
9+
`biocViews` terms are "keywords" used to describe a given package. They
1010
are broadly divided into four categories, representing the type of
1111
packages present in the _Bioconductor_ Project
1212

@@ -15,29 +15,29 @@ packages present in the _Bioconductor_ Project
1515
3. Experiment Data
1616
4. Workflow
1717

18-
biocViews are available for the [release][release-biocviews] and [devel][biocViews] branches of
19-
_Bioconductor_. The devel branch has a check box under the tree
20-
structure which, when checked, displays biocViews that are defined but
21-
not used by any package, in addition to biocViews that are in use. See also
22-
[description section](#description-biocviews)
18+
`biocViews` are available for the [release][release-biocviews] and
19+
[devel][biocViews] branches of _Bioconductor_. The devel branch has a check box
20+
under the tree structure which, when checked, displays `biocViews` that are
21+
defined but not used by any package, in addition to `biocViews` that are in use.
22+
See also [description section](#description-biocviews)
2323

2424
### Motivation {#biocviews-motivation}
2525

26-
One can use biocViews for two broad purposes.
26+
One can use `biocViews` for two broad purposes.
2727

2828
1. A researcher might want to identify all packages in the
2929
_Bioconductor_ Project which are related to a specific purpose.
3030
For example, one may want to look for all packages related to "Copy
3131
Number Variants".
3232

3333
2. During development, a package contributor can "tag" their package
34-
with biocViews so that when someone looking for packages (like in
34+
with `biocViews` so that when someone looking for packages (like in
3535
scenario 1) can easily find their package.
3636

3737
### biocViews during new package development {#biocviews-pkg-devel}
3838

3939
Visit the ['devel' biocViews][biocViews] when you are in the process of
40-
adding biocViews to your new package. Identify as many terms as
40+
adding `biocViews` to your new package. Identify as many terms as
4141
appropriate from the hierarchy. Prefer 'leaf' terms at the end of the
4242
hierarchy, over more inclusive terms. Remember to check the box
4343
displaying all available terms.
@@ -46,30 +46,30 @@ Please Note:
4646

4747
1. Your package will belong to only one part of _Bioconductor_ Project
4848
(Software, Annotation Data, Experiment Data, Workflow), so choose only
49-
biocViews from that category.
49+
`biocViews` from that category.
5050

51-
2. biocViews listed in your package must match exactly (e.g.,
52-
spelling, capitalization) the terms in the biocViews hierarchy.
51+
2. `biocViews` listed in your package must match exactly (e.g.,
52+
spelling, capitalization) the terms in the `biocViews` hierarchy.
5353

5454
When you submit your new package for review , your package is checked
5555
and built by the _Bioconductor_ Project. We check the following for
5656
biocViews:
5757

58-
1. Package contributor has added biocViews.
58+
1. Package contributor has added `biocViews`.
5959

60-
2. biocViews are valid.
60+
2. `biocViews` are valid.
6161

62-
3. Package contributor has added biocViews from only one of the categories.
62+
3. Package contributor has added `biocViews` from only one of the categories.
6363

64-
If you receive a "RECOMMENDED" direction for any of these biocViews
64+
If you receive a "RECOMMENDED" direction for any of these `biocViews`
6565
after you have submitted your package, you can try correcting them on
6666
your own following the directions given here or ask your package
6767
reviewer for more information.
6868

69-
If a developer thinks a biocViews term should be added to the current acceptable
70-
list, please email [email protected] requesting the new biocView, under
71-
which hierarchy the term should be placed, and the justification for the new
72-
term.
69+
If a developer thinks a `biocViews` term should be added to the current
70+
acceptable list, please email <[email protected]> requesting the new
71+
`biocViews` term, under which hierarchy the term should be placed, and the
72+
justification for the new term.
7373

7474

7575
## Common Bioconductor Methods and Classes {#reusebioc}

index.Rmd

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ author:
55
- Daniela Cassol
66
- Johannes Rainer
77
- Lori Shepherd
8+
- Marcel Ramos Pérez
9+
- Martin Morgan
810
date: "`r Sys.Date()`"
911
site: bookdown::bookdown_site
1012
documentclass: book
@@ -17,7 +19,7 @@ description: "This is a minimal example of using the bookdown package to write a
1719
# Welcome {-}
1820

1921
```{r, fig.align='center', echo=FALSE, out.height="200px"}
20-
knitr::include_graphics("https://raw.githubusercontent.com/Bioconductor/BiocStickers/master/Bioconductor/Bioconductor.png")
22+
knitr::include_graphics("https://raw.githubusercontent.com/Bioconductor/BiocStickers/devel/Bioconductor/Bioconductor.png")
2123
```
2224

2325
## Introduction {.unnumbered #intro}
@@ -132,7 +134,7 @@ knitr::write_bib(c(
132134
[Removing collaborator]: https://help.github.com/articles/removing-a-collaborator-from-a-personal-repository/
133135
[Resolving a merge conflict using command line]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/
134136
[reviewer-list]: https://bioconductor.org/about/package-reviewers/
135-
[reviewers slack channel]: https://community-bioc.slack.com/archives/C02A1B8HUHZ
137+
[reviewers zulip channel]: https://community-bioc.zulipchat.com/#narrow/channel/507978-reviewers
136138
[rmarkdown]: http://rmarkdown.rstudio.com/
137139
[rmarkdown documentation]: http://rmarkdown.rstudio.com/authoring_pandoc_markdown.html#citations
138140
[shiny-posit]: https://shiny.posit.co/

install-file.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ already there.
1111

1212
Specifying this requirement does not guarantee that _Bioconductor_ will agree to
1313
install the external system requirement. It is encouraged to discuss any
14-
additional system requirements on the [email protected] before
14+
additional system requirements on the <[email protected]> before
1515
development.
1616

1717
System requirements should never be exclusive to a particular

0 commit comments

Comments
 (0)