Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
/raggPublic

Commit8c1f6ec

Browse files
authored
upkeep 2025 (#189)
1 parent3fd11f7 commit8c1f6ec

26 files changed

+519
-228
lines changed

‎.Rbuildignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@
2424
^.*\.vscode$
2525
^compile_commands\.json$
2626
^\.cache$
27+
^[\.]?air\.toml$
28+
^\.vscode$

‎.github/workflows/R-CMD-check.yaml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ on:
88
push:
99
branches:[main, master]
1010
pull_request:
11-
branches:[main, master]
1211

13-
name:R-CMD-check
12+
name:R-CMD-check.yaml
13+
14+
permissions:read-all
1415

1516
jobs:
1617
R-CMD-check:
@@ -23,24 +24,24 @@ jobs:
2324
matrix:
2425
config:
2526
-{os: macos-latest, r: 'release'}
26-
-{os: windows-latest, r: 'devel'}
27-
-{os: windows-latest, r: '4.4'}
28-
-{os: windows-latest, r: '4.3'}
29-
-{os: windows-latest, r: '4.2'}
30-
-{os: windows-latest, r: '4.1'}
31-
-{os: ubuntu-latest,r: 'devel', http-user-agent: 'release'}
32-
-{os: ubuntu-latest,r: 'release'}
33-
-{os: ubuntu-latest,r: 'oldrel-1'}
34-
-{os: ubuntu-latest,r: 'oldrel-2'}
35-
-{os: ubuntu-latest,r: 'oldrel-3'}
36-
-{os: ubuntu-latest,r: 'oldrel-4'}
27+
28+
-{os: windows-latest, r: 'release'}
29+
# use 4.0 or 4.1 to check with rtools40's older compiler
30+
-{os: windows-latest, r: 'oldrel-4'}
31+
32+
-{os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
33+
-{os: ubuntu-latest, r: 'release'}
34+
-{os: ubuntu-latest, r: 'oldrel-1'}
35+
-{os: ubuntu-latest, r: 'oldrel-2'}
36+
-{os: ubuntu-latest, r: 'oldrel-3'}
37+
-{os: ubuntu-latest, r: 'oldrel-4'}
3738

3839
env:
3940
GITHUB_PAT:${{ secrets.GITHUB_TOKEN }}
4041
R_KEEP_PKG_SOURCE:yes
4142

4243
steps:
43-
-uses:actions/checkout@v3
44+
-uses:actions/checkout@v4
4445

4546
-uses:r-lib/actions/setup-pandoc@v2
4647

@@ -58,3 +59,4 @@ jobs:
5859
-uses:r-lib/actions/check-r-package@v2
5960
with:
6061
upload-snapshots:true
62+
build_args:'c("--no-manual","--compact-vignettes=gs+qpdf")'

‎.github/workflows/pkgdown.yaml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ on:
44
push:
55
branches:[main, master]
66
pull_request:
7-
branches:[main, master]
87
release:
98
types:[published]
109
workflow_dispatch:
1110

12-
name:pkgdown
11+
name:pkgdown.yaml
12+
13+
permissions:read-all
1314

1415
jobs:
1516
pkgdown:
@@ -19,8 +20,10 @@ jobs:
1920
group:pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
2021
env:
2122
GITHUB_PAT:${{ secrets.GITHUB_TOKEN }}
23+
permissions:
24+
contents:write
2225
steps:
23-
-uses:actions/checkout@v3
26+
-uses:actions/checkout@v4
2427

2528
-uses:r-lib/actions/setup-pandoc@v2
2629

@@ -39,7 +42,7 @@ jobs:
3942

4043
-name:Deploy to GitHub pages 🚀
4144
if:github.event_name != 'pull_request'
42-
uses:JamesIves/github-pages-deploy-action@v4.4.1
45+
uses:JamesIves/github-pages-deploy-action@v4.5.0
4346
with:
4447
clean:false
4548
branch:gh-pages

‎.github/workflows/pr-commands.yaml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ on:
44
issue_comment:
55
types:[created]
66

7-
name:Commands
7+
name:pr-commands.yaml
8+
9+
permissions:read-all
810

911
jobs:
1012
document:
@@ -13,8 +15,10 @@ jobs:
1315
runs-on:ubuntu-latest
1416
env:
1517
GITHUB_PAT:${{ secrets.GITHUB_TOKEN }}
18+
permissions:
19+
contents:write
1620
steps:
17-
-uses:actions/checkout@v3
21+
-uses:actions/checkout@v4
1822

1923
-uses:r-lib/actions/pr-fetch@v2
2024
with:
@@ -50,8 +54,10 @@ jobs:
5054
runs-on:ubuntu-latest
5155
env:
5256
GITHUB_PAT:${{ secrets.GITHUB_TOKEN }}
57+
permissions:
58+
contents:write
5359
steps:
54-
-uses:actions/checkout@v3
60+
-uses:actions/checkout@v4
5561

5662
-uses:r-lib/actions/pr-fetch@v2
5763
with:

‎.github/workflows/test-coverage.yaml‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ on:
44
push:
55
branches:[main, master]
66
pull_request:
7-
branches:[main, master]
87

9-
name:test-coverage
8+
name:test-coverage.yaml
9+
10+
permissions:read-all
1011

1112
jobs:
1213
test-coverage:
@@ -15,36 +16,47 @@ jobs:
1516
GITHUB_PAT:${{ secrets.GITHUB_TOKEN }}
1617

1718
steps:
18-
-uses:actions/checkout@v3
19+
-uses:actions/checkout@v4
1920

2021
-uses:r-lib/actions/setup-r@v2
2122
with:
2223
use-public-rspm:true
2324

2425
-uses:r-lib/actions/setup-r-dependencies@v2
2526
with:
26-
extra-packages:any::covr
27+
extra-packages:any::covr, any::xml2
2728
needs:coverage
2829

2930
-name:Test coverage
3031
run:|
31-
covr::codecov(
32+
cov <-covr::package_coverage(
3233
quiet = FALSE,
3334
clean = FALSE,
34-
install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
35+
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
3536
)
37+
print(cov)
38+
covr::to_cobertura(cov)
3639
shell:Rscript {0}
3740

41+
-uses:codecov/codecov-action@v5
42+
with:
43+
# Fail if error if not on PR, or if on PR and token is given
44+
fail_ci_if_error:${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }}
45+
files:./cobertura.xml
46+
plugins:noop
47+
disable_search:true
48+
token:${{ secrets.CODECOV_TOKEN }}
49+
3850
-name:Show testthat output
3951
if:always()
4052
run:|
4153
## --------------------------------------------------------------------
42-
find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; ||true
54+
find'${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; ||true
4355
shell:bash
4456

4557
-name:Upload test results
4658
if:failure()
47-
uses:actions/upload-artifact@v3
59+
uses:actions/upload-artifact@v4
4860
with:
4961
name:coverage-test-failures
5062
path:${{ runner.temp }}/package

‎DESCRIPTION‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ Authors@R: c(
1313
comment = "Contributor to AGG"),
1414
person("Spencer", "Garrett", role = "ctb",
1515
comment = "Contributor to AGG"),
16-
person("Posit, PBC", role = c("cph", "fnd"))
16+
person("Posit Software, PBC", role = c("cph", "fnd"),
17+
comment = c(ROR = "03wc8by49"))
1718
)
1819
Maintainer: Thomas Lin Pedersen <thomas.pedersen@posit.co>
1920
Description: Anti-Grain Geometry (AGG) is a high-quality and
@@ -23,22 +24,23 @@ Description: Anti-Grain Geometry (AGG) is a high-quality and
2324
License: MIT + file LICENSE
2425
URL: https://ragg.r-lib.org, https://github.com/r-lib/ragg
2526
BugReports: https://github.com/r-lib/ragg/issues
26-
Imports:
27+
Imports:
2728
systemfonts (>= 1.0.3),
2829
textshaping (>= 0.3.0)
29-
Suggests:
30+
Suggests:
3031
covr,
3132
graphics,
3233
grid,
3334
testthat (>= 3.0.0)
34-
LinkingTo:
35+
LinkingTo:
3536
systemfonts,
3637
textshaping
38+
Config/build/compilation-database: true
3739
Config/Needs/website: ggplot2, devoid, magick, bench, tidyr, ggridges,
3840
hexbin, sessioninfo, pkgdown, tidyverse/tidytemplate
41+
Config/testthat/edition: 3
42+
Config/usethis/last-upkeep: 2025-04-25
3943
Encoding: UTF-8
44+
Roxygen: list(markdown = TRUE)
4045
RoxygenNote: 7.3.2
4146
SystemRequirements: freetype2, libpng, libtiff, libjpeg
42-
Config/testthat/edition: 3
43-
Roxygen: list(markdown = TRUE)
44-
Config/build/compilation-database: true

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
YEAR:2023
1+
YEAR:2025
22
COPYRIGHT HOLDER: ragg authors

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#MIT License
22

3-
Copyright (c)2023 ragg authors
3+
Copyright (c)2025 ragg authors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎R/aaa.R‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,21 @@ get_dims <- function(width, height, units, res) {
88
check_numeric_scalar(width,"width")
99
check_numeric_scalar(height,"height")
1010
check_numeric_scalar(res,"res")
11-
dims<- c(width,height)*switch(
12-
units,
13-
'in'=res,
14-
'cm'=res/2.54,
15-
'mm'=res/25.4,
16-
'px'=1,
17-
stop('Unknown unit. Please use either px, in, cm, or, mm',call.=FALSE)
18-
)
11+
dims<- c(width,height)*
12+
switch(
13+
units,
14+
'in'=res,
15+
'cm'=res/2.54,
16+
'mm'=res/25.4,
17+
'px'=1,
18+
stop('Unknown unit. Please use either px, in, cm, or, mm',call.=FALSE)
19+
)
1920
max_dim<- getOption('ragg.max_dim',5e4)
2021
if (any(dims>max_dim)) {
2122
stop(
22-
'One or both dimensions exceed the maximum (',max_dim,'px).\n',
23+
'One or both dimensions exceed the maximum (',
24+
max_dim,
25+
'px).\n',
2326
'- Use `options(ragg.max_dim = ...)` to change the max\n',
2427
' Warning: May cause the R session to crash',
2528
call.=FALSE
@@ -36,7 +39,9 @@ validate_path <- function(path) {
3639
dir<- normalizePath(dir)
3740
path<- file.path(dir, basename(path))
3841
if (grepl("(?<!%)%(?!%)(?![#0 ,+-]*[0-9.]*[diouxX])",path,perl=TRUE)) {
39-
stop("Invalid path. Only use C-style formatting intended for numbers (%d, %i, %o, %u, %x, %X)")
42+
stop(
43+
"Invalid path. Only use C-style formatting intended for numbers (%d, %i, %o, %u, %x, %X)"
44+
)
4045
}
4146
path
4247
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp