Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: andrie/miniCRAN
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.2.9
Choose a base ref
...
head repository: andrie/miniCRAN
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Aug 11, 2017

  1. Fixing typos

    ryanatanner authored Aug 11, 2017
    Copy the full SHA
    caed948 View commit details
  2. Copy the full SHA
    1c2d099 View commit details
  3. Copy the full SHA
    f01becf View commit details
  4. Copy the full SHA
    58fed54 View commit details
  5. update NEWS

    achubaty committed Aug 11, 2017
    Copy the full SHA
    aeda340 View commit details
  6. add MRAN url as package option (close #72)

    Note: use http instead of https for R < 3.2.2
    achubaty committed Aug 11, 2017
    Copy the full SHA
    d521aa6 View commit details
  7. update NEWS (#72)

    achubaty committed Aug 11, 2017
    Copy the full SHA
    e269435 View commit details

Commits on Oct 7, 2017

  1. Copy the full SHA
    5116b1c View commit details

Commits on Oct 20, 2017

  1. Merge pull request #101 from mungojam/patch-1

    Add missing space in error message for unknown type
    andrie authored Oct 20, 2017
    Copy the full SHA
    d699466 View commit details
  2. Copy the full SHA
    917c0b5 View commit details
  3. Merge branch '99-addPackage-fail' into dev

    * 99-addPackage-fail:
      Fix type errors in checkVersions() that caused addPackages() to fail. #99
    andrie committed Oct 20, 2017
    2
    Copy the full SHA
    71d11a0 View commit details
  4. Copy the full SHA
    696fbdc View commit details
  5. Rebuild vignettes

    andrie committed Oct 20, 2017
    Copy the full SHA
    efcd7a8 View commit details
  6. Update NEWS and README

    andrie committed Oct 20, 2017
    Copy the full SHA
    56d3e5e View commit details
  7. Copy the full SHA
    90e6f95 View commit details

Commits on Oct 21, 2017

  1. Merge branch 'dev'

    * dev:
      Bump version to 0.2.10; Change maintainer to apdevries@gmail.com
      Update NEWS and README
      Rebuild vignettes
      Added note on system requirements (#98)
      Fix type errors in checkVersions() that caused addPackages() to fail. #99
      Add missing space in error message for unknown type
      update NEWS (#72)
      add MRAN url as package option (close #72)
      update NEWS
      Fixing typo in non-CRAN vignette
      Fixing typos
    andrie committed Oct 21, 2017
    Copy the full SHA
    0c7ca84 View commit details
  2. Rebuild vignettes

    andrie committed Oct 21, 2017
    Copy the full SHA
    3c8c8ae View commit details
  3. Copy the full SHA
    f1f7d4d View commit details

Commits on Nov 15, 2017

  1. Copy the full SHA
    8ab83b4 View commit details
  2. bump dev version

    achubaty committed Nov 15, 2017
    Copy the full SHA
    83021b8 View commit details
  3. minor cleanup

    achubaty committed Nov 15, 2017
    Copy the full SHA
    503c5e4 View commit details
  4. use new url for MRAN (fix #104)

    use cran.microsoft.com instead of mran.microsoft.com for MRAN url
    achubaty committed Nov 15, 2017
    Copy the full SHA
    7a73422 View commit details

Commits on Nov 17, 2017

  1. travis osx: use newer version of xcode

    see https://docs.travis-ci.com/user/reference/osx/#OS-X-Version
    I'm trying with version 9 instead of 8 (latest is 9.1)
    achubaty committed Nov 17, 2017
    Copy the full SHA
    6bc9338 View commit details
  2. Copy the full SHA
    4071d25 View commit details
  3. Copy the full SHA
    cd3bdaf View commit details
  4. Copy the full SHA
    e9fdfe0 View commit details
  5. Revert "run travis checks on split-test branch"

    This reverts commit e9fdfe0.
    achubaty committed Nov 17, 2017
    Copy the full SHA
    b0b3751 View commit details
  6. Copy the full SHA
    f82378d View commit details
  7. only run coverage checks on travis linux r-release

    coverage checks take too long on macOS, causing timeout error
    achubaty committed Nov 17, 2017
    Copy the full SHA
    b937ba0 View commit details

Commits on Dec 19, 2017

  1. Code formatting

    andrie committed Dec 19, 2017
    Copy the full SHA
    3118ba7 View commit details
  2. Build docs using pkgdown #105

    andrie committed Dec 19, 2017
    Copy the full SHA
    3edb8c2 View commit details
  3. Merge pull request #106 from andrie/dev

    Merge dev to master
    andrie authored Dec 19, 2017
    Copy the full SHA
    7b62d23 View commit details

Commits on Dec 25, 2017

  1. Merge branch 'master' into dev

    * master:
    andrie committed Dec 25, 2017
    Copy the full SHA
    9105414 View commit details
  2. Remove magrittr dependency

    andrie committed Dec 25, 2017
    Copy the full SHA
    2bbfa5b View commit details

Commits on Dec 26, 2017

  1. Copy the full SHA
    3ef3a50 View commit details
  2. Rebuild vignettes

    andrie committed Dec 26, 2017
    Copy the full SHA
    0568751 View commit details
  3. stub one level less deep

    andrie committed Dec 26, 2017
    Copy the full SHA
    864246b View commit details

Commits on Dec 27, 2017

  1. Depends on mockery >= 0.4.0 #107

    andrie committed Dec 27, 2017
    Copy the full SHA
    ff60733 View commit details
  2. mockery(>= 0.4.0)

    andrie committed Dec 27, 2017
    Copy the full SHA
    9253f79 View commit details
  3. More mocking experiments

    andrie committed Dec 27, 2017
    Copy the full SHA
    d5e141f View commit details
  4. Copy the full SHA
    a3a0348 View commit details

Commits on Jan 2, 2018

  1. misc cleanup

    achubaty committed Jan 2, 2018
    Copy the full SHA
    37c345d View commit details
  2. minor cleanup

    achubaty committed Jan 2, 2018
    Copy the full SHA
    be2e5c8 View commit details

Commits on Jan 15, 2018

  1. Copy the full SHA
    03415b1 View commit details
  2. Update docs

    andrie committed Jan 15, 2018
    Copy the full SHA
    2288a76 View commit details
  3. Add mockery to Suggests

    andrie committed Jan 15, 2018
    Copy the full SHA
    688b9e0 View commit details
  4. Bump version to 0.2.11

    andrie committed Jan 15, 2018
    Copy the full SHA
    5075147 View commit details
  5. Merge branch 'dev'

    * dev:
      Bump version to 0.2.11
      Add mockery to Suggests
      Update docs
      Add tests to improve code coverage
      minor cleanup
      misc cleanup
      Mock without using mockery or testthat::with_mock
      More mocking experiments
      mockery(>= 0.4.0)
      Depends on mockery >= 0.4.0 #107
      stub one level less deep
      Rebuild vignettes
      Use mocking to speed up tests #107
      Remove magrittr dependency
    andrie committed Jan 15, 2018
    Copy the full SHA
    77eace6 View commit details
  6. Getting ready for release

    andrie committed Jan 15, 2018
    Copy the full SHA
    d6a3056 View commit details
  7. Fix spelling mistake

    andrie committed Jan 15, 2018
    Copy the full SHA
    c90455f View commit details
Showing with 5,019 additions and 3,425 deletions.
  1. +16 −0 .Rbuildignore
  2. +1 −0 .github/.gitignore
  3. +63 −0 .github/workflows/R-CMD-check.yaml
  4. +48 −0 .github/workflows/pkgdown.yaml
  5. +79 −0 .github/workflows/pr-commands.yaml
  6. +50 −0 .github/workflows/test-coverage.yaml
  7. +13 −10 .gitignore
  8. +0 −45 .travis.yml
  9. +2 −0 CRAN-RELEASE
  10. +3 −0 CRAN-SUBMISSION
  11. +23 −15 DESCRIPTION
  12. +1 −1 LICENSE.md
  13. +4 −4 NAMESPACE
  14. +110 −0 NEWS
  15. +0 −9 R/MRAN.R
  16. +42 −0 R/P3M.R
  17. +138 −80 R/addPackages.R
  18. +43 −0 R/assertions.R
  19. +13 −45 R/getCranDescription.R
  20. +28 −19 R/github-functions.R
  21. +0 −92 R/helpers.R
  22. +73 −0 R/internal.R
  23. +4 −6 R/makeDepGraph.R
  24. +56 −59 R/makeRepo.R
  25. +81 −54 R/minicran-package.R
  26. +81 −37 R/pkgDep.R
  27. +14 −15 R/pkgDepTools.R
  28. +44 −39 R/plot.pkgDepGraph.R
  29. +133 −63 R/updatePackages.R
  30. +20 −0 R/utils.R
  31. +18 −2 R/zzz.R
  32. +77 −0 README.Rmd
  33. +44 −23 README.md
  34. +50 −0 _pkgdown.yml
  35. +14 −0 codecov.yml
  36. +9 −0 cran-comments.md
  37. +25 −0 inst/WORDLIST
  38. +0 −20 inst/doc/miniCRAN-dependency-graph.R
  39. +0 −227 inst/doc/miniCRAN-dependency-graph.html
  40. +0 −80 inst/doc/miniCRAN-dependency-graph.rmd
  41. +0 −77 inst/doc/miniCRAN-introduction.R
  42. +0 −255 inst/doc/miniCRAN-introduction.html
  43. +0 −160 inst/doc/miniCRAN-introduction.rmd
  44. +0 −39 inst/doc/miniCRAN-non-CRAN-repos.R
  45. +0 −212 inst/doc/miniCRAN-non-CRAN-repos.html
  46. +0 −83 inst/doc/miniCRAN-non-CRAN-repos.rmd
  47. +8 −8 inst/examples/example_addPackageListingGithub.R
  48. +58 −39 inst/examples/example_checkVersions.R
  49. +4 −4 inst/examples/example_getCranDescription.R
  50. +25 −26 inst/examples/example_makeDepGraph.R
  51. +30 −31 inst/examples/example_makeRepo.R
  52. +10 −12 inst/examples/example_pkgDep.R
  53. +25 −21 inst/examples/example_plot.pkgDepGraph.R
  54. +0 −4 inst/examples/example_rsynctools.R
  55. +19 −21 inst/examples/example_updatePackages.R
  56. +6 −0 man-roxygen/Rversion.R
  57. +32 −0 man-roxygen/repo_folder_structure.R
  58. +41 −14 man/addLocalPackage.Rd
  59. +105 −56 man/addOldPackage.Rd
  60. +97 −54 man/addPackage.Rd
  61. +24 −15 man/addPackageListingGithub.Rd
  62. +8 −3 man/basePkgs.Rd
  63. +84 −50 man/checkVersions.Rd
  64. +3 −1 man/cranJuly2014.Rd
  65. +414 −0 man/figures/logo.svg
  66. BIN man/figures/miniCRAN-logo.png
  67. +18 −10 man/getCranDescription.Rd
  68. +16 −0 man/is.online.Rd
  69. +5 −2 man/listFiles.Rd
  70. +48 −33 man/makeDepGraph.Rd
  71. +5 −2 man/makeLibrary.Rd
  72. +104 −72 man/makeRepo.Rd
  73. +60 −16 man/miniCRAN-package.Rd
  74. +25 −6 man/pkgAvail.Rd
  75. +50 −24 man/pkgDep.Rd
  76. +50 −31 man/plot.pkgDepGraph.Rd
  77. +0 −18 man/repoBinPath.Rd
  78. +42 −38 man/repoPrefix.Rd
  79. +10 −3 man/twodigitRversion.Rd
  80. +92 −51 man/updatePackages.Rd
  81. BIN pkgdown/favicon/apple-touch-icon-120x120.png
  82. BIN pkgdown/favicon/apple-touch-icon-152x152.png
  83. BIN pkgdown/favicon/apple-touch-icon-180x180.png
  84. BIN pkgdown/favicon/apple-touch-icon-60x60.png
  85. BIN pkgdown/favicon/apple-touch-icon-76x76.png
  86. BIN pkgdown/favicon/apple-touch-icon.png
  87. BIN pkgdown/favicon/favicon-16x16.png
  88. BIN pkgdown/favicon/favicon-32x32.png
  89. BIN pkgdown/favicon/favicon.ico
  90. +3 −0 tests/spelling.R
  91. +2 −2 tests/test-all.R
  92. +166 −49 tests/testthat/helpers.R
  93. +51 −0 tests/testthat/test-1-github-functions.R
  94. +10 −13 tests/testthat/test-1-pkgAvail.R
  95. +5 −8 tests/testthat/test-1-pkgDep.R
  96. +44 −0 tests/testthat/test-1-r-version.R
  97. +56 −59 tests/testthat/test-2-makeDepGraph.R
  98. +62 −46 tests/testthat/test-3-makeRepo.R
  99. +29 −25 tests/testthat/test-4-makeRepo-from-localCRAN.R
  100. +64 −0 tests/testthat/test-5-ask-for-confirmation.R
  101. +249 −187 tests/testthat/test-5-updateRepo.R
  102. +18 −7 tests/testthat/test-6-getCranDescription.R
  103. +7 −9 tests/testthat/test-7-addGithubPackage.R
  104. +59 −0 tests/testthat/test-8-addLocalPackage.R
  105. +8 −0 tests/testthat/test-9-is-online.R
  106. +44 −0 tests/testthat/test-r-version.R
  107. BIN tests/testthat/testdata/pdb.rds
  108. +4 −4 vignettes/miniCRAN-dependency-graph.R
  109. +371 −147 vignettes/miniCRAN-dependency-graph.html
  110. +4 −7 vignettes/miniCRAN-dependency-graph.rmd
  111. +36 −33 vignettes/miniCRAN-introduction.R
  112. +393 −166 vignettes/miniCRAN-introduction.html
  113. +31 −29 vignettes/miniCRAN-introduction.rmd
  114. +12 −28 vignettes/miniCRAN-non-CRAN-repos.R
  115. +330 −133 vignettes/miniCRAN-non-CRAN-repos.html
  116. +23 −37 vignettes/miniCRAN-non-CRAN-repos.rmd
16 changes: 16 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -3,3 +3,19 @@ LICENSE.md
.travis.yml
^.*\.Rproj$
^\.Rproj\.user$
^docs$
^_pkgdown\.yml$
cran-comments.md
^README\.Rmd$
^pkgdown$
^codecov\.yml$
^tests/testthat/disabled/
^man-roxygen/
^logo.svg$
^CRAN-RELEASE$
^revdep$
^\.github$
^cran-comments\.md$
^CRAN-SUBMISSION$
^doc$
^Meta$
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
63 changes: 63 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# 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
# check-standard.yaml is likely a better choice.
# usethis::use_github_action("check-standard") will install it.
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'}
# Use 3.6 to trigger usage of RTools35
# - {os: windows-latest, r: '3.6'}
# use 4.1 to check with rtools40's older compiler
- {os: windows-latest, r: '4.1'}

- {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'}
- {os: ubuntu-latest, r: 'oldrel-3'}
# - {os: ubuntu-latest, r: 'oldrel-4'}

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

steps:
- uses: actions/checkout@v4

- 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
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
48 changes: 48 additions & 0 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# 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]
release:
types: [published]
workflow_dispatch:

name: pkgdown

jobs:
pkgdown:
runs-on: ubuntu-latest
# Only restrict concurrency for non-PR jobs
concurrency:
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
steps:
- uses: actions/checkout@v4

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

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

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
needs: website

- 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/github-pages-deploy-action@v4.5.0
with:
clean: false
branch: gh-pages
folder: docs
79 changes: 79 additions & 0 deletions .github/workflows/pr-commands.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# 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:
issue_comment:
types: [created]

name: Commands

jobs:
document:
if: ${{ github.event.issue.pull_request && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER') && startsWith(github.event.comment.body, '/document') }}
name: document
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/pr-fetch@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

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

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::roxygen2
needs: pr-document

- name: Document
run: roxygen2::roxygenise()
shell: Rscript {0}

- name: commit
run: |
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
git add man/\* NAMESPACE
git commit -m 'Document'
- uses: r-lib/actions/pr-push@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

style:
if: ${{ github.event.issue.pull_request && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER') && startsWith(github.event.comment.body, '/style') }}
name: style
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/pr-fetch@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

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

- name: Install dependencies
run: install.packages("styler")
shell: Rscript {0}

- name: Style
run: styler::style_pkg()
shell: Rscript {0}

- name: commit
run: |
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
git add \*.R
git commit -m 'Style'
- uses: r-lib/actions/pr-push@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
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@v4

- 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(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "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@v4
with:
name: coverage-test-failures
path: ${{ runner.temp }}/package
23 changes: 13 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
#############
## R & RStudio files
#############
.Rhistory
*.Rproj
.Rproj.user/
.Rproj.user

#############
## Pkgdown docs
docs/
## Windows detritus
#############

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Mac crap
## Mac crap
.DS_Store
docs
revdep
README_files/
.Renviron

/doc/
/Meta/

/.quarto/
README.html
45 changes: 0 additions & 45 deletions .travis.yml

This file was deleted.

2 changes: 2 additions & 0 deletions CRAN-RELEASE
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This package was submitted to CRAN on 2020-09-15.
Once it is accepted, delete this file and tag the release (commit cd920dc).
3 changes: 3 additions & 0 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Version: 0.3.0
Date: 2024-03-28 20:42:30 UTC
SHA: 78dac2696b00444fe6af2e7c8ad60116196ed93f
Loading