Merge pull request jupyterlab#749 from jupyterlab/release-v4.0.11-1

Release v4.0.11-1

.gitignore

@@ -25,3 +25,4 @@ __pycache__
 
 env_installer/jlab_server/
 env_installer/jlab_server.tar.gz
+

env_installer/sign-osx-64.txt

@@ -204,6 +204,7 @@ lib/libyaml-cpp.0.8.0.dylib
 lib/libz.1.2.13.dylib
 lib/libzmq.5.dylib
 lib/libzstd.1.5.5.dylib
+lib/python3.8/config-3.8-darwin/python.o
 lib/python3.8/lib-dynload/_asyncio.cpython-38-darwin.so
 lib/python3.8/lib-dynload/_bisect.cpython-38-darwin.so
 lib/python3.8/lib-dynload/_blake2.cpython-38-darwin.so
@@ -277,12 +278,15 @@ lib/python3.8/lib-dynload/termios.cpython-38-darwin.so
 lib/python3.8/lib-dynload/unicodedata.cpython-38-darwin.so
 lib/python3.8/lib-dynload/xxlimited.cpython-38-darwin.so
 lib/python3.8/lib-dynload/zlib.cpython-38-darwin.so
+lib/python3.8/lib2to3/Grammar3.8.18.final.0.pickle
+lib/python3.8/lib2to3/PatternGrammar3.8.18.final.0.pickle
 lib/python3.8/site-packages/AppKit/_AppKit.cpython-38-darwin.so
 lib/python3.8/site-packages/AppKit/_inlines.cpython-38-darwin.so
 lib/python3.8/site-packages/CoreFoundation/_CoreFoundation.cpython-38-darwin.so
 lib/python3.8/site-packages/CoreFoundation/_inlines.cpython-38-darwin.so
 lib/python3.8/site-packages/Foundation/_Foundation.cpython-38-darwin.so
 lib/python3.8/site-packages/Foundation/_inlines.cpython-38-darwin.so
+lib/python3.8/site-packages/IPython/core/tests/nonascii.py
 lib/python3.8/site-packages/PIL/_imaging.cpython-38-darwin.so
 lib/python3.8/site-packages/PIL/_imagingcms.cpython-38-darwin.so
 lib/python3.8/site-packages/PIL/_imagingft.cpython-38-darwin.so
@@ -298,12 +302,20 @@ lib/python3.8/site-packages/contourpy/_contourpy.cpython-38-darwin.so
 lib/python3.8/site-packages/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_cython.cpython-38-darwin.so
 lib/python3.8/site-packages/debugpy/_vendored/pydevd/_pydevd_frame_eval/pydevd_frame_evaluator.cpython-38-darwin.so
 lib/python3.8/site-packages/debugpy/_vendored/pydevd/pydevd_attach_to_process/attach_x86_64.dylib
+lib/python3.8/site-packages/debugpy/_vendored/pydevd/tests_python/resources/_pydev_coverage_cyrillic_encoding_py2.py
+lib/python3.8/site-packages/debugpy/_vendored/pydevd/tests_python/resources/_pydev_coverage_cyrillic_encoding_py3.py
+lib/python3.8/site-packages/debugpy/_vendored/pydevd/tests_python/resources/_pydev_coverage_syntax_error.py
 lib/python3.8/site-packages/fontTools/cu2qu/cu2qu.cpython-38-darwin.so
 lib/python3.8/site-packages/fontTools/feaLib/lexer.cpython-38-darwin.so
 lib/python3.8/site-packages/fontTools/misc/bezierTools.cpython-38-darwin.so
 lib/python3.8/site-packages/fontTools/pens/momentsPen.cpython-38-darwin.so
 lib/python3.8/site-packages/fontTools/qu2cu/qu2cu.cpython-38-darwin.so
 lib/python3.8/site-packages/fontTools/varLib/iup.cpython-38-darwin.so
