Merge branch 'Jupyter' into '2023'

JupyterLab (fix)

See merge request software-team/easybuild!2049

Golden_Repo/j/JupyterExtension-jupyterai/JupyterExtension-jupyterai-1.0.1-GCCcore-11.3.0-2023.3.6.eb

@@ -41,21 +41,12 @@ exts_list = [
         'source_tmpl': '%(name)s-%(version)s-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
         'checksums': ['dca531952a2e3eac56f479ff22951af4715ee44788a3fe991d208d766d3f95f3'],
     }),
-    ('webcolors', '1.13', {
-        'checksums': ['c225b674c83fa923be93d235330ce0300373d02885cef23238813b0d5668304a'],
-    }),
-    ('uri-template', '1.3.0', {
-        'checksums': ['0e00f8eb65e18c7de20d595a14336e9f337ead580c70934141624b6d1ffdacc7'],
-    }),
     ('typing_extensions', '4.5.0', {
         'checksums': ['5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb'],
     }),
     ('numexpr', '2.8.4', {
         'checksums': ['d5432537418d18691b9115d615d6daa17ee8275baef3edf1afbbf8bc69806147'],
     }),
-    ('jsonpointer', '2.4', {
-        'checksums': ['585cee82b70211fa9e6043b7bb89db6e1aa49524340dde8ad6b63206ea689d88'],
-    }),
     ('jsonpath-ng', '1.5.3', {
         'checksums': ['a273b182a82c1256daab86a313b937059261b5c5f8c4fa3fc38b882b344dd567'],
     }),
@@ -66,9 +57,6 @@ exts_list = [
         'modulename': False,
         'checksums': ['0ff789ae7d8ddd76d2ac02e7d13bfef6fc4928ac01e1dcaa182be51b6bcc0aaa'],
     }),
-    ('fqdn', '1.5.1', {
-        'checksums': ['105ed3677e767fb5ca086a0c1f4bb66ebc3c100be518f0e0d755d9eae164d89f'],
-    }),
     ('typing_inspect', '0.9.0', {
         'checksums': ['b23fc42ff6f6ef6954e4852c1fb512cdd18dbea03134f91f856a95ccc9461f78'],
     }),
