From 76c89b0d9334c8c6afcc96e142005531160f4b4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 May 2021 11:18:36 +0000 Subject: [PATCH 1/3] Bump nokogiri from 1.11.1 to 1.11.4 in /source/scripts/ruby/blog/source Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.1 to 1.11.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.1...v1.11.4) Signed-off-by: dependabot[bot] --- source/scripts/ruby/blog/source/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/scripts/ruby/blog/source/Gemfile.lock b/source/scripts/ruby/blog/source/Gemfile.lock index 95d2e1920..20865cf18 100644 --- a/source/scripts/ruby/blog/source/Gemfile.lock +++ b/source/scripts/ruby/blog/source/Gemfile.lock @@ -74,10 +74,10 @@ GEM mini_mime (>= 0.1.1) method_source (0.9.2) mini_mime (1.0.2) - mini_portile2 (2.5.0) + mini_portile2 (2.5.1) minitest (5.11.3) nio4r (2.5.7) - nokogiri (1.11.1) + nokogiri (1.11.4) mini_portile2 (~> 2.5.0) racc (~> 1.4) puma (4.3.8) From 934ccbf7b2ae0067747ef26809105e5870f1d786 Mon Sep 17 00:00:00 2001 From: Vicente Ferrer Date: Wed, 19 May 2021 13:40:31 +0200 Subject: [PATCH 2/3] Solve metacallcli-py-tsx test. --- source/cli/metacallcli/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/cli/metacallcli/CMakeLists.txt b/source/cli/metacallcli/CMakeLists.txt index e1ec91a7a..9b8921db2 100644 --- a/source/cli/metacallcli/CMakeLists.txt +++ b/source/cli/metacallcli/CMakeLists.txt @@ -399,7 +399,7 @@ if(OPTION_BUILD_LOADERS AND OPTION_BUILD_LOADERS_TS AND OPTION_BUILD_SCRIPTS AND if(OPTION_BUILD_LOADERS_PY) add_test(NAME ${target}-py-tsx - COMMAND ${TEST_COMMAND} "echo 'load py cli-test-tsx.py\nexit' | $ | ${GREP_COMMAND} \"Hello metaprogrammer\"" + COMMAND ${TEST_COMMAND} "echo 'load py cli-test-tsx.py\nexit' | $ | ${GREP_COMMAND} \"Hello World\"" WORKING_DIRECTORY ${LOADER_SCRIPT_PATH}/templating ) set_property(TEST ${target}-py-tsx From ec4607d6746b279b9d33f35e1130faed1d034aea Mon Sep 17 00:00:00 2001 From: Vicente Ferrer Date: Wed, 19 May 2021 14:54:13 +0200 Subject: [PATCH 3/3] Add traceback for python loading scripts. --- source/loaders/py_loader/source/py_loader_impl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/loaders/py_loader/source/py_loader_impl.c b/source/loaders/py_loader/source/py_loader_impl.c index 1c0981687..7d4f2e7c9 100644 --- a/source/loaders/py_loader/source/py_loader_impl.c +++ b/source/loaders/py_loader/source/py_loader_impl.c @@ -1565,7 +1565,11 @@ int py_loader_impl_initialize_import(loader_impl_py py_impl) " m = importlib.util.module_from_spec(spec)\n" " spec.loader.exec_module(m)\n" " return m\n" + " except ImportError as e:\n" + " return e\n" " except Exception as e:\n" + " import traceback\n" + " print(traceback.format_exc())\n" " return e\n" #elif PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 3 // TODO: Not tested