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.

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

Release staging 24.03 #24

Merged
merged 46 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
44bd1a8
issue5: add support to parameter waitComplete in rundataproduct
IslaLi Mar 11, 2024
1731231
issue5: set waitComplete default value to true
IslaLi Mar 11, 2024
6a5ff03
issue-8: fixed never reached branch and update error response exceptions
IslaLi Mar 13, 2024
162ad59
issue7: rewrite test suites
IslaLi Mar 22, 2024
39d4a0f
issue7: Modify tests so that can be run with matlab's unittest librar…
IslaLi Mar 25, 2024
2bbede4
issue7: Remove, modify and add util files for testing as needed
IslaLi Mar 25, 2024
da4495e
issue8: Clean up codes
IslaLi Mar 25, 2024
2bdca37
issue5: Modify documentation
IslaLi Mar 25, 2024
8226e7e
Merge pull request #6 from OceanNetworksCanada/issue-5-support-waitco…
IslaLi Mar 25, 2024
130d2b7
Merge pull request #9 from OceanNetworksCanada/issue-8-modify-never-r…
IslaL Mar 25, 2024
f8543d9
remove commented line
IslaL Mar 26, 2024
838ad49
issue4: set up MATLAB workflow
IslaL Mar 26, 2024
179f8d6
Update variable name line to token, TOKEN_STRING to TOKEN
IslaL Mar 26, 2024
ac7fd85
Update variable name TOKEN_STRING to TOKEN
IslaL Mar 26, 2024
5744a10
Merge pull request #13 from OceanNetworksCanada/issue-4-set-up-workflow
IslaL Mar 26, 2024
0294950
Update globals.m to make sure it saves config file in the correct folder
IslaL Mar 26, 2024
e8e11b5
Merge pull request #12 from OceanNetworksCanada/issue-7-re-write-test…
IslaL Mar 26, 2024
7bf5cd7
issue-8: fixed minor bugs found when testing
IslaL Mar 28, 2024
94cf713
issue-16: fix download bug in data product delivery
IslaL Apr 8, 2024
6c46f9c
issue-4: update workflow to test before merge to release branches as …
IslaL Apr 8, 2024
876dad0
Merge pull request #17 from OceanNetworksCanada/issue-4-set-up-workfl…
IslaL Apr 9, 2024
5af504e
issue-14: remove commented lines
IslaL Apr 9, 2024
b2901d0
Merge pull request #15 from OceanNetworksCanada/issue-14-fix-minor-bu…
IslaL Apr 9, 2024
f0b79e6
Merge branch 'release-staging-24.03' into 16-fix-download-issue-occur…
IslaL Apr 11, 2024
459c14e
issue-11: Implement restart, cancel, and status functions and add tests
IslaL Apr 11, 2024
f2eddac
issue-16: Replaced util function with built-in function fileparts
IslaL Apr 18, 2024
cd76c88
Merge pull request #18 from OceanNetworksCanada/16-fix-download-issue…
IslaL Apr 18, 2024
8f94aab
issue-11: update oncEnv from logical values to char
IslaL Apr 19, 2024
2a8c3dc
issue-11: add back util function is_failed_response
IslaL Apr 22, 2024
daf2ece
issue-11: add success and failure messages
IslaL Apr 23, 2024
94c9daf
add new line characters
IslaL Apr 23, 2024
3789819
Merge pull request #19 from OceanNetworksCanada/issue-11-support-new-…
IslaL Apr 23, 2024
5b68f27
issue-20: documentation for each service
IslaL May 8, 2024
f0465f7
issue-21: Add version check function and update initializer to run ch…
IslaL Jun 10, 2024
dc147b1
issue-20: add documentation files
IslaL Jun 13, 2024
343b3bb
issue-20: add example files
IslaL Jun 13, 2024
e78e3fd
issue-21: update checkVersion to return nothing
IslaL Jun 14, 2024
c42e6cd
issue-20: update filename for consistency
IslaL Jun 14, 2024
de57a23
issue-20: modify documentation
IslaL Jun 17, 2024
a94ed71
issue-20: update name to ONC for convenience
IslaL Jun 18, 2024
01ad33c
issue-21: fix typos and add links to documentation
IslaL Jun 18, 2024
1268ee7
issue-20: code review changes
bbiffard Jun 28, 2024
e2c6dab
issue-21: minor review changes
bbiffard Jun 28, 2024
dd3b1ed
Update README.md
IslaLi Jun 28, 2024
4d2acad
Merge pull request #23 from OceanNetworksCanada/issue-20-add-document…
IslaLi Jun 28, 2024
7c0d194
Merge pull request #22 from OceanNetworksCanada/issue-21-add-version-…
IslaLi Jun 28, 2024
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
41 changes: 41 additions & 0 deletions .github/workflows/matlab.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Run MATLAB Tests

