Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trial dyn [email protected]@main #1628

Closed
wants to merge 77 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
3dd3f1e
progress
ddsjoberg Nov 21, 2023
1cd9a39
Bridge updates (#1570)
ddsjoberg Nov 27, 2023
0849157
small updates
ddsjoberg Nov 28, 2023
320a437
Selecting updates (#1573)
ddsjoberg Dec 1, 2023
2ce0d50
GH Action workflow updates (#1574)
ddsjoberg Dec 1, 2023
7ae09ae
Update NEWS.md
ddsjoberg Dec 1, 2023
dea17ad
Assign digits (#1575)
ddsjoberg Dec 3, 2023
ae39b22
Dynamic column headers (#1576)
ddsjoberg Dec 4, 2023
e782825
Update DESCRIPTION
ddsjoberg Dec 7, 2023
2e4c79c
progress
ddsjoberg Dec 8, 2023
853fad3
Update tbl_summary.R
ddsjoberg Dec 8, 2023
8de782a
Updating with the `tbl_summary(sort)` argument (#1583)
ddsjoberg Dec 30, 2023
f523d19
moving indentation to its own table styling enttry (#1584)
ddsjoberg Dec 30, 2023
85905a2
check updates
ddsjoberg Jan 1, 2024
0ea2bfc
Update DESCRIPTION
ddsjoberg Jan 5, 2024
b94919d
Adding `tbl_summary(percent)` argument (#1585)
ddsjoberg Jan 13, 2024
0ed6149
progress (#1595)
ddsjoberg Feb 4, 2024
e2bd055
doc updates
ddsjoberg Feb 4, 2024
8697026
adding default stat labels
ddsjoberg Feb 4, 2024
02af7cc
progress
ddsjoberg Feb 5, 2024
ffb0b7c
Update tbl_summary.R
ddsjoberg Feb 6, 2024
6d85d9b
Update bridge_summary.R
ddsjoberg Feb 6, 2024
0a61c00
style
ddsjoberg Feb 6, 2024
2c44fb3
Update README.Rmd
ddsjoberg Feb 6, 2024
da1401c
dichotomous variable updates
ddsjoberg Feb 7, 2024
aaee0bd
Update test-tbl_summary.R
ddsjoberg Feb 7, 2024
44d4f2c
checks updates
ddsjoberg Feb 7, 2024
32e828b
forcats shim update
ddsjoberg Feb 7, 2024
bb1114f
purrr shim update
ddsjoberg Feb 7, 2024
483507b
Update test-tbl_summary.R
ddsjoberg Feb 8, 2024
bc449d2
new checks file
ddsjoberg Feb 9, 2024
a896032
lil updates
ddsjoberg Feb 14, 2024
9e54a4c
Adding more `tbl_summary()` tests and organizing snapshot tests (#1604)
ddsjoberg Feb 19, 2024
e94896a
messaging update
ddsjoberg Feb 20, 2024
6d9ba61
Update .Rbuildignore
ddsjoberg Feb 20, 2024
6e62ef1
updates
ddsjoberg Feb 21, 2024
ff2a950
updates after cards rename
ddsjoberg Feb 22, 2024
3644b3a
adding ARDs as lists inside tbl_summary
ddsjoberg Mar 9, 2024
c2358b2
Create import-standalone-tibble.R
ddsjoberg Mar 9, 2024
59da845
selecting updates (#1611)
ddsjoberg Mar 10, 2024
67fc98e
rename column summary_type to var_type (#1612)
ddsjoberg Mar 11, 2024
5a94726
init
Melkiades Apr 17, 2024
a6c4b9f
cleaning
Melkiades Apr 17, 2024
51000fb
rework paths
Melkiades Apr 18, 2024
3093cbf
cleaning tests
Melkiades Apr 18, 2024
0d58d5f
path fixes
Melkiades Apr 18, 2024
8785ec7
documenting
Melkiades Apr 18, 2024
2dc603f
htmltools to desc
Melkiades Apr 18, 2024
7b55338
general
Melkiades Apr 23, 2024
b21918f
Adding v2 `add_p.tbl_summary()` (#1615)
ddsjoberg May 4, 2024
cd7bdcf
Adding `add_difference.tbl_summary()` to v2 branch (#1634)
ddsjoberg May 7, 2024
f69d0e3
First draft of `card_summary()` (#1636)
ddsjoberg May 13, 2024
f0e3a0b
Generalizing `brdg_summary()` and supporting `pier_*()` functions (#1…
ddsjoberg May 14, 2024
f10c478
v2.0 Adding `add_n.tbl summary()` (#1645)
ddsjoberg May 15, 2024
0e76a68
Adding v2.0 `tbl_regression()` (#1648)
ddsjoberg May 16, 2024
427c380
bridge rename (#1661)
ddsjoberg May 16, 2024
3c1935f
Adding `add_q()` (#1662)
ddsjoberg May 16, 2024
930fa9f
v2.0 `add_overall.tbl summary()` (#1663)
ddsjoberg May 17, 2024
2bd29cb
progress (#1664)
ddsjoberg May 17, 2024
2e3e2bb
Merge branch 'v2.0' into [email protected]@main
Melkiades May 17, 2024
82ef26b
V2.0 adding pkgdown (#1665)
ddsjoberg May 17, 2024
2b3ad85
fixes
Melkiades May 17, 2024
3b6beeb
fix
Melkiades May 17, 2024
9b75904
Merge branch '[email protected]@main' of github.com:ddsjoberg/gtsum…
Melkiades May 17, 2024
495879b
doc updates related to pkgdown
ddsjoberg May 17, 2024
be66e07
v2.0 Adding `add_stat()` (#1667)
ddsjoberg May 17, 2024
b29f9cd
v2.0 `add_stat_label.tbl_summary()` (#1669)
ddsjoberg May 18, 2024
a244c17
Update add_stat_label.R
ddsjoberg May 18, 2024
d748d10
v2.0 `modify_table_styling()` (#1672)
ddsjoberg May 19, 2024
ffb9b02
progress (#1673)
ddsjoberg May 19, 2024
3de9bf7
v2.0 `modify_header()`, `modify_spanning_header()`, `modify_footnote(…
ddsjoberg May 20, 2024
c3b0bc1
progress (#1677)
ddsjoberg May 20, 2024
a6664d6
v2.0 `modify_column_hide()`, `modify_column_unhide()`, `modify_column…
ddsjoberg May 20, 2024
3ab4969
v2.0 `modify_fmt_fun()` (#1679)
ddsjoberg May 21, 2024
3b3bc62
v2.0 bold and italicize labels and levels (#1680)
ddsjoberg May 21, 2024
b3d3e54
update
Melkiades May 21, 2024
ba4c582
Merge branch 'v2.0' into [email protected]@main
Melkiades May 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
^revdep$
^CRAN-RELEASE$
^\.covrignore$
^\.DS_Store$
^lastMiKTeXException$
^bench$
^benchmark$
Expand All @@ -37,3 +38,4 @@
^CRAN-SUBMISSION$
^man-images$
^vignettes/articles$
^_archive$
5 changes: 0 additions & 5 deletions .Rprofile

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,16 @@

Reviewer Checklist (if item does not apply, mark is as complete)

- [ ] Ensure all package dependencies are installed by running `renv::install()`
- [ ] PR branch has pulled the most recent updates from master branch. Ensure the pull request branch and your local version match and both have the latest updates from the master branch.
- [ ] If an update was made to `tbl_summary()`, was the same change implemented for `tbl_svysummary()`?
- [ ] If a new function was added, function included in `_pkgdown.yml`
- [ ] If a bug was fixed, a unit test was added for the bug check
- [ ] Ensure all package dependencies are installed: `renv::install()`
- [ ] PR branch has pulled the most recent updates from master branch: `usethis::pr_merge_main()`
- [ ] If a bug was fixed, a unit test was added.
- [ ] Run `pkgdown::build_site()`. Check the R console for errors, and review the rendered website.
- [ ] Code coverage is suitable for any new functions/features. Review coverage with `withr::with_envvar(new = c("NOT_CRAN" = "true"), covr::report())`. Begin in a fresh R session without any packages loaded.
- [ ] R CMD Check runs without errors, warnings, and notes
- [ ] Code coverage is suitable for any new functions/features: `devtools::test_coverage()`
- [ ] `usethis::use_spell_check()` runs with no spelling errors in documentation

When the branch is ready to be merged into master:
- [ ] Update `NEWS.md` with the changes from this pull request under the heading "`# gtsummary (development version)`". If there is an issue associated with the pull request, reference it in parentheses at the end update (see `NEWS.md` for examples).
- [ ] Increment the version number using `usethis::use_version(which = "dev")`
- [ ] Run `codemetar::write_codemeta()`
- [ ] Run `usethis::use_spell_check()` again
- [ ] Approve Pull Request
- [ ] Merge the PR. Please use "Squash and merge".
Expand Down
49 changes: 49 additions & 0 deletions .github/workflows/R-CMD-check-as-cran.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help

on:
push:
branches: [main, master]
pull_request:
# branches: [main, master]

name: R-CMD-check-as-cran

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}


env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v3

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

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
needs: check

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
94 changes: 0 additions & 94 deletions .github/workflows/R-CMD-check-historic-R-versions.yaml

This file was deleted.

41 changes: 18 additions & 23 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
#
# NOTE: This workflow is overkill for most R packages and
Expand All @@ -8,7 +8,7 @@ on:
push:
branches: [main, master]
pull_request:
branches: [main, master]
# branches: [main, master]

name: R-CMD-check

Expand All @@ -22,12 +22,13 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: macos-latest, r: 'release'}

- {os: windows-latest, r: 'release'}
# use 4.1 to check with rtools40's older compiler
- {os: windows-latest, r: '4.1'}

# Use older ubuntu to maximise backward compatibility
# - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}
# - {os: ubuntu-latest, r: 'oldrel-2'}
Expand All @@ -39,7 +40,7 @@ jobs:
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

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

Expand All @@ -51,24 +52,18 @@ jobs:

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: rcmdcheck

- name: Install system dependencies
if: runner.os == 'Linux'
run: |
sudo apt-get update -y
sudo apt-get install -y texlive-fonts-extra
extra-packages: any::rcmdcheck
needs: check

- uses: r-lib/actions/check-r-package@v2
# this is hopefully a transitory issue and we can delete in the future (2024-05-02)
# https://github.com/lme4/lme4/issues/763
- name: Install Matrix and lme4 from CRAN
run: utils::install.packages(c("Matrix", "lme4"), repos = c(CRAN = "https://cloud.r-project.org"))
shell: Rscript {0}

- name: Show testthat output
if: always()
run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
# not using the default '--as-cran' arg, because it sets up private libs (see https://github.com/r-lib/devtools/issues/2044#issuecomment-526209877)
- uses: r-lib/actions/check-r-package@v2
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
upload-snapshots: true
args: 'c("--no-manual")'
20 changes: 0 additions & 20 deletions .github/workflows/close.yaml

This file was deleted.

52 changes: 0 additions & 52 deletions .github/workflows/continuous-benchmarks.txt

This file was deleted.

10 changes: 6 additions & 4 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [main, master]
pull_request:
branches: [main, master]
# branches: [main, master]
release:
types: [published]
workflow_dispatch:
Expand All @@ -19,8 +19,10 @@ jobs:
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

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

Expand All @@ -31,15 +33,15 @@ jobs:
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
needs: website
needs: check

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/[email protected].4
uses: JamesIves/github-pages-deploy-action@v4.4.1
with:
clean: false
branch: gh-pages
Expand Down
Loading
Loading