diff --git a/source/ports/node_port/test/index.js b/source/ports/node_port/test/index.js index bf5b04f4f..8b56c6f2a 100644 --- a/source/ports/node_port/test/index.js +++ b/source/ports/node_port/test/index.js @@ -204,10 +204,10 @@ describe('metacall', () => { assert.strictEqual(py_encode_basestring_ascii('asd'), '"asd"'); }); it('require (py submodule dependency)', () => { - // Require the 'op' submodule from 'fn' Python package - const { foldr, call } = require('fn.op'); + // Require the 'core' submodule from 'rsa' Python package + const { encrypt_int } = require('rsa.core'); - assert.strictEqual(foldr(call, 10)([s => s * s, k => k + 10]), 400); + assert.strictEqual(encrypt_int(3, 2, 5), 4); }); it('require (rb)', () => { const cache = require('./cache.rb'); diff --git a/source/tests/metacall_load_configuration_node_python_test/CMakeLists.txt b/source/tests/metacall_load_configuration_node_python_test/CMakeLists.txt index 5682eb736..79af6a9a9 100644 --- a/source/tests/metacall_load_configuration_node_python_test/CMakeLists.txt +++ b/source/tests/metacall_load_configuration_node_python_test/CMakeLists.txt @@ -96,6 +96,9 @@ target_compile_definitions(${target} PRIVATE ${DEFAULT_COMPILE_DEFINITIONS} + # Python Port path + METACALL_PYTHON_PORT_PATH="${CMAKE_SOURCE_DIR}/source/ports/py_port" + # NodeJS Port path METACALL_NODE_PORT_PATH="${CMAKE_SOURCE_DIR}/source/ports/node_port/index.js" diff --git a/source/tests/metacall_load_configuration_node_python_test/source/metacall_load_configuration_node_python_test.cpp b/source/tests/metacall_load_configuration_node_python_test/source/metacall_load_configuration_node_python_test.cpp index 8e1272351..1957d374e 100644 --- a/source/tests/metacall_load_configuration_node_python_test/source/metacall_load_configuration_node_python_test.cpp +++ b/source/tests/metacall_load_configuration_node_python_test/source/metacall_load_configuration_node_python_test.cpp @@ -34,6 +34,8 @@ TEST_F(metacall_load_configuration_node_python_test, DefaultConstructor) ASSERT_EQ((int)0, (int)metacall_initialize()); + ASSERT_EQ((int)0, (int)metacall_execution_path("py", METACALL_PYTHON_PORT_PATH)); + static const char buffer[] = "const { metacall_load_from_configuration_export } = require('" METACALL_NODE_PORT_PATH "');\n" "const config = metacall_load_from_configuration_export('" METACALL_TEST_CONFIG_PATH "');\n" diff --git a/tools/metacall-environment.ps1 b/tools/metacall-environment.ps1 index 9a2001e5f..0fd276972 100644 --- a/tools/metacall-environment.ps1 +++ b/tools/metacall-environment.ps1 @@ -101,7 +101,6 @@ function sub-python { pip3 install setuptools pip3 install wheel pip3 install rsa - pip3 install fn pip3 install scipy pip3 install numpy pip3 install scikit-learn diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index 622ac9832..99e102806 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -113,7 +113,6 @@ sub_python(){ $SUDO_CMD pip3 install setuptools $SUDO_CMD pip3 install wheel $SUDO_CMD pip3 install rsa - $SUDO_CMD pip3 install fn $SUDO_CMD pip3 install scipy $SUDO_CMD pip3 install numpy $SUDO_CMD pip3 install scikit-learn