Skip to content

Commit ba91cfe

Browse files
committed
R2026b maintenance update
1 parent 1897268 commit ba91cfe

467 files changed

Lines changed: 5601 additions & 309 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ name: MATLAB CI and Pages
3838
# FOR YOUR OWN COURSEWARE:
3939
# 1. Copy buildfile.m and SoftwareTests/ structure to your repo
4040
# 2. Create SoftwareTests/CoursewareSmokeTests.m with your own test suite
41-
# (reference: https://www.mathworks.com/help/matlab/matlab_prog/write-simple-test-suite.html)
41+
# (reference: https://www.mathworks.com/help/matlab/matlab_prog/write-simple-test-case-with-functions.html)
4242
# 3. Update .github/workflows/ci.yml with your product list and release matrix
4343
# 4. Push to your release branch and monitor GitHub Actions
4444
#
@@ -76,10 +76,17 @@ jobs:
7676
strategy:
7777
fail-fast: false
7878
matrix:
79-
Releases: [R2025b, R2026a]
79+
Releases: [R2026a, R2026b]
8080
runs-on: ubuntu-latest
8181
env:
8282
MATLAB_PRODUCTS: Symbolic_Math_Toolbox
83+
# List required products above in the format shown (and uncomment them)
84+
# Common products:
85+
# Simulink
86+
# Simscape
87+
# Statistics_and_Machine_Learning_Toolbox
88+
# Symbolic_Math_Toolbox
89+
# Deep_Learning_Toolbox
8390
LD_PRELOAD: /usr/lib/x86_64-linux-gnu/libstdc++.so.6
8491
steps:
8592
# Checks-out your repository
@@ -166,11 +173,14 @@ jobs:
166173

167174
# Deploy reports to GitHub pages
168175
- name: Setup Pages
176+
if: ${{ always() && github.event_name != 'pull_request' }}
169177
uses: actions/configure-pages@v5
170178
- name: Upload pages artifact
179+
if: ${{ always() && github.event_name != 'pull_request' }}
171180
uses: actions/upload-pages-artifact@v3
172181
with:
173182
path: public
174183
- name: Deploy to GitHub Pages
184+
if: ${{ always() && github.event_name != 'pull_request' }}
175185
id: deployment
176186
uses: actions/deploy-pages@v4

‎.gitignore‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,16 @@ codegen/
4444
# Cache files
4545
*.slxc
4646

47-
# Project settings
48-
Utilities/ProjectSettings.mat
49-
5047
# Testing and CI related artifact
5148
public/
5249
.buildtool/
5350
ci_utilities/
5451

55-
# Prevent accidentally committing your API key
56-
myAPIkey.txt
52+
# AI Tooling
53+
.playwright-mcp/
5754

