Merge branch 'main' into addnycu

jupyterhub · Jan 20, 2024 · abe7c15 · abe7c15
2 parents 066e951 + 0e02889
commit abe7c15
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
@@ -47,7 +47,7 @@ jobs:
           ls -l dist
 
       # ref: https://github.com/actions/upload-artifact#readme
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: repo2docker-${{ github.sha }}
           path: "dist/*"

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -70,7 +70,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "${{ matrix.python_version }}"
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -23,7 +23,7 @@ repos:
 
   # Autoformat: Python code
   - repo: https://github.com/psf/black
-    rev: 23.10.1
+    rev: 23.12.1
     hooks:
       - id: black
         args:
@@ -36,15 +36,15 @@ repos:
 
   # Autoformat: Python code
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
         args:
           - --profile=black
 
   # Autoformat: markdown
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.3
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
         files: ".md"

diff --git a/repo2docker/contentproviders/dataverse.json b/repo2docker/contentproviders/dataverse.json
@@ -639,21 +639,34 @@
         },
         {
             "description": "The Research Data Repository for the Max Planck Society.",
-            "full_name": "Edmond - Research Data Repository for the Max Planck Society",
+            "full_name": "Edmond - Research Data Repository for the Max Planck Society (old domain)",
             "id": 1795,
             "is_active": true,
             "lat": 48.1366,
             "lng": 11.5771,
             "logo": "https://edmond.mpdl.mpg.de/logos/navbar/logo_for_bright.png",
-            "name": "Edmond",
-            "slug": "",
+            "name": "Edmond (old domain)",
+            "slug": "edmond_mpdl_mpg_de",
             "url": "https://edmond.mpdl.mpg.de",
-            "version": "5.10"
+            "version": "5.14"
+        },
+        {
+            "description": "The Research Data Repository for the Max Planck Society.",
+            "full_name": "Edmond - Research Data Repository for the Max Planck Society",
+            "id": 1796,
+            "is_active": true,
+            "lat": 48.1366,
+            "lng": 11.5771,
+            "logo": "https://edmond.mpg.de/logos/navbar/logo_for_bright.png",
+            "name": "Edmond",
+            "slug": "edmond_mpg_de",
+            "url": "https://edmond.mpg.de",
+            "version": "5.14"
         },
         {
             "description": "The institutional research data repository of the National Yang Ming Chiao Tung University",
             "full_name": "National Yang Ming Chiao Tung University",
-            "id": 1796,
+            "id": 1797,
             "is_active": true,
             "lat": 24.7867714,
             "lng": 120.9984256,