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

Catch patch up to v1.0.0 #2314

Closed
wants to merge 99 commits into from
Closed

Catch patch up to v1.0.0 #2314

wants to merge 99 commits into from

Conversation

zdz2101
Copy link
Collaborator

@zdz2101 zdz2101 commented Jan 31, 2024

Thank you for your Pull Request! We have developed this task checklist from the Development Process Guide to help with the final steps of the process. Completing the below tasks helps to ensure our reviewers can maximize their time on your code as well as making sure the admiral codebase remains robust and consistent.

Please check off each taskbox as an acknowledgment that you completed the task or check off that it is not relevant to your Pull Request. This checklist is part of the Github Action workflows and the Pull Request will not be merged into the main branch until you have checked off each task.

  • Place Closes #<insert_issue_number> into the beginning of your Pull Request Title (Use Edit button in top-right if you need to update)
  • Code is formatted according to the tidyverse style guide. Run styler::style_file() to style R and Rmd files
  • Updated relevant unit tests or have written new unit tests, which should consider realistic data scenarios and edge cases, e.g. empty datasets, errors, boundary cases etc. - See Unit Test Guide
  • If you removed/replaced any function and/or function parameters, did you fully follow the deprecation guidance?
  • Review the Cheat Sheet. Make any required updates to it by editing the file inst/cheatsheet/admiral_cheatsheet.pptx and re-upload a PDF version of it to the same folder.
  • Update to all relevant roxygen headers and examples, including keywords and families. Refer to the categorization of functions to tag appropriate keyword/family.
  • Run devtools::document() so all .Rd files in the man folder and the NAMESPACE file in the project root are updated appropriately
  • Address any updates needed for vignettes and/or templates
  • Update NEWS.md under the header # admiral (development version) if the changes pertain to a user-facing function (i.e. it has an @export tag) or documentation aimed at users (rather than developers)
  • Build admiral site pkgdown::build_site() and check that all affected examples are displayed correctly and that all new functions occur on the "Reference" page.
  • Address or fix all lintr warnings and errors - lintr::lint_package()
  • Run R CMD check locally and address all errors and warnings - devtools::check()
  • Link the issue in the Development Section on the right hand side.
  • Address all merge conflicts and resolve appropriately
  • Pat yourself on the back for a job well done! Much love to your accomplishment!

bms63 and others added 30 commits October 19, 2023 11:29
* Closes #2147 addressing cran failure (#2149)

* feat: #2147 one solution but proceed with caution

* description uplevel and news blurb

* pass links?

---------

Co-authored-by: Zelos Zhu <[email protected]>

