Skip to content
This repository was archived by the owner on Feb 23, 2024. It is now read-only.

Commit eede232

Browse files
committed
0.2.3 prep
1 parent aff4ff8 commit eede232

File tree

7 files changed

+79
-65
lines changed

7 files changed

+79
-65
lines changed

.github/workflows/pkgdown.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ jobs:
3030
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
3131
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
3232

33+
- name: Install system dependencies
34+
run: brew install harfbuzz fribidi
35+
3336
- name: Install dependencies
3437
run: |
3538
remotes::install_deps(dependencies = TRUE)
36-
install.packages("pkgdown")
37-
remotes::install_github("mlr-org/mlr3pkgdowntemplate")
39+
install.packages(c("pkgdown", "textshaping"))
3840
shell: Rscript {0}
3941

4042
- name: Install package

.github/workflows/rcmdcheck.yml

Lines changed: 54 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,90 +4,102 @@ on:
44
schedule:
55
- cron: "0 4 * * *"
66

7-
name: Check/Codecov/Render
7+
name: R-CMD-check
88

99
jobs:
1010
R-CMD-check:
1111
runs-on: ${{ matrix.config.os }}
1212

13-
name: R CMD Check (${{ matrix.config.os }} (${{ matrix.config.r }}))
13+
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
1414

