Skip to content

Commit 12021e7

Browse files
committed
Maintenance for R2025b
* Update to new startup app * Improve ci.yml * Standardize project details * Remove reference to emailing for solutions in README as the solutions are included in Instructor Resources * Update identity as the MathWorks Educator Content Development team
1 parent dc3d99f commit 12021e7

File tree

116 files changed

+439
-282
lines changed

Some content is hidden

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

116 files changed

+439
-282
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
MATLABVersion: [R2024a,R2024b]
22+
MATLABVersion: [R2024b,R2025a,R2025b]
2323
runs-on: ubuntu-latest
24+
env:
25+
LD_PRELOAD: /usr/lib/x86_64-linux-gnu/libstdc++.so.6
2426
steps:
2527
# Checks-out your repository
2628
- uses: actions/checkout@v4
@@ -38,9 +40,7 @@ jobs:
3840
uses: matlab-actions/setup-matlab@v2
3941
with:
4042
release: ${{ matrix.MATLABVersion }}
41-
products: >
42-
Symbolic_Math_Toolbox
43-
# Simulink Statistics_and_Machine_Learning_Toolbox
43+
products: # Simulink Statistics_and_Machine_Learning_Toolbox
4444
# List required products above in the format shown (and uncomment them)
4545
# List of product strings:
4646
# Simulink

.gitlab-ci.yml

Lines changed: 0 additions & 98 deletions
This file was deleted.

.vs/ProjectSettings.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

.vs/slnx.sqlite

-96 KB
Binary file not shown.

FunctionLibrary/.gitkeep

Whitespace-only changes.

MainMenu.mlx

-7 Bytes
Binary file not shown.

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
# <span style="color:rgb(213,80,0)">Programming: A Starter Project Using MATLAB with Python</span>
33

4+
Learn how to call Python code, convert data types and units, and use App Designer to build an app to display your results.
45

56
[![View on File Exchange](https://www.mathworks.com/matlabcentral/images/matlab-file-exchange.svg)](https://www.mathworks.com/matlabcentral/fileexchange/116490-programming-a-starter-project-using-matlab-and-python) or [![Open in MATLAB Online](https://www.mathworks.com/images/responsive/global/open-in-matlab-online.svg)](https://matlab.mathworks.com/open/github/v1?repo=MathWorks-Teaching-Resources/Programming-A-Starter-Project-Using-MATLAB-and-Python&project=MATLABwithPython.prj&file=README.mlx)
67

@@ -28,7 +29,7 @@ The instructions inside the live scripts will guide you through the exercises an
2829

2930
## Contact Us
3031

31-
Solutions are available upon instructor request. Contact the [MathWorks teaching resources team](mailto:[email protected]) if you would like to request solutions, provide feedback, or if you have a question.
32+
Contact the [MathWorks Educator Content Development Team](mailto:[email protected]) if you would like to request assistance, provide feedback, or if you have a question.
3233

3334

3435
## Prerequisites
@@ -97,20 +98,20 @@ The license for this module is available in the [LICENSE.md](https://github.com/
9798
| | | |
9899

99100

100-
Or feel free to explore our other [modular courseware content](https://www.mathworks.com/matlabcentral/fileexchange/?q=tag%3A%22courseware+module%22&sort=downloads_desc_30d).
101+
Or feel free to explore our other [modular courseware content](https://www.mathworks.com/matlabcentral/fileexchange/?q=author%3A%22MathWorks+Educator+Content+Development+Team%22&sort=relevancy).
101102

102103
# Educator Resources
103104
- [Educator Page](https://www.mathworks.com/academia/educators.html)
104105

105106
# Contribute
106107

107-
Looking for more? Find an issue? Have a suggestion? Please contact the [MathWorks teaching resources team](mailto:%[email protected]). If you want to contribute directly to this project, you can find information about how to do so in the [CONTRIBUTING.md](https://github.com/MathWorks-Teaching-Resources/Programming-A-Starter-Project-Using-MATLAB-and-Python/blob/release/CONTRIBUTING.md) page on GitHub.
108+
Looking for more? Find an issue? Have a suggestion? Please contact the [MathWorks Educator Content Development team](mailto:%[email protected]). If you want to contribute directly to this project, you can find information about how to do so in the [CONTRIBUTING.md](https://github.com/MathWorks-Teaching-Resources/Programming-A-Starter-Project-Using-MATLAB-and-Python/blob/release/CONTRIBUTING.md) page on GitHub.
108109

109110
# Acknowledgments
110111

111112
Many thanks to Blake Naccarato on his suggestions for improvement.
112113

113114

114-
*©* Copyright 2024 The MathWorks™, Inc
115+
*©* Copyright 2025 The MathWorks, Inc
116+
115117

116-

README.mlx

-3 Bytes
Binary file not shown.

SoftwareTests/PostSmokeTest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function PostSmokeTest(ShowReport)
3232
% Format the results in a table and save them
3333
Results = table(Results');
3434
Version = extractBetween(string(Results.Name),"Version=",")");
35-
Passed = Results.Passed;
35+
Passed = logical(Results.Passed);
3636

3737
% Add link to other report
3838
File = fileread(fullfile("public","index.html"));
@@ -51,7 +51,7 @@ function PostSmokeTest(ShowReport)
5151
Badge.message = join("R"+Version," | ");
5252
elseif any(Passed)
5353
Badge.color = "yellowgreen";
54-
Badge.message = join("R")
54+
Badge.message = join("R"+Version(Passed)," | ");
5555
elseif all(~Passed)
5656
Badge.color = "critical";
5757
Badge.message = join("R"+Version," | ");

SoftwareTests/SmokeTests.m

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
function File = RetrieveFile(Project) %#ok<INUSD>
1919
% Retrieve student template files:
2020
RootFolder = currentProject().RootFolder;
21-
File = dir(fullfile(RootFolder,"Scripts","*.mlx"));
21+
File = dir(fullfile(RootFolder,"Scripts","*.m"));
22+
File = [File; dir(fullfile(RootFolder,"Scripts","*.mlx"))];
2223
File = {File.name};
2324
end
2425

@@ -117,7 +118,7 @@ function SmokeRun(testCase,File)
117118
methods (Access = private)
118119

119120
function Path = CheckPreFile(testCase,Filename)
120-
PreFile = "Pre"+replace(Filename,".mlx",".m");
121+
PreFile = "Pre"+extractBefore(Filename,".m")+".m";
121122
PreFilePath = fullfile(testCase.RootFolder,"SoftwareTests","PreFiles",PreFile);
122123
if ~isfolder(fullfile(testCase.RootFolder,"SoftwareTests/PreFiles"))
123124
mkdir(fullfile(testCase.RootFolder,"SoftwareTests/PreFiles"))
@@ -133,7 +134,7 @@ function SmokeRun(testCase,File)
133134
end
134135

135136
function Path = CheckPostFile(testCase,Filename)
136-
PostFile = "Post"+replace(Filename,".mlx",".m");
137+
PostFile = "Post"+extractBefore(Filename,".m")+".m";
137138
PostFilePath = fullfile(testCase.RootFolder,"SoftwareTests","PostFiles",PostFile);
138139
if ~isfolder(fullfile(testCase.RootFolder,"SoftwareTests/PostFiles"))
139140
mkdir(fullfile(testCase.RootFolder,"SoftwareTests/PostFiles"))

0 commit comments

Comments
 (0)