Skip to content

Commit 0a35228

Browse files
committed
Migrate to Quarto
1 parent e4dfc85 commit 0a35228

Some content is hidden

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

44 files changed

+274
-273
lines changed

.Rbuildignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,10 @@
4242
^vignettes/_quarto\.yaml$
4343
^vignettes/_quarto\.yml$
4444
^\.quarto$
45+
^vignettes/CatastRo\.qmd\.orig$
46+
^vignettes/*_files$
47+
^vignettes/ovcservice\.qmd\.orig$
48+
^README\.qmd$
49+
^inst/README\.qmd$
50+
^README_files$
51+
^README\.html$

.github/CONTRIBUTING.md

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# Contributing to CatastRo
2+
3+
This outlines how to propose a change to CatastRo. For a detailed discussion on
4+
contributing to this and other tidyverse packages, please see the [development
5+
contributing guide](https://rstd.io/tidy-contrib) and our [code review
6+
principles](https://code-review.tidyverse.org/).
7+
8+
## Fixing typos
9+
10+
You can fix typos, spelling mistakes, or grammatical errors in the documentation
11+
directly using the GitHub web interface, as long as the changes are made in the
12+
_source_ file. This generally means you'll need to edit [roxygen2
13+
comments](https://roxygen2.r-lib.org/articles/roxygen2.html) in an `.R`, not a
14+
`.Rd` file. You can find the `.R` file that generates the `.Rd` by reading the
15+
comment in the first line.
16+
17+
## Bigger changes
18+
19+
If you want to make a bigger change, it's a good idea to first file an issue and
20+
make sure someone from the team agrees that it’s needed. If you’ve found a bug,
21+
please file an issue that illustrates the bug with a minimal
22+
[reprex](https://www.tidyverse.org/help/#reprex) (this will also help you write
23+
a unit test, if needed). See our guide on [how to create a great
24+
issue](https://code-review.tidyverse.org/issues/) for more advice.
25+
26+
### Pull request process
27+
28+
- Fork the package and clone onto your computer. If you haven't done this
29+
before, we recommend using
30+
`usethis::create_from_github("rOpenSpain/CatastRo", fork = TRUE)`.
31+
32+
- Install all development dependencies with `devtools::install_dev_deps()`,
33+
and then make sure the package passes R CMD check by running
34+
`devtools::check()`. If R CMD check doesn't pass cleanly, it's a good idea
35+
to ask for help before continuing.
36+
37+
- Create a Git branch for your pull request (PR). We recommend using
38+
`usethis::pr_init("brief-description-of-change")`.
39+
40+
- Make your changes, commit to git, and then create a PR by running
41+
`usethis::pr_push()`, and following the prompts in your browser. The title
42+
of your PR should briefly describe the change. The body of your PR should
43+
contain `Fixes #issue-number`.
44+
45+
- For user-facing changes, add a bullet to the top of `NEWS.md` (i.e. just
46+
below the first header). Follow the style described in
47+
<https://style.tidyverse.org/news.html>.
48+
49+
### Code style
50+
51+
- New code should follow the tidyverse [style
52+
guide](https://style.tidyverse.org). You can use
53+
[Air](https://posit-dev.github.io/air/) to apply this style, but please
54+
don't restyle code that has nothing to do with your PR.
55+
56+
- We use [roxygen2](https://cran.r-project.org/package=roxygen2), with
57+
[Markdown
58+
syntax](https://cran.r-project.org/web/packages/roxygen2/vignettes/rd-formatting.html),
59+
for documentation.
60+
61+
- We use [testthat](https://cran.r-project.org/package=testthat) for unit
62+
tests. Contributions with test cases included are easier to accept.
63+
64+
## Thanks for contributing!
65+
66+
This contributing guide is adapted from the tidyverse contributing guide
67+
available at <https://tidyverse.tidyverse.org/CONTRIBUTING.html>.

.github/workflows/rostemplate-gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ concurrency:
2121

2222
jobs:
2323
rostemplate-gh-pages:
24-
runs-on: windows-latest
24+
runs-on: ubuntu-latest
2525
if: >
2626
github.event_name != 'workflow_run' ||
2727
github.event.workflow_run.conclusion == 'success'

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@ vignettes/dev
3131
Rplots.pdf
3232
/.quarto/
3333
**/*.quarto_ipynb
34+
**/.quarto/
35+
README_files/
36+
README.html

