Merge branch 'main' into Outreachyp

Author: minrk

.github/workflows/publish.yml

@@ -33,7 +33,7 @@ jobs:
   #
   Publish:
     runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/') || (github.ref == 'refs/heads/main') || (github.ref == 'refs/heads/master')
+    if: startsWith(github.ref, 'refs/tags/') || (github.ref == 'refs/heads/main')
     steps:
       - uses: actions/checkout@v3
         with:
@@ -47,13 +47,13 @@ jobs:
         uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx (for chartpress multi-arch builds)
-        uses: docker/setup-buildx-action@dc7b9719a96d48369863986a06765841d7ea23f6 # dependabot updates to latest release
+        uses: docker/setup-buildx-action@v2
 
       - name: Install chart publishing dependencies (chartpress, helm)
         run: |
           . ./ci/common
           setup_helm v3.5.4
-          pip install --no-cache-dir chartpress>=1.2 pyyaml
+          pip install --no-cache-dir chartpress>=2.1 pyyaml
 
       - name: Setup push rights to jupyterhub/helm-chart
         # This was setup by...

.github/workflows/test-docker-build.yaml

@@ -47,7 +47,7 @@ jobs:
         uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx (for chartpress multi-arch builds)
-        uses: docker/setup-buildx-action@dc7b9719a96d48369863986a06765841d7ea23f6 # dependabot updates to latest release
+        uses: docker/setup-buildx-action@v2
 
       - name: Build a multiple architecture Docker image
         run: |

.github/workflows/watch-dependencies.yaml

@@ -75,7 +75,7 @@ jobs:
       # ref: https://github.com/peter-evans/create-pull-request
       - name: Create a PR
         if: steps.local.outputs.tag != steps.latest.outputs.tag
-        uses: peter-evans/create-pull-request@v4.1.3
+        uses: peter-evans/create-pull-request@v4
         with:
           token: "${{ secrets.jupyterhub_bot_pat }}"
           author: JupterHub Bot Account <[email protected]>

.pre-commit-config.yaml

@@ -11,15 +11,15 @@
 repos:
   # Autoformat: Python code, syntax patterns are modernized
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.38.2
+    rev: v3.1.0
     hooks:
       - id: pyupgrade
         args:
           - --py37-plus
 
   # Autoformat: Python code
   - repo: https://github.com/psf/black
-    rev: 22.8.0
+    rev: 22.10.0
     hooks:
       - id: black
         # args are not passed, but see the config in pyproject.toml
@@ -49,7 +49,7 @@ repos:
 
   # Autoformat: js, html, markdown, yaml, json
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.0
+    rev: v3.0.0-alpha.3
     hooks:
       - id: prettier
         exclude_types:

CONTRIBUTING.md

