Merge pull request #6 from kardasbart/feat/new-base

Tests fix

Dockerfile

@@ -1,8 +1,8 @@
 # syntax = docker/dockerfile:1.3
-ARG ALPINE_VERSION=3.16
+ARG ALPINE_VERSION=3.17
 FROM alpine:${ALPINE_VERSION} AS builder
 
-RUN apk add --no-cache git python3 python3-dev py3-pip build-base
+RUN apk add --no-cache git python3 python3-dev py3-pip py3-setuptools build-base
 
 # set pip's cache directory using this environment variable, and use
 # ARG instead of ENV to ensure its only set when the image is built
@@ -21,7 +21,7 @@ RUN --mount=type=cache,target=${PIP_CACHE_DIR} \
 FROM alpine:${ALPINE_VERSION}
 
 # install python, git, bash, mercurial
-RUN apk add --no-cache git git-lfs python3 py3-pip bash docker mercurial
+RUN apk add --no-cache git git-lfs python3 py3-pip py3-setuptools bash docker mercurial
 
 # repeat ARG from above
 ARG PIP_CACHE_DIR=/tmp/pip-cache

repo2docker/buildpacks/r.py

@@ -343,10 +343,10 @@ class RBuildPack(PythonBuildPack):
             (
                 "${NB_USER}",
                 # Install a pinned version of devtools, IRKernel and shiny
-                r"""
-                EXPANDED_CRAN_MIRROR_URL="$(. /etc/os-release && echo {self.devtools_cran_mirror_url()} | envsubst)" && \
-                R --quiet -e "install.packages(c('devtools', 'IRkernel', 'shiny'), repos='${{EXPANDED_CRAN_MIRROR_URL}}')" && \
-                R --quiet -e "IRkernel::installspec(prefix='$NB_PYTHON_PREFIX')"
+                rf"""
+                export EXPANDED_CRAN_MIRROR_URL="$(. /etc/os-release && echo {cran_mirror_url} | envsubst)" && \
+                R --quiet -e "install.packages(c('devtools', 'IRkernel', 'shiny'), repos=Sys.getenv(\"EXPANDED_CRAN_MIRROR_URL\"))" && \
+                R --quiet -e "IRkernel::installspec(prefix=Sys.getenv(\"NB_PYTHON_PREFIX\"))"
                 """,
             ),
         ]

repo2docker/contentproviders/git.py

@@ -45,10 +45,10 @@ class Git(ContentProvider):
                 self.log.error(
                     f"Failed to check out ref {ref}", extra=dict(phase=R2dState.FAILED)
                 )
-                if ref == "master":
+                if ref == "master" or ref == "main":
                     msg = (
-                        "Failed to check out the 'master' branch. "
-                        "Maybe the default branch is not named 'master' "
+                        f"Failed to check out the '{ref}' branch. "
+                        f"Maybe the default branch is not named '{ref}' "
                         "for this repository.\n\nTry not explicitly "
                         "specifying `--ref`."
                     )

tests/external/reproductions.repos.yaml

@@ -12,12 +12,12 @@
 # Test that a full remote/ref works
 - name: Binder Examples - Requirements
   url: https://github.com/binder-examples/requirements
-  ref: origin/master
+  ref: origin/main
   verify: python -c 'import matplotlib'
 # Test that ref is added to branch if not present
 - name: Binder Examples - Requirements
   url: https://github.com/binder-examples/requirements
-  ref: master
+  ref: main
   verify: python -c 'import matplotlib'
 # Test that tags work + ref is added to tag if not present
 - name: Binder Examples - Requirements