Skip to content

Commit 5d4eeb1

Browse files
Merge branch 'release/0.8.0'
2 parents 61355f9 + ede65e9 commit 5d4eeb1

Some content is hidden

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

75 files changed

+1368
-345
lines changed

.Rbuildignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
^OVERVIEW[.]md$
1010
^README[.]md$
1111
^CONDUCT[.]md$
12+
^CONTRIBUTING[.]md$
1213
^docs/
14+
^pkgdown/
1315

1416
#----------------------------
1517
# devtools
@@ -62,3 +64,6 @@ Rplots.pdf$
6264
^imgs
6365
^.*.bob$
6466
^\.github$
67+
^docs
68+
^pkgdown
69+

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,16 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
config:
15-
- { os: windows-latest, r: '3.5'}
16-
- { os: windows-latest, r: '3.6'}
17-
- { os: windows-latest, r: '4.0'}
18-
- { os: windows-latest, r: 'devel'}
19-
- { os: macOS-latest, r: '3.5'}
20-
- { os: macOS-latest, r: '3.6'}
21-
- { os: macOS-latest, r: '4.0'}
22-
- { os: macOS-latest, r: 'devel'}
23-
- { os: ubuntu-16.04, r: '3.5', cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
24-
- { os: ubuntu-16.04, r: '3.6', cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
25-
- { os: ubuntu-16.04, r: '4.0', cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
15+
- {os: windows-latest, r: 'devel' }
16+
- {os: windows-latest, r: 'release'}
17+
- {os: windows-latest, r: 'oldrel' }
18+
- {os: macOS-latest, r: 'devel' }
19+
- {os: macOS-latest, r: 'release'}
20+
- {os: macOS-latest, r: 'oldrel' }
21+
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
22+
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
23+
- {os: ubuntu-20.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
24+
- {os: ubuntu-20.04, r: '3.5', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
2625

2726
env:
2827
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@
33
**/*~
44
.local
55
inst/doc
6-
.make/README.md.rsp
6+
.make/*.md.rsp
77
revdep/
8+
docs/
9+
.Rdump

.make/Makefile

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ check_Rex:
286286

287287

288288
covr:
289-
$(R_SCRIPT) -e "source('.covr.R'); covr::shine(covr)"
289+
$(R_SCRIPT) -e "c <- covr::package_coverage(quiet = FALSE); saveRDS(c, '.covr.rds'); print(c); covr::report(c)"
290290

291291

292292
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -423,9 +423,6 @@ win-builder-devel: $(R_OUTDIR)/$(PKG_TARBALL)
423423
win-builder-release: $(R_OUTDIR)/$(PKG_TARBALL)
424424
curl -v -T $? ftp://anonymous@$(WIN_BUILDER)/R-release/
425425

426-
win-builder-oldrelease: $(R_OUTDIR)/$(PKG_TARBALL)
427-
curl -v -T $? ftp://anonymous@$(WIN_BUILDER)/R-oldrelease/
428-
429426
win-builder: win-builder-devel win-builder-release
430427

431428

@@ -463,8 +460,8 @@ Makefile: $(FILES_MAKEFILE)
463460
.make/appveyor.yml.rsp:
464461
$(R_SCRIPT) -e "R.utils::downloadFile('https://raw.githubusercontent.com/HenrikBengtsson/r-package-files/master/.make/appveyor.yml.rsp', path='.make/')"
465462

466-
.make/README.md.rsp:
467-
$(R_SCRIPT) -e "R.utils::downloadFile('https://raw.githubusercontent.com/HenrikBengtsson/r-package-files/master/.make/README.md.rsp', path='.make/')"
463+
.make/%.md.rsp:
464+
$(R_SCRIPT) -e "R.utils::downloadFile('https://raw.githubusercontent.com/HenrikBengtsson/r-package-files/master/$@', path='.make/')"
468465

469466
.covr.R:
470467
$(R_SCRIPT) -e "R.utils::downloadFile('https://raw.githubusercontent.com/HenrikBengtsson/covr-utils/master/.covr.R')"
@@ -487,10 +484,20 @@ refresh: clean
487484
README.md: .make/README.md.rsp
488485
$(R_SCRIPT) -e "R.rsp::rfile('$<', postprocess=FALSE)"
489486

487+
CONTRIBUTING.md: .make/CONTRIBUTING.md.rsp
488+
$(R_SCRIPT) -e "R.rsp::rfile('$<', postprocess=FALSE)"
489+
490490
.travis.yml: .make/.travis.yml.rsp
491491
$(R_SCRIPT) -e "R.rsp::rfile('$<', postprocess=FALSE)"
492492

493493
appveyor.yml: .make/appveyor.yml.rsp
494494
$(R_SCRIPT) -e "R.rsp::rfile('$<', postprocess=FALSE)"
495495

496496
config: .travis.yml appveyor.yml README.md
497+
498+
## Include any other Makefile.*, if they exists
499+
INCLUDES := $(wildcard .make/Makefile.*)
500+
ifneq ($(strip $(INCLUDES)),)
501+
include $(INCLUDES)
502+
endif
503+

.make/extra_badges.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<%=a("https://lifecycle.r-lib.org/articles/stages.html", body=img("man/figures/lifecycle-maturing-blue.svg", alt="Life cycle: maturing"))%>

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ matrix:
3030
- _R_CHECK_LENGTH_1_CONDITION_=true
3131
- _R_CHECK_LENGTH_1_LOGIC2_=true
3232
- _R_CLASS_MATRIX_ARRAY_=true
33-
- os: osx
34-
r: oldrel
35-
- os: osx
36-
r: release
33+
# - os: osx
34+
# r: oldrel
35+
# - os: osx
36+
# r: release
3737
- os: linux
3838
r: release
3939
r_check_args: --no-build-vignettes --no-codoc --no-examples --no-tests --no-manual --ignore-vignettes

CONTRIBUTING.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
# Contributing to the 'progressr' package
3+
4+
This Git repository uses the [Git Flow](https://nvie.com/posts/a-successful-git-branching-model/) branching model (the [`git flow`](https://github.com/petervanderdoes/gitflow-avh) extension is useful for this). The [`develop`](https://github.com/HenrikBengtsson/progressr/tree/develop) branch contains the latest contributions and other code that will appear in the next release, and the [`master`](https://github.com/HenrikBengtsson/progressr) branch contains the code of the latest release, which is exactly what is currently on [CRAN](https://cran.r-project.org/package=progressr).
5+
6+
Contributing to this package is easy. Just send a [pull request](https://help.github.com/articles/using-pull-requests/). When you send your PR, make sure `develop` is the destination branch on the [progressr repository](https://github.com/HenrikBengtsson/progressr). Your PR should pass `R CMD check --as-cran`, which will also be checked by <a href="https://github.com/HenrikBengtsson/progressr/actions?query=workflow%3AR-CMD-check">GitHub Actions</a>, <a href="https://travis-ci.org/HenrikBengtsson/progressr">Travis CI</a>, and <a href="https://ci.appveyor.com/project/HenrikBengtsson/progressr">AppVeyor CI</a> when the PR is submitted.
7+
8+
We abide to the [Code of Conduct](https://www.contributor-covenant.org/version/2/0/code_of_conduct/) of Contributor Covenant.

DESCRIPTION

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: progressr
2-
Version: 0.7.0
2+
Version: 0.8.0
33
Title: An Inclusive, Unifying API for Progress Updates
44
Description: A minimal, unifying API for scripts and packages to report progress updates from anywhere including when using parallel processing. The package is designed such that the developer can to focus on what progress should be reported on without having to worry about how to present it. The end user has full control of how, where, and when to render these progress updates, e.g. in the terminal using utils::txtProgressBar() or progress::progress_bar(), in a graphical user interface using utils::winProgressBar(), tcltk::tkProgressBar() or shiny::withProgress(), via the speakers using beep::beepr(), or on a file system via the size of a file. Anyone can add additional, customized, progression handlers. The 'progressr' package uses R's condition framework for signaling progress updated. Because of this, progress can be reported from almost anywhere in R, e.g. from classical for and while loops, from map-reduce APIs like the lapply() family of functions, 'purrr', 'plyr', and 'foreach'. It will also work with parallel processing via the 'future' framework, e.g. future.apply::future_lapply(), furrr::future_map(), and 'foreach' with 'doFuture'. The package is compatible with Shiny applications.
55
Authors@R: c(
@@ -25,12 +25,13 @@ Suggests:
2525
future,
2626
future.apply,
2727
furrr,
28+
rstudioapi,
2829
shiny,
2930
commonmark,
3031
base64enc,
3132
tools
3233
VignetteBuilder: progressr
33-
URL: https://github.com/HenrikBengtsson/progressr
34+
URL: https://progressr.futureverse.org, https://github.com/HenrikBengtsson/progressr
3435
BugReports: https://github.com/HenrikBengtsson/progressr/issues
3536
RoxygenNote: 7.1.1
3637
Roxygen: list(markdown = TRUE)

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include .make/Makefile
22

33
vignettes/progressr-intro.md: OVERVIEW.md vignettes/incl/clean.css
4-
sed -i '/%\\Vignette/!d' $@
4+
sed -E -i '/^(<!-- DO NOT EDIT THIS FILE|!\[|#+[[:space:]])/,$$d' $@
55
echo "<!-- DO NOT EDIT THIS FILE! Edit 'OVERVIEW.md' instead and then rebuild this file with 'make vigs' -->" >> $@
66
cat $< >> $@
77
sed -i 's/vignettes\///g' $@

NAMESPACE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export(handler_notifier)
1313
export(handler_pbcol)
1414
export(handler_pbmcapply)
1515
export(handler_progress)
16+
export(handler_rstudio)
1617
export(handler_shiny)
1718
export(handler_tkprogressbar)
1819
export(handler_txtprogressbar)

0 commit comments

Comments
 (0)