+lib/python3.8/site-packages/importlib_resources/tests/data01/binary.file
+lib/python3.8/site-packages/importlib_resources/tests/data01/subdirectory/binary.file
+lib/python3.8/site-packages/importlib_resources/tests/data01/utf-16.file
+lib/python3.8/site-packages/importlib_resources/tests/namespacedata01/binary.file
+lib/python3.8/site-packages/importlib_resources/tests/namespacedata01/utf-16.file
 lib/python3.8/site-packages/kiwisolver/_cext.cpython-38-darwin.so
 lib/python3.8/site-packages/libmambapy/bindings.cpython-38-darwin.so
 lib/python3.8/site-packages/markupsafe/_speedups.cpython-38-darwin.so
@@ -317,13 +329,19 @@ lib/python3.8/site-packages/matplotlib/backends/_backend_agg.cpython-38-darwin.s
 lib/python3.8/site-packages/matplotlib/backends/_macosx.cpython-38-darwin.so
 lib/python3.8/site-packages/matplotlib/backends/_tkagg.cpython-38-darwin.so
 lib/python3.8/site-packages/matplotlib/ft2font.cpython-38-darwin.so
+lib/python3.8/site-packages/menuinst/data/appkit_launcher_arm64
+lib/python3.8/site-packages/menuinst/data/appkit_launcher_x86_64
+lib/python3.8/site-packages/menuinst/data/osx_launcher_arm64
+lib/python3.8/site-packages/menuinst/data/osx_launcher_x86_64
 lib/python3.8/site-packages/numpy/core/_multiarray_tests.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/core/_multiarray_umath.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/core/_operand_flag_tests.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/core/_rational_tests.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/core/_simd.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/core/_struct_ufunc_tests.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/core/_umath_tests.cpython-38-darwin.so
+lib/python3.8/site-packages/numpy/core/tests/data/recarray_from_file.fits
+lib/python3.8/site-packages/numpy/f2py/tests/src/module_data/mod.mod
 lib/python3.8/site-packages/numpy/fft/_pocketfft_internal.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/linalg/_umath_linalg.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/linalg/lapack_lite.cpython-38-darwin.so
@@ -516,3 +534,18 @@ lib/tdbcmysql1.1.5/libtdbcmysql1.1.5.dylib
 lib/tdbcodbc1.1.5/libtdbcodbc1.1.5.dylib
 lib/tdbcpostgres1.1.5/libtdbcpostgres1.1.5.dylib
 lib/thread2.8.8/libthread2.8.8.dylib
+libexec/lzo/examples/lzopack
+libexec/lzo/examples/lzotest
+libexec/lzo/examples/simple
+libexec/lzo/examples/testmini
+sbin/gss-server
+sbin/kadmin.local
+sbin/kadmind
+sbin/kdb5_util
+sbin/kprop
+sbin/kpropd
+sbin/kproplog
+sbin/krb5kdc
+sbin/sim_server
+sbin/sserver
+sbin/uuserver

env_installer/sign-osx-arm64.txt

@@ -204,6 +204,7 @@ lib/libyaml-cpp.0.8.0.dylib
 lib/libz.1.2.13.dylib
 lib/libzmq.5.dylib
 lib/libzstd.1.5.5.dylib
+lib/python3.8/config-3.8-darwin/python.o
 lib/python3.8/lib-dynload/_asyncio.cpython-38-darwin.so
 lib/python3.8/lib-dynload/_bisect.cpython-38-darwin.so
 lib/python3.8/lib-dynload/_blake2.cpython-38-darwin.so
@@ -277,6 +278,9 @@ lib/python3.8/lib-dynload/termios.cpython-38-darwin.so
 lib/python3.8/lib-dynload/unicodedata.cpython-38-darwin.so
 lib/python3.8/lib-dynload/xxlimited.cpython-38-darwin.so
 lib/python3.8/lib-dynload/zlib.cpython-38-darwin.so
+lib/python3.8/lib2to3/Grammar3.8.18.final.0.pickle
+lib/python3.8/lib2to3/PatternGrammar3.8.18.final.0.pickle
+lib/python3.8/site-packages/IPython/core/tests/nonascii.py
 lib/python3.8/site-packages/PIL/_imaging.cpython-38-darwin.so
 lib/python3.8/site-packages/PIL/_imagingcms.cpython-38-darwin.so
 lib/python3.8/site-packages/PIL/_imagingft.cpython-38-darwin.so
