Skip to content

Commit ee176d3

Browse files
Merge pull request #302 from lorenzwalthert/devel
- Fix conda installation (#302).
2 parents 3ff2262 + dec26ac commit ee176d3

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
66
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
77
on:
8-
push:
9-
branches:
10-
- '*'
118
pull_request:
129
branches:
1310
- master

R/install.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ install_precommit <- function(force = FALSE) {
5555
#' @keywords internal
5656
install_impl <- function() {
5757
if (!"r-precommit" %in% reticulate::conda_list()$name) {
58-
reticulate::conda_create("r-precommit")
58+
reticulate::conda_create("r-precommit", python_version = "3.9")
5959
}
6060
reticulate::conda_install("r-precommit", packages = "pre-commit")
6161
}

tests/testthat/test-conda.R

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ if (!on_cran()) {
55
expect_error(install_precommit(force = TRUE), NA)
66
})
77

8+
test_that("conda 3.10 should now work", {
9+
expect_true(Sys.Date() < as.Date("2021-11-30"))
10+
})
11+
812
test_that("can use pre-commit", {
913
tempdir <- local_test_setup(quiet = FALSE, install_hooks = FALSE)
1014
expect_message(

0 commit comments

Comments
 (0)