Skip to content

Commit 3c67e75

Browse files
committed
Fix conflicts
1 parent 1a07a93 commit 3c67e75

File tree

5 files changed

+9
-79
lines changed

5 files changed

+9
-79
lines changed

Diff for: CITATION.cff

+1-4
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ references:
114114
title: desc
115115
abstract: 'desc: Manipulate DESCRIPTION Files'
116116
notes: Imports
117-
url: https://github.com/r-lib/desc#readme
117+
url: https://desc.r-lib.org/
118118
repository: https://CRAN.R-project.org/package=desc
119119
authors:
120120
- family-names: Csárdi
@@ -139,9 +139,6 @@ references:
139139
140140
orcid: https://orcid.org/0000-0002-4035-0289
141141
year: '2023'
142-
identifiers:
143-
- type: url
144-
value: https://arxiv.org/abs/1403.2805
145142
version: '>= 1.7.2'
146143
- type: software
147144
title: jsonvalidate

Diff for: README.md

+6-73
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ file and the `CITATION` file (if present) of your package. Note that
7272
**cffr** works best if your package pass
7373
`R CMD check/devtools::check()`.
7474

75-
As per 2023-12-11 there are at least 328 repos on GitHub using **cffr**.
75+
As per 2023-12-18 there are at least 326 repos on GitHub using **cffr**.
7676
[Check them out
7777
here](https://github.com/search?q=cffr%20path%3A**%2FCITATION.cff&type=code).
7878

@@ -386,9 +386,6 @@ test <- cff_create("rmarkdown")
386386
387387
orcid: https://orcid.org/0000-0002-4035-0289
388388
year: '2023'
389-
identifiers:
390-
- type: url
391-
value: https://arxiv.org/abs/1403.2805
392389
- type: software
393390
title: knitr
394391
abstract: 'knitr: A General-Purpose Package for Dynamic Report Generation in R'
@@ -565,25 +562,6 @@ test <- cff_create("rmarkdown")
565562
- family-names: Attali.
566563
given-names: Dean
567564
year: '2023'
568-
- type: software
569-
title: dygraphs
570-
abstract: 'dygraphs: Interface to ''Dygraphs'' Interactive Time Series Charting
571-
Library'
572-
notes: Suggests
573-
url: https://github.com/rstudio/dygraphs
574-
repository: https://CRAN.R-project.org/package=dygraphs
575-
authors:
576-
- family-names: Vanderkam
577-
given-names: Dan
578-
- family-names: Allaire
579-
given-names: JJ
580-
- family-names: Owen
581-
given-names: Jonathan
582-
- family-names: Gromer
583-
given-names: Daniel
584-
- family-names: Thieurmel
585-
given-names: Benoit
586-
year: '2023'
587565
- type: software
588566
title: fs
589567
abstract: 'fs: Cross-Platform File System Operations Based on ''libuv'''
@@ -600,26 +578,6 @@ test <- cff_create("rmarkdown")
600578
given-names: Gábor
601579
602580
year: '2023'
603-
- type: software
604-
title: rsconnect
605-
abstract: 'rsconnect: Deploy Docs, Apps, and APIs to ''Posit Connect'', ''shinyapps.io'',
606-
and ''RPubs'''
607-
notes: Suggests
608-
url: https://github.com/rstudio/rsconnect
609-
repository: https://CRAN.R-project.org/package=rsconnect
610-
authors:
611-
- family-names: Atkins
612-
given-names: Aron
613-
614-
- family-names: Allen
615-
given-names: Toph
616-
- family-names: Wickham
617-
given-names: Hadley
618-
- family-names: McPherson
619-
given-names: Jonathan
620-
- family-names: Allaire
621-
given-names: JJ
622-
year: '2023'
623581
- type: software
624582
title: downlit
625583
abstract: 'downlit: Syntax Highlighting and Automatic Linking'
@@ -632,19 +590,6 @@ test <- cff_create("rmarkdown")
632590
633591
year: '2023'
634592
version: '>= 0.4.0'
635-
- type: software
636-
title: katex
637-
abstract: 'katex: Rendering Math to HTML, ''MathML'', or R-Documentation Format'
638-
notes: Suggests
639-
url: https://docs.ropensci.org/katex/
640-
repository: https://CRAN.R-project.org/package=katex
641-
authors:
642-
- family-names: Ooms
643-
given-names: Jeroen
644-
645-
orcid: https://orcid.org/0000-0002-4035-0289
646-
year: '2023'
647-
version: '>= 1.4.0'
648593
- type: software
649594
title: sass
650595
abstract: 'sass: Syntactically Awesome Style Sheets (''Sass'')'
@@ -755,18 +700,6 @@ test <- cff_create("rmarkdown")
755700
given-names: Davis
756701
757702
year: '2023'
758-
- type: software
759-
title: cleanrmd
760-
abstract: 'cleanrmd: Clean Class-Less ''R Markdown'' HTML Documents'
761-
notes: Suggests
762-
url: https://pkg.garrickadenbuie.com/cleanrmd/
763-
repository: https://CRAN.R-project.org/package=cleanrmd
764-
authors:
765-
- family-names: Aden-Buie
766-
given-names: Garrick
767-
768-
orcid: https://orcid.org/0000-0002-7111-0077
769-
year: '2023'
770703
- type: software
771704
title: withr
772705
abstract: 'withr: Run Code ''With'' Temporarily Modified Global State'
@@ -905,9 +838,9 @@ for more info.
905838

906839
<div id="ref-codemeta" class="csl-entry">
907840

908-
Boettiger, Carl, and Maëlle Salmon. 2021a. *<span
909-
class="nocase">codemeta</span>: A Smaller <span
910-
class="nocase">codemetar</span> Package*.
841+
Boettiger, Carl, and Maëlle Salmon. 2021a.
842+
*<span class="nocase">codemeta</span>: A Smaller
843+
<span class="nocase">codemetar</span> Package*.
911844
<https://CRAN.R-project.org/package=codemeta>.
912845

913846
</div>
@@ -928,8 +861,8 @@ Among Citation Formats*.
928861

929862
<div id="ref-citation22" class="csl-entry">
930863

931-
Dietrich, Jan Philipp, and Waldir Leoncio. 2022. *<span
932-
class="nocase">citation</span>: Software Citation Tools*.
864+
Dietrich, Jan Philipp, and Waldir Leoncio. 2022.
865+
*<span class="nocase">citation</span>: Software Citation Tools*.
933866

934867
</div>
935868

Diff for: codemeta.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
},
201201
"isPartOf": "https://ropensci.org",
202202
"keywords": ["attribution", "citation", "credit", "citation-files", "cff", "metadata", "r", "r-package", "citation-file-format", "rstats", "ropensci", "cran"],
203-
"fileSize": "906.66KB",
203+
"fileSize": "904.422KB",
204204
"citation": [
205205
{
206206
"@type": "ScholarlyArticle",

Diff for: data/cran_to_spdx.rda

-9 Bytes
Binary file not shown.

Diff for: tests/testthat/_snaps/parse_dependencies.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
url: https://cli.r-lib.org
1010
repository: https://CRAN.R-project.org/package=cli
1111
- title: desc
12-
url: https://github.com/r-lib/desc#readme
12+
url: https://desc.r-lib.org/
1313
repository: https://CRAN.R-project.org/package=desc
1414
- title: jsonlite
1515
url: https://jeroen.r-universe.dev/jsonlite

0 commit comments

Comments
 (0)