Merge commit 'fd22a4f49c2db925feaa7bad556bbd0ce56eb9fd'

.codecov.yml

@@ -6,7 +6,7 @@ coverage:
   status:
     project:
       default:
-        target: auto
+        target: "0%"
     patch:
       default:
-        target: 20%
+        target: "0%"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,23 +1,27 @@
 ---
 name: Bug report
 about: Create a report to help us repair something that is currently broken
-title: ''
-labels: ''
-assignees: ''
-
+title: ""
+labels: ""
+assignees: ""
 ---
+
 <!-- Thank you for contributing. These HTML commments will not render in the issue, but you can delete them once you've read them if you prefer! -->
 
 ### Bug description
+
 <!-- Use this section to clearly and concisely describe the bug. -->
 
 #### Expected behaviour
+
 <!-- Tell us what you thought would happen. -->
 
 #### Actual behaviour
+
 <!-- Tell us what you actually happens. -->
 
 ### How to reproduce
+
 <!-- Use this section to describe the steps that a user would take to experience this bug. -->
 
 1. Go to '...'
@@ -26,9 +30,9 @@ assignees: ''
 4. See error
 
 ### Your personal set up
-<!-- Tell us a little about the system you're using. You can see the guidelines for setting up and reporting this information at https://repo2docker.readthedocs.io/en/latest/contributing/contributing.html#setting-up-for-local-development. -->
 
- - OS: [e.g. linux, OSX]
- - Docker version: `docker version` <!-- Run this command to get your version. -->
- - repo2docker version `repo2docker --version` <!-- Run this command to get your version. -->
+<!-- Tell us a little about the system you're using. You can see the guidelines for setting up and reporting this information at https://repo2docker.readthedocs.io/en/latest/contributing/contributing.html#setting-up-for-local-development. -->
 
+- OS: [e.g. linux, OSX]
+- Docker version: `docker version` <!-- Run this command to get your version. -->
+- repo2docker version `repo2docker --version` <!-- Run this command to get your version. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,29 +1,29 @@
 ---
 name: Feature request
 about: Suggest a new feature or a big change to repo2docker
-title: ''
-labels: 'needs: discussion'
-assignees: ''
-
+title: ""
+labels: "needs: discussion"
+assignees: ""
 ---
+
 <!-- Thank you for contributing. These HTML commments will not render in the issue, but you can delete them once you've read them if you prefer! -->
 
 ### Proposed change
-<!-- Use this section to describe the feature you'd like to be added. -->
 
+<!-- Use this section to describe the feature you'd like to be added. -->
 
 ### Alternative options
-<!-- Use this section to describe alternative options and why you've decided on the proposed feature above. -->
 
+<!-- Use this section to describe alternative options and why you've decided on the proposed feature above. -->
 
 ### Who would use this feature?
-<!-- Describe the audience for this feature. This information will affect who chooses to work on the feature with you. -->
 
+<!-- Describe the audience for this feature. This information will affect who chooses to work on the feature with you. -->
 
 ### How much effort will adding it take?
-<!-- Try to estimate how much work adding this feature will require. This information will affect who chooses to work on the feature with you. -->
 
+<!-- Try to estimate how much work adding this feature will require. This information will affect who chooses to work on the feature with you. -->
 
 ### Who can do this work?
-<!-- What skills are needed? Who can be recruited to add this feature? This information will affect who chooses to work on the feature with you. -->
 
+<!-- What skills are needed? Who can be recruited to add this feature? This information will affect who chooses to work on the feature with you. -->

.github/ISSUE_TEMPLATE/support-question.md

@@ -1,10 +1,9 @@
 ---
 name: Support question
 about: Ask a question about using repo2docker
-title: ''
-labels: ''
-assignees: ''
-
+title: ""
+labels: ""
+assignees: ""
 ---
 
 🚨 Please do **not** open an issue for support questions. Instead please search for similar issues or post on http://discourse.jupyter.org/c/questions. 🚨

.github/dependabot.yml → .github/dependabot.yaml

@@ -1,4 +1,4 @@
-# dependabot.yml reference: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+# dependabot.yaml reference: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
 #
 # Notes:
 # - Status and logs from dependabot are provided at
@@ -9,8 +9,9 @@ version: 2
 updates:
   # Maintain dependencies in our GitHub Workflows
   - package-ecosystem: github-actions
-    directory: "/" # This should be / rather than .github/workflows
+    directory: /
+    labels: [ci]
     schedule:
-      interval: weekly
+      interval: monthly
       time: "05:00"
-      timezone: "Etc/UTC"
+      timezone: Etc/UTC

.github/workflows/docker.yml