on:
pull_request:
branches:
- 'main'
- 'release-staging-*'
push:
branches:
- 'main'
- 'release-staging-*'
workflow_dispatch:

jobs:
tests:
name: MATLAB Test
runs-on: ${{ matrix.os }}
strategy:
matrix:
matlab: ["R2022b"]
os: [ubuntu-latest, windows-latest]
env:
MLM_LICENSE_FILE: ${{ secrets.MATLAB_LICENSE }}
steps:
- name: Check out repository
uses: actions/checkout@main

- name: Set up MATLAB
uses: matlab-actions/setup-matlab@v2
with:
release: ${{ matrix.matlab }}
cache: true

- name: Run tests
uses: matlab-actions/run-tests@v2
with:
source-folder: 'onc'
env:
TOKEN: ${{ secrets.TOKEN }}
ONC_ENV: 'prod'

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
[![View Ocean Networks Canada API Client Library on File Exchange](https://www.mathworks.com/matlabcentral/images/matlab-file-exchange.svg)](https://www.mathworks.com/matlabcentral/fileexchange/74065-ocean-networks-canada-api-client-library)

This library facilitates access to scientific data hosted by [Ocean Networks Canada](https://oceannetworks.ca) through the
[Oceans 2.0 API](https://wiki.oceannetworks.ca/display/O2A/Oceans+2.0+API+Home) public web services.
[Oceans 3.0 API](https://wiki.oceannetworks.ca/display/O2A/Oceans+3.0+API+Home) public web services.

This repository is synchronized to the [MATLAB ONC API Client Add-On](https://www.mathworks.com/matlabcentral/fileexchange/74065-ocean-networks-canada-api-client-library) which can be installed from the MATLAB Add-on explorer (please search for the "onc" Add-on).

## Documentation

For complete documentation and examples, visit https://wiki.oceannetworks.ca/display/O2A/Client+Libraries
For complete documentation and examples, visit [ONC File Exchange](https://www.mathworks.com/matlabcentral/fileexchange/74065-ocean-networks-canada-api-client-library)


## Maintainers
Expand Down
Binary file added doc/AddOn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
84 changes: 84 additions & 0 deletions doc/ExampleLinks.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<!DOCTYPE html
PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<!--
This HTML was auto-generated from MATLAB code.
To make changes, update the MATLAB code and republish this document.
--><title>Ocean Networks Canada API Client Library</title><meta name="generator" content="MATLAB 9.13"><link rel="schema.DC" href="http://purl.org/dc/elements/1.1/"><meta name="DC.date" content="2024-05-08"><meta name="DC.source" content="Onc.m"><style type="text/css">
html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-size:100%;vertical-align:baseline;background:transparent}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}:focus{outine:0}ins{text-decoration:none}del{text-decoration:line-through}table{border-collapse:collapse;border-spacing:0}

html { min-height:100%; margin-bottom:1px; }
html body { height:100%; margin:0px; font-family:Arial, Helvetica, sans-serif; font-size:14px; color:#000; line-height:140%; background:#fff none; overflow-y:scroll; }
html body td { vertical-align:top; text-align:left; }

h1 { padding:0px; margin:0px 0px 25px; font-family:Arial, Helvetica, sans-serif; font-size:2.0em; color:#d55000; line-height:100%; font-weight:bold; }
h2 { padding:0px; margin:0px 0px 8px; font-family:Arial, Helvetica, sans-serif; font-size:1.4em; color:#000; font-weight:bold; line-height:140%; border-bottom:1px solid #d6d4d4; display:block; }
h3 { padding:0px; margin:0px 0px 5px; font-family:Arial, Helvetica, sans-serif; font-size:1.3em; color:#000; font-weight:bold; line-height:140%; }

a { color:#005fce; text-decoration:none; }
a:hover { color:#005fce; text-decoration:underline; }
a:visited { color:#004aa0; text-decoration:none; }

p { padding:0px; margin:0px 0px 20px; }
img { padding:0px; margin:0px 0px 20px; border:none; max-width: 1000px;}
p img, pre img, tt img, li img, h1 img, h2 img { margin-bottom:0px; }

ul { padding:0px; margin:0px 0px 20px 23px; list-style:square; }
ul li { padding:0px; margin:0px 0px 7px 0px; }
ul li ul { padding:5px 0px 0px; margin:0px 0px 7px 23px; }
ul li ol li { list-style:decimal; }
ol { padding:0px; margin:0px 0px 20px 0px; list-style:decimal; }
ol li { padding:0px; margin:0px 0px 7px 23px; list-style-type:decimal; }
ol li ol { padding:5px 0px 0px; margin:0px 0px 7px 0px; }
ol li ol li { list-style-type:lower-alpha; }
ol li ul { padding-top:7px; }
ol li ul li { list-style:square; }

.content { font-size:14px; line-height:140%; padding: 20px; }

pre, code { font-size:14px; }
tt { font-size: 1.2em; }
pre { margin:0px 0px 20px; }
pre.codeinput { padding:10px; border:1px solid #d3d3d3; background:#f7f7f7; }
pre.codeoutput { padding:10px 11px; margin:0px 0px 2px; color:#4c4c4c; }
pre.error { color:red; }

@media print { pre.codeinput, pre.codeoutput { word-wrap:break-word; width:100%; } }

span.keyword { color:#0000FF }
span.comment { color:#228B22 }
span.string { color:#A020F0 }
span.untermstring { color:#B20000 }
span.syscmd { color:#B28C00 }
span.typesection { color:#A0522D }

.footer { width:auto; padding:10px 0px; margin:25px 0px 0px; border-top:1px dotted #878787; font-size:0.8em; line-height:140%; font-style:italic; color:#878787; text-align:left; float:none; }
.footer p { margin:0px; }
.footer a { color:#878787; }
.footer a:hover { color:#878787; text-decoration:underline; }
.footer a:visited { color:#878787; }

table th { padding:7px 5px; text-align:left; vertical-align:middle; border: 1px solid #d6d4d4; font-weight:bold; }
table td { padding:7px 5px; text-align:left; vertical-align:top; border:1px solid #d6d4d4; }

</style></head>
<body><div class="content">
<h1>Example/LiveScript Links</Script></h1>
<h2>Contents</h2>
<p><b>These links will only work when you open this page in MATLAB's 'doc' viewer.</b></p>
<div>
<ul>
<li><a href="matlab:open('onc/examples/OncDiscoveryLocations.mlx')">Discovery service examples - Locations</a></li>
<li><a href="matlab:open('onc/examples/OncDiscoveryDevices.mlx')">Discovery service examples - Devices</a></li>
<li><a href="matlab:open('onc/examples/OncDiscoveryProperties.mlx')">Discovery service examples - Properties</a></li>
<li><a href="matlab:open('onc/examples/OncDiscoveryDeviceCategories.mlx')">Discovery service examples - Device Categories</a></li>
<li><a href="matlab:open('onc/examples/OncDiscoveryDataProducts.mlx')">Discovery service examples - Data Products</a></li>
<li><a href="matlab:open('onc/examples/OncDiscoveryDeployments.mlx')">Discovery service examples - Deployments</a></li>
<li><a href="matlab:open('onc/examples/OncDeliveryDataProducts.mlx')">Delivery service examples</a></li>
<li><a href="matlab:open('onc/examples/OncArchive.mlx')">Archive File service examples</a></li>
<li><a href="matlab:open('onc/examples/OncRealTime.mlx')">Near Real-time service examples</a></li>
</ul>
</div>
<p class="footer"><br>Copyright 2024, ONC Data Team.<br></p></div>
</body></html>
Loading
Loading