Skip to content

Commit

Permalink
Merge pull request #159 from jhudsl/cansavvy/github-refactor
Browse files Browse the repository at this point in the history
GitHub Authentication refactor
  • Loading branch information
cansavvy authored Dec 19, 2024
2 parents 49ef996 + 3552872 commit 38d9859
Show file tree
Hide file tree
Showing 30 changed files with 668 additions and 306 deletions.
15 changes: 4 additions & 11 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,10 @@ jobs:
rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), check_dir = "check")
shell: Rscript {0}

- name: Check testthat
id: check_check
run: |
Rscript -e "install.packages('tidyr', repos = 'http://cran.us.r-project.org')"
Rscript -e "devtools::test()"
error_num=$(Rscript --vanilla '.github/workflows/check_testthat.R')
echo "error_num=$error_num" >> $GITHUB_OUTPUT
- name: Stop if there are errors!
if: ${{ steps.check_check.outputs.error_num != '0' }}
run: exit 1
- name: Check package
uses: r-lib/actions/check-r-package@v2
with:
args: 'c("--no-manual")'

- name: Upload check results
if: failure()
Expand Down
31 changes: 0 additions & 31 deletions .github/workflows/check_testthat.R

This file was deleted.

14 changes: 9 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ Description: Tools for converting Open-Source Tools for Training Resources
License: GPL-3
URL: https://github.com/jhudsl/ottrpal
BugReports: https://github.com/jhudsl/ottrpal/issues
Depends:
Depends:
R (>= 3.5.0)
Imports:
Imports:
bookdown,
curl,
dplyr,
Expand All @@ -40,12 +40,16 @@ Imports:
stringr,
webshot2,
xml2,
yaml
yaml,
getPass,
googledrive,
googlesheets4,
withr,
Suggests:
testthat (>= 3.0.0),
tibble,
utils
VignetteBuilder:
utils,
VignetteBuilder:
knitr
ByteCompile: true
Encoding: UTF-8
Expand Down
7 changes: 5 additions & 2 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ export(convert_coursera_quizzes)
export(convert_quiz)
export(course_path)
export(course_to_book_txt)
export(delete_creds)
export(extract_meta)
export(extract_object_id)
export(extract_quiz)
export(get_chapters)
export(get_git_auth)
export(get_github)
export(get_gs_pptx)
export(get_image_from_slide)
export(get_image_link_from_slide)
Expand All @@ -42,6 +43,7 @@ export(parse_quiz_df)
export(pptx_notes)
export(pptx_slide_note_df)
export(pptx_slide_text_df)
export(qrmd_files)
export(render_without_toc)
export(setup_ottr_template)
export(unzip_pptx)
Expand All @@ -59,10 +61,11 @@ importFrom(httr,oauth_app)
importFrom(httr,oauth_endpoints)
importFrom(jsonlite,fromJSON)
importFrom(magrittr,"%>%")
importFrom(openssl,aes_cbc_decrypt)
importFrom(readr,write_tsv)
importFrom(rprojroot,find_root)
importFrom(rprojroot,has_dir)
importFrom(stringr,str_to_title)
importFrom(utils,browseURL)
importFrom(utils,download.file)
importFrom(utils,installed.packages)
importFrom(utils,menu)
Expand Down
Loading

0 comments on commit 38d9859

Please sign in to comment.