58-
# Live Task Repository
55+
# Module-specific Python resources
56+
myAPIkey.txt
5957
MATLAB-Live-Task-for-Python
60-
61-
# Ignore Python cache
6258
Scripts/__pycache__/
63-
InstructorResources/Solutions/__pycache__/
59+
InstructorResources/Solutions/__pycache__/

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ stages:
77
test-matrix:
88
parallel:
99
matrix:
10-
- VERSION: [R2025b,R2026a]
10+
- VERSION: [R2026a,R2026b]
1111
tags:
1212
- training
1313
- windows
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
function flag = CheckPythonVersion(opts)
2+
arguments
3+
opts.Flag (1,1) string {mustBeMember(opts.Flag,["SetupScript" "ProjectScript"])}="SetupScript"
4+
end
5+
% The flag is to check whether this script is registering a planned-for
6+
% Python version. If the Python is recognized, flag = true, if the Python
7+
% version is nonexistent or not recognized flag = false.
8+
flag = true;
9+
if isempty(pyenv().Version) || pyenv().Version == ""
10+
flag = false;
11+
disp("Python is not installed.")
12+
web("https://www.mathworks.com/help/matlab/matlab_external/install-supported-python-implementation.html")
13+
return
14+
else
15+
pyVersion = pyenv().Version;
16+
end
17+
18+
disp("You are running Python " + pyVersion)
19+
if pyenv().Status == "Loaded"
20+
disp("Python was already on your MATLAB path.")
21+
else
22+
addpath(pyenv().Home)
23+
disp("Python has been added to your MATLAB path.")
24+
end
25+
26+
if extractBefore(pyVersion,".") == "2"
27+
if pyVersion == "2.7" && isMATLABReleaseOlderThan("R2023a") && opts.Flag == "SetupScript"
28+
disp("You can run Python code in this script, but you cannot complete the project unless you have Python 3.8 or 3.9")
29+
else
30+
disp("This version of Python is not supported. Please see ")
31+
web("https://www.mathworks.com/help/matlab/matlab_external/install-supported-python-implementation.html")
32+
end
33+
else
34+
x = extractAfter(pyVersion,".");
35+
if double(x) < 8
36+
disp("This Python version might work, but it has not been tested.")
37+
elseif x == "8"
38+
CheckPythonAndMATLABCompatibility("R2020b",End="R2023b")
39+
elseif x == "9"
40+
CheckPythonAndMATLABCompatibility("R2021b",End="R2025b")
41+
elseif x == "10"
42+
CheckPythonAndMATLABCompatibility("R2022b",End="R2026b")
43+
elseif x == "11"
44+
CheckPythonAndMATLABCompatibility("R2024a")
45+
elseif x == "12"
46+
CheckPythonAndMATLABCompatibility("R2024b")
47+
elseif x == "13"
48+
CheckPythonAndMATLABCompatibility("R2025b")
49+
elseif x == "14"
50+
CheckPythonAndMATLABCompatibility("R2026b")
51+
elseif double(x) > 13
52+
flag = false;
53+
disp("This Python version should work, but it has not been tested on this courseware.")
54+
web("https://www.mathworks.com/support/requirements/python-compatibility.html")
55+
else
56+
flag = false;
57+
disp("This Python version might work, but it has not been tested on this courseware.")
58+
web("https://www.mathworks.com/support/requirements/python-compatibility.html")
59+
end
60+
end
61+
end
62+
63+
%%
64+
function CheckPythonAndMATLABCompatibility(ver1,opts)
65+
arguments
66+
ver1 (1,1) string
67+
opts.End (1,1) string = "unknown"
68+
end
69+
if isMATLABReleaseOlderThan(ver1)
70+
disp("Your Python version is fine, but you need to update your MATLAB version to allow them to work together.")
71+
web("https://www.mathworks.com/support/requirements/python-compatibility.html")
72+
web("https://www.mathworks.com/help/install/ug/get-new-matlab-release.html")
73+
elseif opts.End == "unknown" || isMATLABReleaseOlderThan(opts.End)
74+
disp("You are running compatible versions of MATLAB and Python.")
75+
else
76+
disp("Please update your Python version to be compatible with this MATLAB release.")
77+
disp("Please follow the instructions in the documentation to proceed with this script.")
78+
web("https://www.mathworks.com/content/dam/mathworks/mathworks-dot-com/support/sysreq/files/python-compatibility.pdf")
79+
web("https://www.mathworks.com/help/matlab/matlab_external/install-supported-python-implementation.html")
80+
end
81+
end
82+
83+
%[appendix]{"version":"1.0"}
84+
%---

‎Images/AddCallbackFromContextMenu.m‎

Lines changed: 14 additions & 0 deletions
Large diffs are not rendered by default.

‎Images/AddCallbackInComponentBrowser.m‎

Lines changed: 14 additions & 0 deletions
Large diffs are not rendered by default.

‎Images/AddFunction.m‎

Lines changed: 14 additions & 0 deletions
Large diffs are not rendered by default.

‎Images/AddMultipleComponentsToApp.m‎

Lines changed: 14 additions & 0 deletions
Large diffs are not rendered by default.

‎Images/AddProperty.m‎

Lines changed: 14 additions & 0 deletions
Large diffs are not rendered by default.

‎Images/MailIcon.png‎

284 Bytes
Loading

0 commit comments

Comments
 (0)