@@ -11,13 +11,15 @@ on:
       - "**.rst"
       - ".github/workflows/*"
       - "!.github/workflows/docker.yml"
+      - ".pre-commit-config.yaml"
   push:
     paths-ignore:
       - "docs/**"
       - "**.md"
       - "**.rst"
       - ".github/workflows/*"
       - "!.github/workflows/docker.yml"
+      - ".pre-commit-config.yaml"
     branches-ignore:
       - "dependabot/**"
       - "pre-commit-ci-update-config"
@@ -36,7 +38,7 @@ jobs:
 
       # https://github.com/docker/build-push-action
       - name: Build Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: .
           tags: jupyter/repo2docker:pr

.github/workflows/release.yml

@@ -11,13 +11,15 @@ on:
       - "**.rst"
       - ".github/workflows/*"
       - "!.github/workflows/release.yml"
+      - ".pre-commit-config.yaml"
   push:
     paths-ignore:
       - "docs/**"
       - "**.md"
       - "**.rst"
       - ".github/workflows/*"
       - "!.github/workflows/release.yml"
+      - ".pre-commit-config.yaml"
     branches-ignore:
       - "dependabot/**"
       - "pre-commit-ci-update-config"
@@ -34,20 +36,28 @@ jobs:
         with:
           python-version: "3.9"
 
-      - name: Install dependencies
+      - name: install build requirements
         run: |
-          pip install -r dev-requirements.txt
+          pip install build
           pip freeze
 
-      - name: Build distribution archives
+      - name: build release
         run: |
-          python setup.py sdist bdist_wheel
+          python -m build --sdist --wheel .
+          ls -l dist
+
+      # ref: https://github.com/actions/upload-artifact#readme
+      - uses: actions/upload-artifact@v3
+        with:
+          name: repo2docker-${{ github.sha }}
+          path: "dist/*"
+          if-no-files-found: error
 
       # This step is only run when a new tag is pushed
       # all previous steps always run in order to exercise them
       - name: Publish distribution to PyPI
         if: startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@v1.5.1
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_PASSWORD }}
 
@@ -114,9 +124,9 @@ jobs:
           echo "TAGS=$TAGS" >> $GITHUB_ENV
 
       - name: Build and push repo2docker
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ env.TAGS }}

.github/workflows/test.yml

@@ -11,13 +11,15 @@ on:
       - "**.rst"
       - ".github/workflows/*"
       - "!.github/workflows/test.yml"
+      - ".pre-commit-config.yaml"
   push:
     paths-ignore:
       - "docs/**"
       - "**.md"
       - "**.rst"
       - ".github/workflows/*"
       - "!.github/workflows/test.yml"
+      - ".pre-commit-config.yaml"
     branches-ignore:
       - "dependabot/**"
       - "pre-commit-ci-update-config"
@@ -39,38 +41,7 @@ env:
   GIT_AUTHOR_NAME: CI User
 
 jobs:
-  pre-commit:
-    runs-on: ubuntu-22.04
-
-    strategy:
-      fail-fast: false
-      matrix:
-        python_version: ["3.9"]
-
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "${{ matrix.python_version }}"
-
-      # There will almost never be a cache hit on the cache key when this job is
-      # run, as it is the first of all jobs in this workflow. The subsequent
-      # jobs in this workflow can rely on this cache though.
-      - name: Save pip's install cache on job completion
-        uses: actions/cache@v3
-        with:
-          path: ~/.cache/pip
-          key: "${{ github.run_id }}-${{ matrix.python_version }}"
-
-      - name: Install dependencies
-        run: |
-          pip install -r dev-requirements.txt
-          pip freeze
-
-      - run: pre-commit run --all-files
-
   test:
-    needs: pre-commit
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
 
     strategy:
@@ -103,20 +74,14 @@ jobs:
         with:
           python-version: "${{ matrix.python_version }}"
 
-      - name: Restore pip's install cache from previous job
-        uses: actions/cache@v3
-        with:
-          path: ~/.cache/pip
-          key: "${{ github.run_id }}-${{ matrix.python_version }}"
-
       - name: Install dependencies
         run: |
           pip install -r dev-requirements.txt
           pip freeze
 
       - name: Install repo2docker
         run: |
-          python setup.py bdist_wheel
+          python -m build --wheel .
           pip install dist/*.whl
 
           # add for mercurial tests
@@ -128,6 +93,4 @@ jobs:
         run: |
           pytest --verbose --color=yes --durations=10 --cov=repo2docker tests/${{ matrix.repo_type }}
 
-      - name: Submit codecov report
-        run: |
-          codecov
+      - uses: codecov/codecov-action@v3