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

The master branch is becoming the main development branch #1153

Closed
wants to merge 279 commits into from

Conversation

VincentGuyader
Copy link
Member

The master branch is becoming the main development branch. This will allow users to perform remotes::install_github("thinkr-open/golem") with the up-to-date development version without having to do remotes::install_github("thinkr-open/golem@dev"). Currently, the master branch is a copy of the CRAN version, which is of little interest. Instead, let's use the concept of release to fix what has been submitted to CRAN."

ok @ColinFay ?

ilyaZar and others added 30 commits April 4, 2023 21:22
- fix missing tests for make_action_button
- possible bugfix for make_action_button
    - check with grepl instead of grep to avoid numeric(0) in
    if-statement which would make the corresponding test fail
    for button_6: class attribute present but not equal to
    "action-button" gives an error
1. add a double check to look for modules with names starting with "mod_mod_xxx" (see R/add_r_files.R)

2. add syntax check for module names to add_module(): explicitly ask the user if s/he wants to name her module "mod_xxx" or "mod_mod_xxx"
- save old golem name in tmp-variable and use helper-func inside set_golem_name() to overwrite tests/testthat.R
- helper-func screens for old_name instances and replaces them with new_name

Refs: #805
- save <old_name> in tmp-variable and use helper-func inside set_golem_name() to change file name from "vignettes/<old_name>.R" to "vignettes/<new_name>.R"
- helper-func screens for old_name instances inside <vignettes/<old_name>.R> and replaces them with new_name, then saves output to "vignettes/<new_name>.R"

Refs: #805
- adding a message to the user to check for
other places for the name
- passing the path to sub functions
- remove 'author_XXX' args and replace with 'authors'
- make 'authors' arg default to class 'person'
- use class check on 'authors', throw error if it fails
- use desc$set_authors

This mostly draws from the ideas of @jmeyer2482 and @ColinFay:

Co-authored-by: Colin Fay <[email protected]>
Co-authored-by: jmeyer2482 <[email protected]>
- update vignette/a_start.Rmd with new fill_desc() interface
- delete some redundant whitespaces in same file
- changes since values of authors are of type person() which
    requires parsing the entries
- adjust interace of fill_desc() so build.R runs smoothly
- remove warning due "Undocumented arguments in documentation object" in fill_desc

- add forgotten @importFrom utils person that caused a note
- devtools::build_readme() cannot be run when aut/cre is missing
ColinFay and others added 25 commits August 7, 2024 07:20
- add_rscignore_file() generates .rscignore at golem top level
- call in add_rstudio_files() is used in RStudio connect, shiny
server and shinyapps io
- can be called directly

Refs: #110
- fix typos in two tests

- update docs to pass CI

- use different cat_green_tick() for app.R and .rscignore as they are called right after each other

- move doc for rscignore down so man-page displays add_rstudioconnect_file at the top
* feat `golem::add_dockerfile_with_renv_*()` set "rstudio" as default USER in Dockerfile to avoid launching app as root

* feat It is now easier to modify the renv.config.pak.enabled parameter in the Dockerfile generated by golem::add_dockerfile_with_renv_*().
@ColinFay
Copy link
Member

ColinFay commented Aug 7, 2024

Here is the workflow that we'll try to follow :

  • Release a version in main (not necessarily meaning a CRAN publish)
  • Define what we'll work on next, using a milestone, as in https://github.com/ThinkR-open/golem/milestone/1
  • Work on that milestone in feat branches + dev
  • Merge to main as soon as the milestone is completed

That way, we'll keep the main branch stable, but it won't necessarily mean that merge to main == release to CRAN

@ColinFay ColinFay changed the title The master branch is becoming the main development branch v0.5.0 release candidate Aug 7, 2024
@ColinFay ColinFay changed the title v0.5.0 release candidate The master branch is becoming the main development branch Aug 7, 2024
@ColinFay
Copy link
Member

ColinFay commented Aug 7, 2024

I'll close and reopen a PR so that it's clearer in the git history

@ColinFay ColinFay closed this Aug 7, 2024
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.

6 participants