.vscode/settings.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
"better-yaml.flowCollectionPadding": false,
1818
"better-yaml.lineWidth": 80,
1919
"files.eol": "\n",
20+
"positron.r.pipe": "|>",
21+
"positron.r.useNativePipe": true,
2022
"yaml.completion": true,
2123
"yaml.format.printWidth": 80,
2224
"yaml.validate": true

CITATION.cff

Lines changed: 7 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ references:
7474
name: R Foundation for Statistical Computing
7575
address: Vienna, Austria
7676
year: '2026'
77-
version: '>= 3.6'
77+
version: '>= 4.1.0'
7878
- type: software
7979
title: dplyr
8080
abstract: 'dplyr: A Grammar of Data Manipulation'
@@ -283,49 +283,22 @@ references:
283283
year: '2026'
284284
doi: 10.32614/CRAN.package.png
285285
- type: software
286-
title: rmarkdown
287-
abstract: 'rmarkdown: Dynamic Documents for R'
286+
title: quarto
287+
abstract: 'quarto: R Interface to ''Quarto'' Markdown Publishing System'
288288
notes: Suggests
289-
url: https://pkgs.rstudio.com/rmarkdown/
290-
repository: https://CRAN.R-project.org/package=rmarkdown
289+
url: https://quarto-dev.github.io/quarto-r/
290+
repository: https://CRAN.R-project.org/package=quarto
291291
authors:
292292
- family-names: Allaire
293293
given-names: JJ
294294
email: jj@posit.co
295-
- family-names: Xie
296-
given-names: Yihui
297-
email: xie@yihui.name
298-
orcid: https://orcid.org/0000-0003-0645-5666
295+
orcid: https://orcid.org/0000-0003-0174-9868
299296
- family-names: Dervieux
300297
given-names: Christophe
301298
email: cderv@posit.co
302299
orcid: https://orcid.org/0000-0003-4474-2498
303-
- family-names: McPherson
304-
given-names: Jonathan
305-
email: jonathan@posit.co
306-
- family-names: Luraschi
307-
given-names: Javier
308-
- family-names: Ushey
309-
given-names: Kevin
310-
email: kevin@posit.co
311-
- family-names: Atkins
312-
given-names: Aron
313-
email: aron@posit.co
314-
- family-names: Wickham
315-
given-names: Hadley
316-
email: hadley@posit.co
317-
- family-names: Cheng
318-
given-names: Joe
319-
email: joe@posit.co
320-
- family-names: Chang
321-
given-names: Winston
322-
email: winston@posit.co
323-
- family-names: Iannone
324-
given-names: Richard
325-
email: rich@posit.co
326-
orcid: https://orcid.org/0000-0003-3925-190X
327300
year: '2026'
328-
doi: 10.32614/CRAN.package.rmarkdown
301+
doi: 10.32614/CRAN.package.quarto
329302
- type: software
330303
title: slippymath
331304
abstract: 'slippymath: Slippy Map Tile Tools'

CONTRIBUTING.md

Lines changed: 0 additions & 46 deletions
This file was deleted.

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ URL: https://ropenspain.github.io/CatastRo/,
1717
https://github.com/rOpenSpain/CatastRo
1818
BugReports: https://github.com/rOpenSpain/CatastRo/issues
1919
Depends:
20-
R (>= 3.6)
20+
R (>= 4.1.0)
2121
Imports:
2222
dplyr,
2323
httr2 (>= 1.0.0),
@@ -32,12 +32,12 @@ Suggests:
3232
ggplot2,
3333
knitr,
3434
png,
35-
rmarkdown,
35+
quarto,
3636
slippymath,
3737
testthat (>= 3.0.0),
3838
tidyterra
3939
VignetteBuilder:
40-
knitr
40+
quarto
4141
Config/Needs/website: ropenspain/rostemplate, devtools, sessioninfo,
4242
remotes, sfheaders, rapidjsonr, jsonify, geometries
4343
Config/testthat/edition: 3

NEWS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# CatastRo (development version)
22

33
- The minimum **R** version required is now 4.1.0.
4+
- Migrate vignettes to Quarto.
45

56
# CatastRo 0.4.1
67

R/atom_ad_db.R

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@
1212
#' territorial office including information for each of the municipalities
1313
#' of that office.
1414
#'
15-
#'
1615
#' @source
1716
#' <https://www.catastro.hacienda.gob.es/INSPIRE/Addresses/ES.SDGC.AD.atom.xml>
1817
#'
19-
#'
2018
#' @family INSPIRE
2119
#' @family ATOM
2220
#' @family addresses

0 commit comments

Comments
 (0)