Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python 3.11 support #1902

Closed
wants to merge 14 commits into from
Closed

Python 3.11 support #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c17f511
Removed redundant include statements
edwardalee Jul 13, 2023
c787a0c
include Python.h before other includes
edwardalee Jul 13, 2023
ddcb6a9
Align to python-11 reactor-c branch
edwardalee Jul 13, 2023
f395648
Require Python 3.11
edwardalee Jul 15, 2023
3bc9562
Update py-tests.yml
lhstrh Jul 15, 2023
dbbb809
Avoid segfault on invalid python code in reaction
edwardalee Jul 19, 2023
f0566b9
remove commented out code
cmnrd Jul 26, 2023
7d925ff
Merge branch 'master' into python-11
cmnrd Jul 26, 2023
0d5b0e2
test both Python 3.10 and 3.11
cmnrd Jul 26, 2023
c891a2d
Merge branch 'master' into python-11
edwardalee Oct 5, 2023
ca303b0
Resolve conflict
lhstrh Oct 17, 2023
74ebd1f
Merge branch 'master' into python-11
edwardalee Oct 21, 2023
c276b51
Align reactor-c
edwardalee Oct 21, 2023
e12a699
Merge branch 'master' into python-11
lhstrh Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/py-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
strategy:
matrix:
platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
python-version: ${{ (inputs.all-platforms && fromJSON('["3.10", "3.11"]')) || fromJSON('["3.11"]') }}
runs-on: ${{ matrix.platform }}
steps:
- name: Check out lingua-franca repository
Expand All @@ -39,7 +40,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: ${{ matrix.python-version }}
- name: Install dependencies OS X
run: |
brew install coreutils
Expand Down
5 changes: 1 addition & 4 deletions core/src/main/java/org/lflang/generator/python/PythonGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,9 +480,6 @@ protected void generateUserPreamblesForReactor(Reactor reactor, CodeBuilder src)
@Override
protected void generateReactorClassHeaders(
TypeParameterizedReactor tpr, String headerName, CodeBuilder header, CodeBuilder src) {
header.pr(
PythonPreambleGenerator.generateCIncludeStatements(
targetConfig, targetLanguageIsCpp(), hasModalReactors));
super.generateReactorClassHeaders(tpr, headerName, header, src);
}

Expand Down Expand Up @@ -569,7 +566,7 @@ private static String setUpMainTarget(
add_subdirectory(core)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR})
set(LF_MAIN_TARGET <pyModuleName>)
find_package(Python 3.10.0...<3.11.0 REQUIRED COMPONENTS Interpreter Development)
find_package(Python 3.10.0...<3.12.0 REQUIRED COMPONENTS Interpreter Development)
Python_add_library(
${LF_MAIN_TARGET}
MODULE
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/lflang/generator/python/PythonPreambleGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ public static String generateCDefineDirectives(
public static String generateCIncludeStatements(
TargetConfig targetConfig, boolean CCppMode, boolean hasModalReactors) {
CodeBuilder code = new CodeBuilder();
code.pr(CPreambleGenerator.generateIncludeStatements(targetConfig, CCppMode));
code.pr("#include \"pythontarget.h\"");
code.pr(CPreambleGenerator.generateIncludeStatements(targetConfig, CCppMode));
if (hasModalReactors) {
code.pr("#include \"include/modal_models/definitions.h\"");
}
Expand Down
1 change: 0 additions & 1 deletion core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ private static String generateCPythonFunctionCaller(
+ " code again",
" }",
" " + PyUtil.generateGILReleaseCode(),
" Py_FinalizeEx();",
" exit(1);",
"}",
"",
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/c/reactor-c
Open in desktop
Submodule reactor-c updated 4 files
+12 −3 core/platform/lf_unix_clock_support.c
+10 −1 include/core/platform/lf_linux_support.h
+1 −1 lingua-franca-ref.txt
+2 −2 python/lib/pythontarget.c
Loading