From 5f2962fcbe5034b0038607399364cd7dd0ba1862 Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Tue, 7 Nov 2023 14:38:32 -0800 Subject: [PATCH 1/3] Update ci.yml --- .github/workflows/ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec36e7a80..5c8abb8b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,6 +52,13 @@ jobs: runtime-ref: ${{ github.ref }} compiler-ref: ${{ needs.fetch-lf.outputs.ref }} + lf-python: + needs: fetch-lf + uses: lf-lang/lingua-franca/.github/workflows/py-tests.yml@master + with: + reactor-c-ref: ${{ github.ref }} + compiler-ref: ${{ needs.fetch-lf.outputs.ref }} + lf-gedf-np: needs: fetch-lf uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master From 1c68de48b6e0a46064d4ab28c862cad3ac89725c Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Tue, 7 Nov 2023 14:41:55 -0800 Subject: [PATCH 2/3] Point lingua-franca-ref to master --- lingua-franca-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt index c8ed1b5d2..1f7391f92 100644 --- a/lingua-franca-ref.txt +++ b/lingua-franca-ref.txt @@ -1 +1 @@ -decentralized-small-delay-bugfix +master From 261b405b456f833f1efedd16152e9a2b080edf08 Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Tue, 7 Nov 2023 16:17:31 -0800 Subject: [PATCH 3/3] Revert "Merge pull request #293 from jackyk02/main" This reverts commit eab52f47db2a8b5c03ca2ab5509411a281c7f872, reversing changes made to 654fa0cbff6510787d5a146672eba8f868b2464c. --- python/lib/pythontarget.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/lib/pythontarget.c b/python/lib/pythontarget.c index 77dcdebcf..47baa685a 100644 --- a/python/lib/pythontarget.c +++ b/python/lib/pythontarget.c @@ -437,7 +437,7 @@ void destroy_action_capsule(PyObject* capsule) { PyObject* convert_C_port_to_py(void* port, int width) { // Create the port struct in Python PyObject* cap = - (PyObject*)PyObject_New(generic_port_capsule_struct, &py_port_capsule_t); + (PyObject*)PyObject_GC_New(generic_port_capsule_struct, &py_port_capsule_t); if (cap == NULL) { lf_print_error_and_exit("Failed to convert port."); } @@ -506,7 +506,7 @@ PyObject* convert_C_action_to_py(void* action) { trigger_t* trigger = ((lf_action_base_t*)action)->trigger; // Create the action struct in Python - PyObject* cap = (PyObject*)PyObject_New(generic_action_capsule_struct, &py_action_capsule_t); + PyObject* cap = (PyObject*)PyObject_GC_New(generic_action_capsule_struct, &py_action_capsule_t); if (cap == NULL) { lf_print_error_and_exit("Failed to convert action."); }