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

Fix change config yml loc #1042

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
209 commits
Select commit Hold shift + click to select a range
19c49dd
fix(config): unifying config manipulation
ColinFay Jul 2, 2022
d2554bc
fix(CI): correct path check
ColinFay Jul 2, 2022
7ab7efa
fix(typo): pkg_path instead of golem_path
ColinFay Jul 2, 2022
b79c7b3
feature(creation): create golem only set the app name
ColinFay Jul 2, 2022
f793017
feat(create_golem): No name change in the YAML
ColinFay Jul 2, 2022
818987a
fix(option-setting): don't change to expr before passing to set_golem…
ColinFay Jul 2, 2022
3f9fcb3
chore(file): file splitting & renaming
ColinFay Jul 4, 2022
a7c04cf
fix(config): Use the correct env var in get_golem_*
ColinFay Jul 4, 2022
b420bd5
fix(config): golem_wd is now golem::pkg_path()
ColinFay Jul 4, 2022
411f952
chore(style): Change the indentation of param
ColinFay Jul 4, 2022
30ec5d2
feat(config): get_golem_* now tries to guess if not found in yaml
ColinFay Jul 4, 2022
05033a3
fix(test): no recommended tests
ColinFay Jul 5, 2022
c07cf9c
feat(config): get_current_config no longer set options
ColinFay Jul 5, 2022
709a382
feat: add support for docker & {renv} (#882)
VincentGuyader Jul 13, 2022
5004b04
Merge branch 'dev' into master
ColinFay Aug 8, 2022
210db93
feat: add support for docker & {renv} (#882) (#889)
ColinFay Aug 8, 2022
fe1d12d
doc: bump dev version
ColinFay Aug 8, 2022
8b22ea8
bug: fixed bug with check_installed
ColinFay Aug 8, 2022
cc2ba3d
chore: added an EOF
ColinFay Aug 8, 2022
853790d
Merge branch 'dev' of https://github.com/ThinkR-open/golem into dev
ColinFay Aug 8, 2022
9d51302
chore: reindent
ColinFay Aug 8, 2022
75ee807
chore: changed indentatino
ColinFay Aug 8, 2022
828f3de
fix(DESCRIPTION): typo in version number
ColinFay Aug 9, 2022
a6ac858
chore: added some comments
ColinFay Aug 9, 2022
3ba39ee
doc: re-built the doc
ColinFay Aug 9, 2022
b556255
fix: issue with param names
ColinFay Aug 9, 2022
0598cae
refactor: explicitly set arguments
ColinFay Aug 9, 2022
6827572
fix: removed unused argument
ColinFay Aug 9, 2022
ffb491c
doc(vignette): renames the title according to convention
ColinFay Aug 9, 2022
48f78fe
fix: correct handling of paths in yaml-set
ColinFay Aug 9, 2022
d6b5670
fix(config): unifying config manipulation
ColinFay Jul 2, 2022
4d3a5bb
fix(CI): correct path check
ColinFay Jul 2, 2022
6aa325f
fix(typo): pkg_path instead of golem_path
ColinFay Jul 2, 2022
70d2471
feature(creation): create golem only set the app name
ColinFay Jul 2, 2022
9a988e2
feat(create_golem): No name change in the YAML
ColinFay Jul 2, 2022
ca5a007
fix(option-setting): don't change to expr before passing to set_golem…
ColinFay Jul 2, 2022
ddf241c
chore(file): file splitting & renaming
ColinFay Jul 4, 2022
6615842
fix(config): Use the correct env var in get_golem_*
ColinFay Jul 4, 2022
4e221a6
fix(config): golem_wd is now golem::pkg_path()
ColinFay Jul 4, 2022
15df875
chore(style): Change the indentation of param
ColinFay Jul 4, 2022
1b92965
feat(config): get_golem_* now tries to guess if not found in yaml
ColinFay Jul 4, 2022
feda561
fix(test): no recommended tests
ColinFay Jul 5, 2022
e5df612
feat(config): get_current_config no longer set options
ColinFay Jul 5, 2022
a386650
chore: changed indentatino
ColinFay Aug 8, 2022
4472ae0
chore: added some comments
ColinFay Aug 9, 2022
57869e4
fix: issue with param names
ColinFay Aug 9, 2022
78ae7a7
refactor: explicitly set arguments
ColinFay Aug 9, 2022
bdc2b4f
fix: removed unused argument
ColinFay Aug 9, 2022
e21105a
doc(vignette): renames the title according to convention
ColinFay Aug 9, 2022
0d7f6ae
fix: correct handling of paths in yaml-set
ColinFay Aug 9, 2022
c176cb3
Merge branch 'issue-709-reborn' of https://github.com/ThinkR-open/gol…
ColinFay Aug 9, 2022
0171378
doc: documentation update for new params in funs
ColinFay Aug 9, 2022
61ad01c
doc: moved {here} to Suggests
ColinFay Aug 9, 2022
c2907e3
doc: funs documented & param names
ColinFay Aug 9, 2022
d4fc8f8
fix: issue with pkg_path when not in project
ColinFay Aug 11, 2022
8cbad80
feat: create add_partial_html_template() (#894)
nathansquan Aug 11, 2022
b14678f
chore: run devtools::document()
ColinFay Aug 11, 2022
3fe8477
doc: version bump & news update
ColinFay Aug 11, 2022
8dad728
fix: deprecation message in use_recommended_deps (#901)
ColinFay Aug 16, 2022
18f762f
doc: NEWS & Version bump
ColinFay Aug 16, 2022
45b3e20
709 win (#904)
VincentGuyader Aug 17, 2022
f7fdf74
fix: add normalizePath() inside set_golem_wd() check() (#908)
VincentGuyader Aug 18, 2022
18a2a9b
fix(config): unifying config manipulation
ColinFay Aug 18, 2022
3bace0d
chore: linter
ColinFay Aug 18, 2022
0f951d9
doc: version bump & NEWS update
ColinFay Aug 18, 2022
e73b02d
doc: Added min version for rlang
ColinFay Aug 18, 2022
26bfc13
Merge pull request #909 from ThinkR-open/issue-905
ColinFay Aug 18, 2022
50b54d8
doc: version bump & NEWS update
ColinFay Aug 18, 2022
d4a25b0
fix: add_ fns can no longer take length(name) > 1 (#910)
ColinFay Aug 19, 2022
cb391e8
doc: version bump & NEWS update
ColinFay Aug 19, 2022
e54e2f2
feat: install_dev_deps() (#912)
ColinFay Aug 19, 2022
d20e6a7
doc: undocumented object
ColinFay Aug 19, 2022
36bd423
fix: wrong function name (#913)
asiripanich Aug 23, 2022
a7ed156
doc: version bump & news update
ColinFay Aug 23, 2022
131f03d
feat: remove fs as hard dep (#916)
ColinFay Sep 2, 2022
e7ae1a3
doc: version bump & NEWS update
ColinFay Sep 2, 2022
3d3d951
feat: removed usethis hard dep
pachadotdev Oct 6, 2022
d53e9f6
Revert "feat: removed usethis hard dep " (#924)
ColinFay Oct 6, 2022
da97c1a
test: skip suggests package if not installed (#927)
ColinFay Oct 12, 2022
6934693
Merge branch 'dev' into master
ColinFay Oct 12, 2022
e64fd04
chore: merging changes from CRAN upload (#928)
ColinFay Oct 12, 2022
07e31b7
chore: version bump
ColinFay Oct 12, 2022
5aae6b4
Merge branch 'dev' of https://github.com/ThinkR-open/golem into dev
ColinFay Oct 12, 2022
e6f3fad
feat: removed {usethis} hard dep (#929)
ColinFay Oct 12, 2022
9a809bb
fix: unit test requires dependencies in suggests (#919)
statnmap Oct 13, 2022
4f77e1b
refactor: check_installed in their own files (#931)
ColinFay Oct 14, 2022
0313b59
feat: Make cat functions conditional to an options (#934)
ColinFay Oct 14, 2022
9b072a5
doc: NEWS update & version bump
ColinFay Oct 14, 2022
6bf0f55
chore: update issue templates
ColinFay Oct 27, 2022
9d752bc
test: skip suggests package if not installed (#937)
ColinFay Oct 27, 2022
6e5d92a
chore: version bump & news update
ColinFay Oct 27, 2022
8eb0719
chore: version bump
ColinFay Oct 12, 2022
1238ce9
chore: merging changes from CRAN upload (#928)
ColinFay Oct 12, 2022
4f0eb33
feat: removed {usethis} hard dep (#929)
ColinFay Oct 12, 2022
9b68398
fix: unit test requires dependencies in suggests (#919)
statnmap Oct 13, 2022
fccedc8
refactor: check_installed in their own files (#931)
ColinFay Oct 14, 2022
beeda81
feat: Make cat functions conditional to an options (#934)
ColinFay Oct 14, 2022
6d4c532
chore: merge after rebase
ColinFay Oct 27, 2022
a1f80f5
doc: improve documentation of dockerfile related functions (#939)
ALanguillaume Oct 27, 2022
5c4d10e
chore: version bump & news update
ColinFay Oct 27, 2022
d630bc0
Merge branch 'dev' of https://github.com/ThinkR-open/golem into dev
ColinFay Oct 27, 2022
842d0c3
feat: fill_desc allows to set package version (#941)
ArthurData Oct 27, 2022
38df42c
chore: version bump & news update
ColinFay Oct 27, 2022
a75e828
style: styler changes
ColinFay Oct 27, 2022
f8461c2
feat: remove {desc} as hard dep (#940)
ArthurData Oct 28, 2022
43a40f4
feat: Create html template for maintenance mode
ArthurData Oct 28, 2022
568a624
feat: Create documentation for maintenance page
ArthurData Oct 31, 2022
3267323
refactor: changed the text on screen for maintenance page
ColinFay Nov 7, 2022
f32f753
refactor: renamed env var to GOLEM_MAINTENANCE_ACTIVE
ColinFay Nov 7, 2022
cc608c9
doc: some vignette rewritting and additions
ColinFay Nov 7, 2022
89b40cb
Fix 944 and correct CI
VincentGuyader Dec 7, 2022
acc054b
Fix 944 and correct CI (#947)
VincentGuyader Dec 7, 2022
5c75618
fix dev branch (#948)
VincentGuyader Dec 7, 2022
7a9debb
chore hotfix pkgdown
VincentGuyader Dec 8, 2022
63ac852
draft : 950 without cli (#951)
VincentGuyader Dec 9, 2022
5a5ec0b
update maintenance mode (#952)
VincentGuyader Dec 9, 2022
ebf8680
feat: remove rstudioapi hard dep (#955)
VincentGuyader Dec 10, 2022
135560b
fix #956 improve get_golem_options doc (#957)
VincentGuyader Dec 12, 2022
e8527de
fix 958 save all before run_dev.R (#959)
VincentGuyader Dec 12, 2022
54b38b0
doc: version bump & readme
ColinFay Dec 14, 2022
08577f4
style: linter
ColinFay Dec 23, 2022
cf76381
styler: linter bis
ColinFay Dec 23, 2022
2e394e4
feat: on create golem, message if dev deps are not installed
ColinFay Dec 23, 2022
c714bdf
Merge pull request #966 from ThinkR-open/issue-915
ColinFay Dec 23, 2022
525e97d
doc: entry in news
ColinFay Dec 23, 2022
2c869d3
Add a demo shinyapps.io snippet for the _03_deploy_ file
yogat3ch Dec 19, 2022
22f3467
fix: removed the dot file from deployment
ColinFay Dec 23, 2022
4a0b428
Merge pull request #967 from ThinkR-open/issue-923-yogat3ch-for-cherr…
ColinFay Dec 23, 2022
9ce9150
doc: news update
ColinFay Dec 23, 2022
85a8211
hotfix: check that all boostrap fns are there
ColinFay Dec 23, 2022
e761c3b
Merge pull request #968 from ThinkR-open/hotifx-bootstrap-funs
ColinFay Dec 23, 2022
942c998
fix: hotix typo
ColinFay Dec 23, 2022
bf03e50
typo: hotfix typo message check_dev_deps_are_installed
ColinFay Dec 23, 2022
5eb61fb
Update add_dockerfiles_renv.R (#976)
VincentGuyader Jan 20, 2023
3e11e48
fix: allow to build readme in 01_start
statnmap Jan 28, 2023
c60f62d
Merge pull request #979 from ThinkR-open/dev-build-readme
VincentGuyader Jan 29, 2023
e1142e4
draft : Temp (#977)
VincentGuyader Jan 29, 2023
f576d0f
fix : URLs are now OK # 980 (#981)
VincentGuyader Jan 29, 2023
da7cbe7
Fix #993
ilyaZar Feb 22, 2023
9f8630f
Merge pull request #994 from ilyaZar/dev
ColinFay Mar 6, 2023
9c09c01
test: new test and deploy script
ColinFay Mar 6, 2023
bbcc392
ci: forcing the repos
ColinFay Mar 6, 2023
a926b4c
ci: updated GA
ColinFay Mar 7, 2023
a9051e6
ci: use_dev_package in build.R
ColinFay Mar 7, 2023
585cc03
doc: only one return tag
ColinFay Mar 10, 2023
1b4018a
doc: doc cleaning before CRAN release
ColinFay Mar 10, 2023
08f050f
Fix 944 and correct CI
VincentGuyader Dec 7, 2022
383644f
Merge branch 'master' into dev
ColinFay Mar 10, 2023
1e79e54
fix: run the function instead of $ its body
ColinFay Mar 10, 2023
ce67fa5
Merge pull request #961 from ThinkR-open/dev
ColinFay Mar 10, 2023
2637ab1
deploy: CRAN submission
ColinFay Mar 10, 2023
0301565
feat: is_golem tries to guess if current folder is a golem based app
ColinFay Mar 14, 2023
1439d56
test: adding a test to is_golem
ColinFay Mar 15, 2023
6b764eb
chore: version bump & news update
ColinFay Mar 15, 2023
60ec1f4
fix: rule number 1, it's always a typo
ColinFay Mar 15, 2023
487dedf
deploy: forgot to add the new fun to pkgdown
ColinFay Mar 17, 2023
7917d2b
Fix 987
ilyaZar Mar 24, 2023
c9dbc80
Add function body upon call to add_fct
ilyaZar Mar 24, 2023
97b31e6
Change to lean function body
ilyaZar Mar 24, 2023
00d6327
hotfix: no param on function when calling add_fct
ColinFay Mar 29, 2023
22a896a
chore: version bump & news update
ColinFay Mar 29, 2023
c99bbb2
fix: stick to tidyverse style for new modules
ni2scmn Mar 31, 2023
6d44c61
Add -it flag when run docker so ^C still works
ivokwee Mar 12, 2023
08520c2
chore: version bump & news update
ColinFay Apr 4, 2023
aa87e62
feat: add script for what to do after merge
ColinFay Apr 4, 2023
c5fbc5c
Add use_readme_rmd()
ilyaZar Mar 29, 2023
11eeea2
Run grkstyle::grk_style_file("R/use_readme.R") on the file
ilyaZar Mar 29, 2023
d92d6f3
feat: implement use_readme_rmd
ColinFay Apr 4, 2023
446b149
fix: typo in doc
ColinFay Apr 4, 2023
7fba280
chore: version bump & news update
ColinFay Apr 4, 2023
b44502c
Merge branch 'dev' into master
ColinFay Apr 4, 2023
29d15c1
Merge branch 'ni2scmn-master' into dev
ColinFay Apr 4, 2023
7ec50d0
chore: version bump & news update
ColinFay Apr 4, 2023
49de774
docs: improve explanation comments in 01_start
ilyaZar Apr 2, 2023
c318e24
chore: version bump & news update
ColinFay Apr 4, 2023
4386a7c
refactor: add use_git_remote to() to dev/01_start.R
ilyaZar Apr 4, 2023
415f505
chore: script for bumping version and all
ColinFay Apr 4, 2023
879ebdf
style: indentation
ColinFay Apr 4, 2023
73a3a17
chore: version bump & news update
ColinFay Apr 4, 2023
3cb6494
fix: improve code coverage for R/golem_utils_ui.R
ilyaZar Apr 2, 2023
e609c52
fix: make code coverage of R/golem_utils_ui.R 100%
ilyaZar Apr 2, 2023
4c6885a
fix: make code coverage of R/golem_utils_server.R 100%
ilyaZar Apr 2, 2023
9cfa0c6
style: formatting
ColinFay Apr 4, 2023
90c09d9
chore: version bump & news update
ColinFay Apr 4, 2023
5ad4e21
Fix 997 in two ways
ilyaZar Mar 24, 2023
886e9f9
feat: adding an alert info
ColinFay May 16, 2023
bea0407
feat: correct use of the mod_remove in add_module
ColinFay May 16, 2023
72efe62
chore: version bump & news update
ColinFay May 16, 2023
72ee972
fix: set_golem_name updates name for ./tests content
ilyaZar Apr 5, 2023
8e23a43
fix: set_golem_name updates name for ./vignettes content
ilyaZar Apr 5, 2023
61e1556
feat: message and path
ColinFay May 16, 2023
0255f45
hofix: changing to sprintf
ColinFay May 16, 2023
ed7e0b9
test: unlinking the README files in test
ColinFay May 16, 2023
b72e98f
doc: missing doc in the entry
ColinFay May 16, 2023
e2428c9
chore: version bump & news update
ColinFay May 16, 2023
b97bbe7
fix: allow golem to use person vector
ilyaZar Apr 5, 2023
d93fdb8
merge interface changes into dev/01_start.R
ilyaZar Apr 5, 2023
a807104
docs: update vignette
ilyaZar Apr 5, 2023
0a529ca
refactor: update tests for fill_desc()
ilyaZar Apr 5, 2023
7fe0915
refactor: update inst/mantests/build.R
ilyaZar Apr 5, 2023
9e21f41
test: fix tests by adding authors + expect warning
ColinFay May 17, 2023
5b9767c
fix: only alert if named has changed
ColinFay May 17, 2023
090a6fc
fix: keep the old params for backward compatibility
ColinFay May 17, 2023
c7533e4
Revert "Add -it flag when run docker so ^C still works"
ColinFay Apr 4, 2023
aa9bfb2
ci: code coverage
ColinFay May 17, 2023
f730550
Fix 987
ilyaZar Mar 24, 2023
84d807e
refactor: merge commit from branch fix-change-config-yml-loc
ilyaZar May 24, 2023
41d3c77
fix: add user supplied path to config for guess_where_config()
ilyaZar May 24, 2023
30687a1
fix: logical scalar operation should use && instead of &
ilyaZar May 24, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@
^Meta$
^\.github$
^revdep$
README.html
^CRAN-SUBMISSION$
30 changes: 30 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
name: Bug report
about: Create a report to help us improve
title: "[BUG]"
labels: bug
assignees: ColinFay

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1.
1. ...
2. ...

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**session info**

please insert here the output of `devtools::session_info()`

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[FR]"
labels: enhancement
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/todo.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: todo
about: Internal issue template for golem developers
title: ''
labels: ''
assignees: ''

---

## User - Validation

+ [ ] First thing to do to validate this as an external user
+ [ ] Second thing to do to validate this as an external user

## Dev - Tech

_A paragraph that details what this functionality does and how it will be implemented._

+ [ ] A sentence that sums up a feature
+ [ ] Implementation number 1
+ [ ] Implementation number 2
+ [ ] Technical validation
+ [ ] A sentence that sums up a feature
+ [ ] Implementation number 1
+ [ ] Implementation number 2
+ [ ] Technical validation

## Estimated time

01h00.

+ [ ] Add the estimate as a comment with `/estimate`
+ [ ] When I close this issue, `devtools::check()` is 0 0 0
+ [ ] When I close the issue, I've written the time spent solving this issue, using `/spent`
49 changes: 49 additions & 0 deletions .github/workflows/R-CMD-check.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

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

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

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

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
112 changes: 0 additions & 112 deletions .github/workflows/check-standard.yaml

This file was deleted.

50 changes: 50 additions & 0 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# 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: test-coverage

jobs:
test-coverage:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

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

- name: Test coverage
run: |
covr::codecov(
quiet = FALSE,
clean = FALSE,
install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
)
shell: Rscript {0}

- name: Show testthat output
if: always()
run: |
## --------------------------------------------------------------------
find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Upload test results
if: failure()
uses: actions/upload-artifact@v3
with:
name: coverage-test-failures
path: ${{ runner.temp }}/package
3 changes: 3 additions & 0 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Version: 0.4.0
Date: 2023-03-10 13:02:19 UTC
SHA: ce67fa5e76d40f1ca68b6dda10064bae37fbcb6e
Loading