@@ -292,12 +296,20 @@ lib/python3.8/site-packages/contourpy/_contourpy.cpython-38-darwin.so
 lib/python3.8/site-packages/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_cython.cpython-38-darwin.so
 lib/python3.8/site-packages/debugpy/_vendored/pydevd/_pydevd_frame_eval/pydevd_frame_evaluator.cpython-38-darwin.so
 lib/python3.8/site-packages/debugpy/_vendored/pydevd/pydevd_attach_to_process/attach_linux_amd64.dylib
+lib/python3.8/site-packages/debugpy/_vendored/pydevd/tests_python/resources/_pydev_coverage_cyrillic_encoding_py2.py
+lib/python3.8/site-packages/debugpy/_vendored/pydevd/tests_python/resources/_pydev_coverage_cyrillic_encoding_py3.py
+lib/python3.8/site-packages/debugpy/_vendored/pydevd/tests_python/resources/_pydev_coverage_syntax_error.py
 lib/python3.8/site-packages/fontTools/cu2qu/cu2qu.cpython-38-darwin.so
 lib/python3.8/site-packages/fontTools/feaLib/lexer.cpython-38-darwin.so
 lib/python3.8/site-packages/fontTools/misc/bezierTools.cpython-38-darwin.so
 lib/python3.8/site-packages/fontTools/pens/momentsPen.cpython-38-darwin.so
 lib/python3.8/site-packages/fontTools/qu2cu/qu2cu.cpython-38-darwin.so
 lib/python3.8/site-packages/fontTools/varLib/iup.cpython-38-darwin.so
+lib/python3.8/site-packages/importlib_resources/tests/data01/binary.file
+lib/python3.8/site-packages/importlib_resources/tests/data01/subdirectory/binary.file
+lib/python3.8/site-packages/importlib_resources/tests/data01/utf-16.file
+lib/python3.8/site-packages/importlib_resources/tests/namespacedata01/binary.file
+lib/python3.8/site-packages/importlib_resources/tests/namespacedata01/utf-16.file
 lib/python3.8/site-packages/kiwisolver/_cext.cpython-38-darwin.so
 lib/python3.8/site-packages/libmambapy/bindings.cpython-38-darwin.so
 lib/python3.8/site-packages/markupsafe/_speedups.cpython-38-darwin.so
@@ -311,13 +323,19 @@ lib/python3.8/site-packages/matplotlib/backends/_backend_agg.cpython-38-darwin.s
 lib/python3.8/site-packages/matplotlib/backends/_macosx.cpython-38-darwin.so
 lib/python3.8/site-packages/matplotlib/backends/_tkagg.cpython-38-darwin.so
 lib/python3.8/site-packages/matplotlib/ft2font.cpython-38-darwin.so
+lib/python3.8/site-packages/menuinst/data/appkit_launcher_arm64
+lib/python3.8/site-packages/menuinst/data/appkit_launcher_x86_64
+lib/python3.8/site-packages/menuinst/data/osx_launcher_arm64
+lib/python3.8/site-packages/menuinst/data/osx_launcher_x86_64
 lib/python3.8/site-packages/numpy/core/_multiarray_tests.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/core/_multiarray_umath.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/core/_operand_flag_tests.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/core/_rational_tests.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/core/_simd.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/core/_struct_ufunc_tests.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/core/_umath_tests.cpython-38-darwin.so
+lib/python3.8/site-packages/numpy/core/tests/data/recarray_from_file.fits
+lib/python3.8/site-packages/numpy/f2py/tests/src/module_data/mod.mod
 lib/python3.8/site-packages/numpy/fft/_pocketfft_internal.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/linalg/_umath_linalg.cpython-38-darwin.so
 lib/python3.8/site-packages/numpy/linalg/lapack_lite.cpython-38-darwin.so
@@ -508,3 +526,18 @@ lib/tdbcmysql1.1.5/libtdbcmysql1.1.5.dylib
 lib/tdbcodbc1.1.5/libtdbcodbc1.1.5.dylib
 lib/tdbcpostgres1.1.5/libtdbcpostgres1.1.5.dylib
 lib/thread2.8.8/libthread2.8.8.dylib