1515
strategy:
1616
fail-fast: false
1717
matrix:
1818
config:
19-
- { os: macOS-latest, r: "release" }
20-
- { os: macOS-latest, r: "3.6" }
21-
- { os: macOS-latest, r: "devel" }
19+
- {os: windows-latest, r: 'release'}
20+
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
21+
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
22+
- {os: ubuntu-20.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
2223

2324
env:
2425
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
2526
RSPM: ${{ matrix.config.rspm }}
27+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
2628

2729
steps:
2830
- uses: actions/checkout@v2
2931

30-
- uses: r-lib/actions/setup-r@master
32+
- uses: r-lib/actions/setup-r@v1
33+
id: install-r
3134
with:
3235
r-version: ${{ matrix.config.r }}
36+
http-user-agent: ${{ matrix.config.http-user-agent }}
3337

34-
- uses: r-lib/actions/setup-pandoc@master
38+
- uses: r-lib/actions/setup-pandoc@v1
3539

36-
- name: Query dependencies
40+
- name: Install pak and query dependencies
3741
run: |
38-
install.packages(c("remotes", "devtools"))
39-
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
40-
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
42+
install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/")
43+
saveRDS(pak::pkg_deps("local::.", dependencies = TRUE), ".github/r-depends.rds")
4144
shell: Rscript {0}
4245

43-
- name: Cache R packages
44-
uses: actions/cache@v1
46+
- name: Restore R package cache
47+
uses: actions/cache@v2
4548
with:
46-
path: ${{ env.R_LIBS_USER }}
47-
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
48-
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
49+
path: |
50+
${{ env.R_LIBS_USER }}/*
51+
!${{ env.R_LIBS_USER }}/pak
52+
key: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }}
53+
restore-keys: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-
54+
55+
- name: Install system dependencies
56+
if: runner.os == 'Linux'
57+
run: |
58+
pak::local_system_requirements(execute = TRUE)
59+
pak::pkg_system_requirements("rcmdcheck", execute = TRUE)
60+
shell: Rscript {0}
4961

5062
- name: Install dependencies
5163
run: |
52-
remotes::install_deps(dependencies = TRUE)
53-
remotes::install_cran("rcmdcheck")
64+
pak::local_install_dev_deps(upgrade = TRUE)
65+
pak::pkg_install("rcmdcheck")
66+
shell: Rscript {0}
67+
68+
- name: Session info
69+
run: |
70+
options(width = 100)
71+
pkgs <- installed.packages()[, "Package"]
72+
sessioninfo::session_info(pkgs, include_base = TRUE)
5473
shell: Rscript {0}
5574

5675
- name: Check
5776
env:
58-
_R_CHECK_CRAN_INCOMING_REMOTE_: false
59-
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
77+
_R_CHECK_CRAN_INCOMING_: false
78+
run: |
79+
options(crayon.enabled = TRUE)
80+
rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
6081
shell: Rscript {0}
6182

83+
- name: Show testthat output
84+
if: always()
85+
run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
86+
shell: bash
87+
6288
- name: Upload check results
6389
if: failure()
6490
uses: actions/upload-artifact@main
6591
with:
66-
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
92+
name: ${{ matrix.config.os }}-r${{ matrix.config.r }}-results
6793
path: check
6894

69-
- name: Install covr
70-
if: ${{ github.event_name == 'pull_request' && runner.os == 'macOS' }}
71-
run: install.packages('covr')
72-
shell: Rscript {0}
95+
- name: Don't use tar from old Rtools to store the cache
96+
if: ${{ runner.os == 'Windows' && startsWith(steps.install-r.outputs.installed-r-version, '3.6' ) }}
97+
shell: bash
98+
run: echo "C:/Program Files/Git/usr/bin" >> $GITHUB_PATH
7399

74100
- name: Test coverage
75-
if: ${{ github.event_name == 'pull_request' && runner.os == 'macOS' }}
76-
run: covr::codecov()
77-
shell: Rscript {0}
78-
79-
- name: Render rmd
80-
if: ${{ github.event_name == 'pull_request' && runner.os == 'macOS' }}
101+
if: ${{ runner.os == 'Linux' && matrix.config.r == 'release'}}
81102
run: |
82-
devtools::install()
83-
rmarkdown::render('README.Rmd')
103+
install.packages('covr')
104+
covr::codecov()
84105
shell: Rscript {0}
85-
86-
- name: Commit changes
87-
if: ${{ github.event_name == 'pull_request' && runner.os == 'macOS' }}
88-
uses: EndBug/add-and-commit@v7
89-
with:
90-
author_name: github-actions
91-
author_email: 41898282+github-actions[bot]@users.noreply.github.com
92-
message: 'Update README.md'
93-
add: 'README.md'

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: set6
22
Title: R6 Mathematical Sets Interface
3-
Version: 0.2.2.9000
3+
Version: 0.2.3
44
Authors@R:
55
c(person(given = "Raphael",
66
family = "Sonabend",

NEWS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# set6 0.2.2.9000
1+
# set6 0.2.3
22

33
* Containedness checks for 'n' dimensional sets no longer require same length vectors if power is
44
"n"
@@ -100,4 +100,4 @@
100100
- `set6` upgrades the `sets` package to R6. Many forms of mathematical sets are implemented, including (countably finite) sets, tuples, intervals (countably infinite or uncountable), and fuzzy variants. Wrappers extend functionality by allowing symbolic representations of complex operations on sets, including unions, (cartesian) products, exponentiation, and differences (asymmetric and symmetric).
101101
- See [the website](https://xoopR.github.io/set6/) for more details and the project readme
102102
- See [getting started vignette](https://xoopR.github.io/set6/articles/set6.html) for a short tutorial and introduction
103-
- `set6` is currently 'maturing', so whilst no major updates are planned they may happen. Constant minor updates should be expected.
103+
- `set6` is currently 'maturing', so whilst no major updates are planned they may happen. Constant minor updates should be expected.

README.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set.seed(42)
2020
[![Lifecycle Badge](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://img.shields.io/badge/lifecycle-stable-brightgreen)
2121

2222
[![CRAN Status Badge](https://www.r-pkg.org/badges/version-ago/set6)](https://cran.r-project.org/package=set6)
23-
[![CRAN Checks](https://cranchecks.info/badges/summary/set6)](https://cran.r-project.org/web/checks/check_results_set6.html)
23+
[![CRAN Checks](https://cranchecks.info/badges/worst/set6)](https://cran.r-project.org/web/checks/check_results_set6.html)
2424
[![CRAN Downloads](https://cranlogs.r-pkg.org/badges/grand-total/set6)](https://cran.r-project.org/package=set6)
2525

2626
[![DOI](https://joss.theoj.org/papers/10.21105/joss.02598/status.svg)](https://doi.org/10.21105/joss.02598)

README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Badge](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://i
1717
[![CRAN Status
1818
Badge](https://www.r-pkg.org/badges/version-ago/set6)](https://cran.r-project.org/package=set6)
1919
[![CRAN
20-
Checks](https://cranchecks.info/badges/summary/set6)](https://cran.r-project.org/web/checks/check_results_set6.html)
20+
Checks](https://cranchecks.info/badges/worst/set6)](https://cran.r-project.org/web/checks/check_results_set6.html)
2121
[![CRAN
2222
Downloads](https://cranlogs.r-pkg.org/badges/grand-total/set6)](https://cran.r-project.org/package=set6)
2323

@@ -31,15 +31,15 @@ chat](https://badges.gitter.im/xoopR/set6.png)](https://gitter.im/xoopR/set6)
3131

3232
`set6` is an R6 upgrade to the `sets` package in R that includes:
3333

34-
- Multi-dimensional sets
35-
- Tuples
36-
- Finite and infinite intervals
37-
- Fuzzy sets and tuples
38-
- Set operations including union, intersect, (asymmetric and
34+
- Multi-dimensional sets
35+
- Tuples
36+
- Finite and infinite intervals
37+
- Fuzzy sets and tuples
38+
- Set operations including union, intersect, (asymmetric and
3939
symmetric) difference, and product
40-
- Symbolic representation of infinite sets including common special
40+
- Symbolic representation of infinite sets including common special
4141
sets such as the Reals and Integers
42-
- ConditionalSets for defining sets according to logical conditions
42+
- ConditionalSets for defining sets according to logical conditions
4343

4444
## Installation
4545

@@ -202,31 +202,31 @@ occur. There are a few features and refactoring we plan on implementing
202202
before we consider the package to be in its first complete version.
203203
These mainly include
204204

205-
- Finalising all methods and fields - some are missing or possibly
205+
- Finalising all methods and fields - some are missing or possibly
206206
inaccurate for some wrappers. For example the cardinality of
207207
`ComplementSet`s is imprecise at the moment.
208-
- We are considering adding a `simplify` method to wrappers to reduce
208+
- We are considering adding a `simplify` method to wrappers to reduce
209209
classes inheriting from `SetWrapper` to simpler sets. This allows
210210
users to perform operations with `simplify = FALSE` and then to
211211
change their mind.
212-
- There are known bottlenecks that need to be fixed to massively
212+
- There are known bottlenecks that need to be fixed to massively
213213
improve speed and efficiency.
214-
- Adding more tutorials to make the interface easier for beginners,
214+
- Adding more tutorials to make the interface easier for beginners,
215215
especially people new to R6
216216

217217
At a later stage we may consider adding Venn diagrams for visualisation
218218
of sets and intervals, but this is very low priority.
219219

220220
## Similar Packages
221221

222-
- [sets](https://CRAN.R-project.org/package=sets) - The **sets**
222+
- [sets](https://CRAN.R-project.org/package=sets) - The **sets**
223223
package uses S3 to define some symbolic representaton of
224224
mathematical sets, tuple, intervals, and fuzzy variants. However the
225225
symbolic representation is not consistent throughout the package,
226226
does not allow for clear inspection of set/interval elements, and
227227
there is no support for multi-dimensional sets.
228228

229-
- [BaseSet](https://github.com/ropensci/BaseSet) - The **BaseSet**
229+
- [BaseSet](https://github.com/ropensci/BaseSet) - The **BaseSet**
230230
package focuses on storing and analysing sets in a ‘tidy’ way, with
231231
more options for data storage in long and wide formats. The primary
232232
usage is neat and efficient inspection of finite sets, there is no

cran-comments.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
## Comments
22

3-
Early submission due to errors in R-devel.
3+
Early submission due to bug in downstream dependency.
44

55
## Test Environments
66

77
On GitHub actions:
88

99
* windows-latest (R release)
10-
* windows-latest (R devel)
11-
* windows-latest (R 3.6)
1210
* macOS-latest (R release)
1311
* ubuntu-latest (R release)
12+
* ubuntu-latest (R oldrel)
13+
* ubuntu-latest (R devel)
1414

1515
## R CMD check results
1616

0 commit comments

Comments
 (0)