@@ -85,9 +73,6 @@ exts_list = [
     ('marshmallow', '3.19.0', {
         'checksums': ['90032c0fd650ce94b6ec6dc8dfeb0e3ff50c144586462c389b81a07205bedb78'],
     }),
-    ('arrow', '1.2.3', {
-        'checksums': ['3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1'],
-    }),
     ('openapi-schema-pydantic', '1.2.4', {
         'checksums': ['3e22cf58b74a69f752cc7e5f1537f6e44164282db2700cbbcd3bb99ddd065196'],
     }),
@@ -103,9 +88,6 @@ exts_list = [
     ('marshmallow-enum', '1.5.1', {
         'checksums': ['38e697e11f45a8e64b4a1e664000897c659b60aa57bfa18d44e226a9920b6e58'],
     }),
-    ('isoduration', '20.11.0', {
-        'checksums': ['ac2f9015137935279eac671f94f89eb00584f940f5dc49462a0c4ee692ba1bd9'],
-    }),
     ('dataclasses_json', '0.5.13', {
         'checksums': ['425810e1356fb6917eb7c323e3aaee0c9398fc55b5001d3532381679f727fc18'],
     }),

Golden_Repo/j/JupyterLab/JupyterLab-2023.3.6-GCCcore-11.3.0.eb

@@ -116,12 +116,39 @@ exts_list = [
     ('deprecation', '2.1.0', {
         'checksums': ['72b3bde64e5d778694b0cf68178aed03d15e15477116add3fb773e581f9518ff'],
     }),
+    # jsonschema ####################################
+    ('webcolors', '1.13', {
+        'checksums': ['c225b674c83fa923be93d235330ce0300373d02885cef23238813b0d5668304a'],
+    }),
+    ('uri-template', '1.3.0', {
+        'checksums': ['0e00f8eb65e18c7de20d595a14336e9f337ead580c70934141624b6d1ffdacc7'],
+    }),
     ('rfc3339_validator', '0.1.4', {
         'checksums': ['138a2abdf93304ad60530167e51d2dfb9549521a836871b88d7f4695d0022f6b'],
     }),
     ('rfc3986_validator', '0.1.1', {
         'checksums': ['3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055'],
     }),
+    ('rfc3987', '1.3.8', {
+        'checksums': ['d3c4d257a560d544e9826b38bc81db676890c79ab9d7ac92b39c7a253d5ca733'],
+    }),
+    ('jsonpointer', '2.4', {
+        'checksums': ['585cee82b70211fa9e6043b7bb89db6e1aa49524340dde8ad6b63206ea689d88'],
+    }),
+    ('arrow', '1.2.3', {
+        'checksums': ['3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1'],
+    }),
+    ('isoduration', '20.11.0', {
+        'checksums': ['ac2f9015137935279eac671f94f89eb00584f940f5dc49462a0c4ee692ba1bd9'],
+    }),
+    ('fqdn', '1.5.1', {
+        'checksums': ['105ed3677e767fb5ca086a0c1f4bb66ebc3c100be518f0e0d755d9eae164d89f'],
+    }),
+    ('jsonschema', '4.17.3', {
+        'checksums': ['0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d'],
+        'extras': ['format-nongpl'],
+    }),
+    # nbclassic #####################################
     ('jupyter_events', '0.6.3', {
         'checksums': ['9a6e9995f75d1b7146b436ea24d696ce3a35bfa8bfe45e0c33c334c79464d0b3'],
     }),
@@ -136,9 +163,6 @@ exts_list = [
     ('requests', '2.30.0', {
         'checksums': ['239d7d4458afcb28a692cdd298d87542235f4ca8d36d03a15bfc128a6559a2f4'],
     }),
-    ('jsonschema', '4.17.3', {
-        'checksums': ['0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d'],
-    }),
     ('json5', '0.9.11', {
         'checksums': ['4f1e196acc55b83985a51318489f345963c7ba84aa37607e49073066c562e99b'],
     }),
@@ -171,8 +195,14 @@ exts_list = [
     # jupyterlab ####################################
     ('jupyterlab', local_jlab_version, {
         'patches': [
-            ('jupyterlab-silencenotify.patch', '.'),
-            ('401.html', '.'),
+            {
+                'name': 'jupyterlab-silencenotify.patch',
+                'copy': '.'
+            },
+            {
+                'name': '401.html',
+                'copy': '.'
+            },
             # 'jupyterlab-rendermime_p14618.patch'
         ],
         'checksums': [
@@ -200,8 +230,8 @@ exts_list = [
     ('aiohttp', '3.8.4', {
         'checksums': ['bf2e1a9162c1e441bf805a1fd166e249d574ca04e03b34f97e2928769e91ab5c'],
     }),
-    ('simpervisor', '0.4', {
-        'checksums': ['cec79e13cdbd6edb04a5c98c1ff8d4bd9713e706c069226909a1ef0e89d393c5'],
+    ('simpervisor', '1.0.0', {
+        'checksums': ['7eb87ca86d5e276976f5bb0290975a05d452c6a7b7f58062daea7d8369c823c1'],
     }),
     ('jupyter_server_proxy', '4.0.0', {
         'patches': [
@@ -833,7 +863,7 @@ postinstallcmds = [
     # disable notifications about new JupyterLab versions
     (
         'patch "%%(installdir)s/share/jupyter/lab/schemas/@jupyterlab/apputils-extension/notification.json" '
-        '      < %%(builddir)s/jupyterlab/jupyterlab-%s/jupyterjupyterlab-silencenotify.patch'
+        '      < %%(builddir)s/jupyterlab/jupyterlab-%s/jupyterlab-silencenotify.patch'
     ) % local_jlab_version,
 
     # add webpage, which leads back to https://jupyter-jsc.fz-juelich.de