+libexec/lzo/examples/lzopack
+libexec/lzo/examples/lzotest
+libexec/lzo/examples/simple
+libexec/lzo/examples/testmini
+sbin/gss-server
+sbin/kadmin.local
+sbin/kadmind
+sbin/kdb5_util
+sbin/kprop
+sbin/kpropd
+sbin/kproplog
+sbin/krb5kdc
+sbin/sim_server
+sbin/sserver
+sbin/uuserver

package.json

@@ -25,7 +25,7 @@
     "dist:win-arm64": "yarn build && yarn electron-builder --arm64 --publish never",
     "update_workflow_conda_lock": "cd workflow_env && rimraf *.lock && conda-lock --kind explicit -f publish_env.yaml && cd -",
     "update_conda_lock": "cd env_installer && rimraf *.lock && conda-lock --kind explicit -f jlab_server.yaml && cd -",
-    "clean_env_installer": "rimraf ./env_installer/jlab_server.tar.gz && conda env remove -p ./env_installer/jlab_server -y",
+    "clean_env_installer": "rimraf ./env_installer/jlab_server.tar.gz && rimraf ./env_installer/jlab_server",
     "create_env_installer:linux": "yarn clean_env_installer && conda-lock install --prefix ./env_installer/jlab_server ./env_installer/conda-linux-64.lock && conda pack -p ./env_installer/jlab_server -o ./env_installer/jlab_server.tar.gz",
     "create_env_installer:osx-64": "yarn clean_env_installer && conda-lock install --prefix ./env_installer/jlab_server ./env_installer/conda-osx-64.lock && conda pack -p ./env_installer/jlab_server -o ./env_installer/jlab_server.tar.gz",
     "create_env_installer:osx-arm64": "yarn clean_env_installer && conda-lock install --no-validate-platform --prefix ./env_installer/jlab_server ./env_installer/conda-osx-arm64.lock && conda pack -p ./env_installer/jlab_server -o ./env_installer/jlab_server.tar.gz",

scripts/buildutil.js

@@ -93,20 +93,62 @@ if (cli.flags.checkVersionMatch) {
 if (cli.flags.updateBinarySignList) {
   const { isBinary } = require('istextorbinary');
   const envInstallerDir = path.resolve('env_installer', 'jlab_server');
-  const envBinDir = path.join(envInstallerDir, 'bin');
 
+  const getFileExtension = filePath => {
+    const lastDot = filePath.lastIndexOf('.');
+    if (lastDot !== -1) {
+      return filePath.substring(lastDot + 1);
+    }
+  };
+
+  const skipExtensions = new Set([
+    'a',
+    'bz2',
+    'dat',
+    'eot',
+    'exe',
+    'gif',
+    'gz',
+    'jpg',
+    'icns',
+    'ico',
+    'mo',
+    'npy',
+    'npz',
+    'parquet',
+    'pdf',
+    'pkl',
+    'png',
+    'ppm',
+    'pyc',
+    'testcase',
+    'tiff',
+    'ttf',
+    'wav',
+    'whl',
+    'woff',
+    'woff2',
+    'xz',
+    'zip'
+  ]);
+
+  const skipPathComponents = [
+    '/pytz/zoneinfo/',
+    '/tzdata/zoneinfo/',
+    'share/terminfo/'
+  ];
+
+  // sign binary files except for certain extensions and certain directories
   const needsSigning = filePath => {
-    // conly consider bin directory, and .so, .dylib files in other directories
-    if (
-      filePath.startsWith(envBinDir) ||
-      filePath.endsWith('.so') ||
-      filePath.endsWith('.dylib')
-    ) {
-      // check for binary content
-      return isBinary(null, fs.readFileSync(filePath));
+    const skippedPath = skipPathComponents.find(component => {
+      return filePath.includes(component);
+    });
+
+    if (skippedPath || skipExtensions.has(getFileExtension(filePath))) {
+      return false;
     }
 
-    return false;
+    return isBinary(null, fs.readFileSync(filePath));
   };
 
   const findBinariesInDirectory = dirPath => {