* Update README.md (#2155)

* Update README.md

* URL update

---------

Co-authored-by: Daniel Sjoberg <[email protected]>

* Closes #2154 fix_dthcaus: fix derive_var_dthcaus() (#2162)

* #2154 fix_dthcaus: fix derive_var_dthcaus()

* #2154 fix_dthcaus: run templates check

* #2154 fix_dthcaus: update version number and NEWS

* docs: fixing curlys after feedback from CRAN

* chore: styling death test

---------

Co-authored-by: Zelos Zhu <[email protected]>
Co-authored-by: Zelos Zhu <[email protected]>
Co-authored-by: Daniel Sjoberg <[email protected]>
Co-authored-by: Stefan Bundfuss <[email protected]>
…hub issues. (#2182)

* #2127 Update _pkgdown.yml navbar with two buttons. One for slack and one for issue reporting.

* docs: #2127 NEWS blurb

---------

Co-authored-by: Ben Straub <[email protected]>
* superseded fun

* Update NEWS.md

* added badge

* doc update

* feat: #2141 supersede section

* chore: #2141 docs

---------

Co-authored-by: Zelos Zhu <[email protected]>
Co-authored-by: Ben Straub <[email protected]>
* update templates

* fix typo

* fix style
* use ascii quotes

* regular quoets in the associated .Rd file

* 4 non ascii quotes in README.md
* No multiversion docs

* Update links
)

#2107 Updated the documentation for 'end window' argument
* website links

* Update website-versions.Rmd

* Update website-versions.Rmd

* progress
Add secret for `gert` date fetcher
…_event() (#2177)

* #2140 tmp_event_nr_var: add tmp_event_nr_var to derive_extreme_event()

* #2140 tmp_event_nr_var: update vignettes

* #2140 tmp_event_nr_var: update NEWS

* #2140 tmp_event_nr_var: style files

* #2140 tmp_event_nr_var: fix lintr check

* #2140 tmp_event_nr_var: fix typos
* Update website-versions.Rmd

* Update website-versions.Rmd
* #2139 chore: Make dataset_add mandatory for derive_extreme_records()

* #2139 Add mandatory dataset_add to examples

* #2130 Chore: Update derive_extreme_records from review comments

---------

Co-authored-by: Jeffrey Dickinson <[email protected]>
* #2146 Fix Time Imputation Flag

* #2146 check templates error

* #2146 replace do.call

* Replace function short hand with function

* Update changelog

---------

Co-authored-by: Ben Straub <[email protected]>
Co-authored-by: Daniel Sjoberg <[email protected]>
…ined_exist_flag(), filter_joined() (#2163)

* #2126 unify_joined: update arguments and tests of filter_joined() and derive_var_joined_exist_flag()

* #2126 unify_joined: update examples for derive_var_joined_exist_flag()

* #2126 unify_joined: documentation of filter_joined() and derive_var_joined_exist_flag()

* #2126 unify_joined: update derive_vars_joined()

* #2126 unify_joined: add get_joined_data(), update derive_extreme_event(), add tests

* #2126 unify_joined: update templates

* #2126 unify_joined: style files

* #2126 unify_joined: update vignettes

* #2126 unify_joined: update vignettes

* #2126 unify_joined: style files

* #2126 unify_joined: style files

* #2126 unify_joined: remove commented out code

* #2126 unify_joined: fix lintr issues

* #2126 unify_joined: add example for first_cond_lower

* #2126 unify_joined: update function documentation

* #2126 unify_joined: style files

* #2126 unify_joined: style files

* #2126 unify_joined: update NEWS.md

* #2126 unify_joined: improve documentation

* #2126 unify_joined: add example to event_joined()

* #2126 unify_joined: fix R-CMD check

* #2126 unify_joined: check class of deprecation warning

* #2126 unify_joined: improve documentation

* #2126 unify_joined: style files

* #2126 unify_joined: clean up globals.R

* #2126 unify_joined: improve documentation

---------

Co-authored-by: Jerry Johnson <[email protected]>
Co-authored-by: Ben Straub <[email protected]>
#2199)

* Test no R version

* Consolidate check templates into common pipeline

* change admiralci ref

* remove pharmaverseadam push

---------

Co-authored-by: Daphné Grasselly <[email protected]>
* feat: #2184 rename check_keys

* chore: #2184 cleanup news

* code typo

* styler/lintr

* feat: #2184 add appropriate deprecation test

---------

Co-authored-by: Zelos Zhu <[email protected]>
Co-authored-by: Ben Straub <[email protected]>
…mmary_records()` (#2158)

* feat: #2142 intiial superseding step

* rough draft without missing_values implementation

* rough draft of new enhancement

* feat: #2142 get a good clean slate

* feat: #2142 working enhanced function

* feat: #2142 add appropriate test suite

* feat: #2142 run styler, lintr, add news and roxygen documentation

* chore: #2142 spelling/grammar

* chore: #2142 fix test

* should we inform superseded

* retain deprecated arguments to pass cicd

* chore: #2142 add remotes for admiraldev for proper branching strategy

* min dev versioning

* Update DESCRIPTION

* chore: #2142 address feedback

* upversion our description page to match current version up on github

* docs: little note for running website versions

* feat: #2142 rename filter to filter_add

* Update R/derive_summary_records.R

Co-authored-by: Ben Straub <[email protected]>

* feat: #2142 get checks appropriately running

* roxygen stuff and vignettes

* chore: #2142 roxygen stuff

* get past check-templates

* finally get past templates

* feat: #2142 clear up missing_values usage

* chore: #2142 rename filter to filter_add internally in codebase too

* chore: #2142 adopt and address all other feedback

* missed a renaming

* feat: #2142 remove extra fluff for missing values

* update news blurb

* chore: #2142 update documentation based on feedback

---------

Co-authored-by: Zelos Zhu <[email protected]>
Co-authored-by: Daniel Sjoberg <[email protected]>
Co-authored-by: Jerry Johnson <[email protected]>
Co-authored-by: Ben Straub <[email protected]>
* add vbump job

* change cran status assignes

---------

Co-authored-by: cicdguy <[email protected]>
Co-authored-by: Daniel Sjoberg <[email protected]>
* #2222 clarify_mid: Clarify date_imputation = "mid"

* #2222 clarify_mid: Fix links

---------

Co-authored-by: Ben Straub <[email protected]>
2225 tidy up SUBGROUP column

Co-authored-by: Ben Straub <[email protected]>
* 2134 add general option signif_digits

* 2134 fix SPELLING and STYLER

* 2134 address QC comments and update NEWS file

* 2134 fix LINTR and STYLER

* Apply suggestions from code review

Minor updates from QC.

Co-authored-by: Ben Straub <[email protected]>
Co-authored-by: StefanThoma <[email protected]>

* Update vignettes/lab_grading.Rmd

---------

Co-authored-by: Ben Straub <[email protected]>
Co-authored-by: StefanThoma <[email protected]>
millerg23 and others added 15 commits December 7, 2023 09:57
…bility (#2288)

* feat: #2255 add uppercase versions of untis

* feat: #2255 add tests and documentation

* feat: #2255 unit mapping fix

* match mapping in derive_vars_duration

* apply fixes to derive_vars_aage too

* run styler

* account for missing mappings

* styler

* try something

* undo the something

* #2255 use case_match to clean up code

* try something

* forgot to commit namespace

* undo the something

* undo the something

* feat: #2255 revert changes from case_match in favor of case_when

* styler

* chore: #2255 clean up documentation

* update news

* get around spellcheck

* chore: #2255 fix test and wordlist

* feat: #2255 adopt feedback

* Update common.yml

* add back backwards-compatibility

* original unit is kept unit_var in derive_vars_duration

---------

Co-authored-by: Ben Straub <[email protected]>
* #2282 fix mistake in changelog

* fix: #2282 global binding

* chore: #2282 styling

* Trigger Build

---------

Co-authored-by: Ben Straub <[email protected]>
)

#2289 fix_derive_vars_joined: remove by_vars from new_vars
#2291 fix_derive_extreme_event: do not ignore condition

Co-authored-by: Ben Straub <[email protected]>
* [skip vbump] 1.0 release

* chore: remove remotes and upversion admiraldev

* Trigger Build
* [skip vbump] 1.0 release

* chore: remove remotes and upversion admiraldev

* Trigger Build

* chore: link adjustments

* chore: fix broken links
Merge branch 'patch' of https://github.com/pharmaverse/admiral into current_release

# Conflicts:
#	.github/workflows/templates.yml
#	NEWS.md
@zdz2101
Copy link
Collaborator Author

zdz2101 commented Jan 31, 2024

@bms63 this should catch patch up to v1.0.0 and I can modify #2313 to compare with patch after this? and we release from patch as v1.0.1 ?

Copy link

Code Coverage

Package Line Rate Health
admiral 98%
Summary 98% (4757 / 4859)

@bms63
Copy link
Collaborator

bms63 commented Jan 31, 2024

I don't think the patch branch is up to date with the 1.0 release

@zdz2101 zdz2101 changed the title Playing around Catch patch up to v1.0.0 Jan 31, 2024
@zdz2101
Copy link
Collaborator Author

zdz2101 commented Jan 31, 2024

I don't think the patch branch is up to date with the 1.0 release

this PR is to catch patch up to speed

@zdz2101 zdz2101 marked this pull request as ready for review January 31, 2024 19:13
@zdz2101 zdz2101 requested review from bms63 and removed request for millerg23 and jeffreyad January 31, 2024 19:13
@bms63
Copy link
Collaborator

bms63 commented Jan 31, 2024

This terrifies me

@zdz2101
Copy link
Collaborator Author

zdz2101 commented Jan 31, 2024

Closing in favor of creating new patch branch from 1.0.0 release

@zdz2101 zdz2101 closed this Jan 31, 2024
@zdz2101 zdz2101 deleted the current_release branch January 31, 2024 19:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.