Skip to content

Commit 21917fb

Browse files
Merge pull request #564 from lorenzwalthert/dev-fix-ci
fix with new pkgdown CRAN release
2 parents 4f3b359 + d6ecd65 commit 21917fb

File tree

5 files changed

+304
-131
lines changed

5 files changed

+304
-131
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ jobs:
5757
- name: Install system dependencies (pip)
5858
if: matrix.config.installation_method == 'pip'
5959
run: |
60-
pip3 install setuptools --user
6160
pip3 install pre-commit --user
6261
- uses: r-lib/actions/setup-r-dependencies@v2
6362
- name: Remove reticulate for other installation methods

R/utils.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ path_if_exist <- function(...) {
2424

2525
is_conda_installation <- function() {
2626
grepl(
27-
"conda3?/envs/r-precommit/(bin|Scripts)/pre-commit(\\.exe)?",
27+
"(r-miniconda-.*|conda3?)/envs/r-precommit/(bin|Scripts)/pre-commit(\\.exe)?",
2828
getOption("precommit.executable")
2929
)
3030
}

renv.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,11 @@
437437
],
438438
"Hash": "3ee025083e66f18db6cf27b56e23e141"
439439
},
440+
"renv": {
441+
"Package": "renv",
442+
"Version": "1.0.5",
443+
"Source": "Repository"
444+
},
440445
"rex": {
441446
"Package": "rex",
442447
"Version": "1.2.1",

0 commit comments

Comments
 (0)