@@ -283,7 +283,7 @@ You are assumed to have a modern version of [Python](https://www.python.org/),
 1. Install `helm` - the Kubernetes package manager.
 
    ```bash
-   curl -sf https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
+   curl -sf https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
    ```
 
    Here are the [official installation instructions](https://helm.sh/docs/intro/install/).
@@ -368,7 +368,7 @@ it with another version from the [JupyterHub Helm chart
 repository](https://jupyterhub.github.io/helm-chart/).
 
 Use the [JupyterHub Helm chart's
-changelog](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/master/CHANGELOG.md)
+changelog](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/HEAD/CHANGELOG.md)
 to prepare for breaking changes associated with the version bump.
 
 ### Releasing

README.md

@@ -6,7 +6,7 @@
 [![GitHub](https://img.shields.io/badge/issue_tracking-github-blue.svg)](https://github.com/jupyterhub/binderhub/issues)
 [![Discourse](https://img.shields.io/badge/help_forum-discourse-blue.svg)](https://discourse.jupyter.org/c/binder/binderhub)
 [![Gitter](https://img.shields.io/badge/social_chat-gitter-blue.svg)](https://gitter.im/jupyterhub/binder)
-[![Contribute](https://img.shields.io/badge/I_want_to_contribute!-grey?logo=jupyter)](https://github.com/jupyterhub/binderhub/blob/master/CONTRIBUTING.md)
+[![Contribute](https://img.shields.io/badge/I_want_to_contribute!-grey?logo=jupyter)](https://github.com/jupyterhub/binderhub/blob/HEAD/CONTRIBUTING.md)
 
 ## What is BinderHub?
 
@@ -44,7 +44,7 @@ To contribute to the BinderHub project you can work on:
 
 To see how to build the documentation, edit the user interface or modify
 the code see [the contribution
-guide](https://github.com/jupyterhub/binderhub/blob/master/CONTRIBUTING.md).
+guide](https://github.com/jupyterhub/binderhub/blob/HEAD/CONTRIBUTING.md).
 
 ## Installation
 

binderhub/app.py

@@ -344,8 +344,8 @@ def _pod_quota_deprecated(self, change):
     )
 
     launch_quota_class = Type(
-        LaunchQuota,
-        default=KubernetesLaunchQuota,
+        klass=LaunchQuota,
+        default_value=KubernetesLaunchQuota,
         help="""
         The class used to check quotas for launched servers.
 

binderhub/repoproviders.py

@@ -38,8 +38,8 @@ def tokenize_spec(spec):
     spec_parts = spec.split("/", 2)  # allow ref to contain "/"
     if len(spec_parts) != 3:
         msg = f'Spec is not of the form "user/repo/ref", provided: "{spec}".'
-        if len(spec_parts) == 2 and spec_parts[-1] != "master":
-            msg += f' Did you mean "{spec}/master"?'
+        if len(spec_parts) == 2 and spec_parts[-1] not in ("main", "master"):
+            msg += f' Did you mean "{spec}/main"?'
         raise ValueError(msg)
 
     return spec_parts
@@ -456,8 +456,8 @@ class GitRepoProvider(RepoProvider):
     <url-escaped-namespace>/<resolved_ref>
 
     eg:
-    https%3A%2F%2Fgithub.com%2Fjupyterhub%2Fzero-to-jupyterhub-k8s/master
-    https%3A%2F%2Fgithub.com%2Fjupyterhub%2Fzero-to-jupyterhub-k8s/f7f3ff6d1bf708bdc12e5f10e18b2a90a4795603
+    https%3A%2F%2Fgithub.com%2Fbinder-examples%2Fconda/main
+    https%3A%2F%2Fgithub.com%2Fbinder-examples%2Fconda/034931911e853252322f2309f1246a4f1076fd7d
 
     This provider is typically used if you are deploying binderhub yourself and you require access to repositories that
     are not in one of the supported providers.
@@ -957,6 +957,7 @@ class GistRepoProvider(GitHubRepoProvider):
     The ref is optional, valid values are
         - a full sha1 of a ref in the history
         - master
+        - HEAD for the default branch
 
     If master or no ref is specified the latest revision will be used.
     """

binderhub/static/index.css

@@ -77,7 +77,7 @@ p > a:hover {
 }
 
 .btn-submit{
-    background-color:rgb(243, 162, 83);
+    background-color:rgb(223, 132, 41);
     box-shadow: 1px 1px rgba(0,0,0,.075);
     color:white;
     border:none;
@@ -236,18 +236,27 @@ h4 {
 }
 
 .point-orange {
-    border-color: rgb(243, 162, 83);
-    color: rgb(243, 162, 83);
+    border-color: rgb(247, 144, 42);
+    color: rgb(247, 144, 42);
 }
 
 .point-red {
-    border-color: rgb(208, 102, 129);
-    color: rgb(208, 102, 129);
+    border-color: rgb(204, 67, 101);
+    color: rgb(204, 67, 101);
 }
 
 .point-blue {
-    border-color: rgb(87, 154, 202);
-    color: rgb(87, 154, 202);
+    border-color: rgb(41, 124, 184);
+    color: rgb(41, 124, 184);
+}
+
+/*reduce font size of h1 and h2 so the initial design when h3 and h4 tags were used respectively is retained*/
+h1{
+    font-size:1.25em;
+}
+
+h2{
+    font-size:1.125em;
 }
 
 span.front-em {

binderhub/templates/index.html

@@ -13,13 +13,13 @@
     <div class="col-lg-10 col-lg-offset-1">
       {% block header %}
       <div id="header" class="text-center">
-        <h3>Turn a Git repo into a collection of interactive notebooks</h3>
+        <h1>Turn a Git repo into a collection of interactive notebooks</h1>
         <div id="explanation">
           Have a repository full of Jupyter notebooks? With Binder, open those notebooks in an executable environment, making your code immediately reproducible by anyone, anywhere.
         </div>
       </div>
       <div id="tutorials" class="text-center">
-        <h4>New to Binder? Get started with a <a href="https://the-turing-way.netlify.app/communication/binder/zero-to-binder.html" target="_blank">Zero-to-Binder tutorial</a> in Julia, Python, or R.</h4>
+        <h2>New to Binder? Get started with a <a href="https://the-turing-way.netlify.app/communication/binder/zero-to-binder.html" target="_blank">Zero-to-Binder tutorial</a> in Julia, Python, or R.</h2>
       </div>
       {% endblock header %}
 
@@ -99,15 +99,15 @@ <h4 id="form-header" class='row'>Build and launch a repository</h4>
 
         <div class="badges row">
             <div class="dropdownmenu" id="toggle-badge-snippet">
-              <label>Expand to see the text below, paste it into your README to show a binder badge: <img id="badge" src="{{static_url("images/badge_logo.svg")}}"></label>
+              <label>Expand to see the text below, paste it into your README to show a binder badge: <img id="badge" src="{{static_url("images/badge_logo.svg")}}" alt="Binder badge logo"></label>
               <a id="badge-link"></a>
               <a href="#" title="show badge snippets"><span id="badge-snippet-caret" class="glyphicon glyphicon-triangle-right"></span></a>
             </div>
             <div id="badge-snippets" class="hidden">
               <!--Markdown section-->
               <div  class="badge-snippet-row">
                  <pre id="markdown-badge-snippet" data-default="Fill in the fields to see the markdown badge snippet."></pre>
-                 <img class="icon" src="{{static_url("images/markdown-icon.svg")}}">
+                 <img class="icon" src="{{static_url("images/markdown-icon.svg")}}" alt="Markdown icon">
                  <img class="icon clipboard"
                     src="{{static_url("images/copy-icon-black.svg")}}"
                     data-clipboard-target="#markdown-badge-snippet"
@@ -116,7 +116,7 @@ <h4 id="form-header" class='row'>Build and launch a repository</h4>
               <!--RST section-->
               <div  class="badge-snippet-row">
                   <pre id="rst-badge-snippet" data-default="Fill in the fields to see the rST badge snippet."></pre>
-                  <img class="icon" src="{{static_url("images/rst-icon.svg")}}">
+                  <img class="icon" src="{{static_url("images/rst-icon.svg")}}" alt="restructured text icon">
                   <img class="icon clipboard" src="{{static_url("images/copy-icon-black.svg")}}"
                     data-clipboard-target="#rst-badge-snippet"
                     alt="Copy rst link to clipboard">