Skip to content

Bump axios from 1.7.4 to 1.8.2 #18

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v4

- name: Install mono
run: |
sudo apt-get update
sudo apt-get install -y mono-complete

- name: Restore dependencies
run: |
cd Json_parser
Expand Down
3 changes: 2 additions & 1 deletion Configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ class Configuration:
"2600B",
"2651A",
"2657A",
"2601B-PULSE"
"2601B-PULSE",
"MP5103"
]

MODEL_2600B_MODELS = [
Expand Down
10 changes: 7 additions & 3 deletions Json_parser/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static void parse_commands_josn(string base_lib_dir, string json_file_path)
var factoryScriptCommands = cmdList.Where(cmd => cmd.description.Contains("factory script")).ToList(); // get factoryScriptCommands and remove it, its there for 26xx models
cmdList = cmdList.Except(factoryScriptCommands).ToList(); // remove all factoryScriptCommands commands

var directFunctioncommands = cmdList.Where(cmd => !cmd.name.Contains('.')).ToList();
var directFunctioncommands = cmdList.Where(cmd => !cmd.name.Contains('.') && !cmd.name.Contains(':')).ToList();
cmdList = cmdList.Except(directFunctioncommands).ToList(); // remove all directFunctioncommands commands and handle it speratley


Expand Down Expand Up @@ -107,9 +107,9 @@ static void parse_commands_josn(string base_lib_dir, string json_file_path)
}
}

outStr += "---@class io_object\nlocal io_object={}\n---@class scriptVar\nlocal scriptVar={}\n---@class eventID\n\n---@class file_object\nlocal file_object ={}\n\n"; //PRIV
outStr += "---@class io_object\nlocal io_object={}\n---@class scriptVar\nlocal scriptVar={}\n---@class fileVar\nlocal fileVar={}\n---@class eventID\n\n---@class file_object\nlocal file_object ={}\n\n"; //PRIV
outStr += "---@class bufferVar\nlocal bufferVar={}\n";
outStr += "---@class digio\n local digio = {}\n\n---@class tsplink\n local tsplink = {}\n\n---@class lan\n local lan = {}\n\n---@class tspnetConnectionID\nlocal tspnetConnectionID = {}\n\n ---@class promptID\nlocal promptID = {}\n\n";
outStr += "---@class tspnetConnectionID\nlocal tspnetConnectionID = {}\n\n ---@class promptID\nlocal promptID = {}\n\n";

var tsplinkStr = "";
tsplinkStr = outStr;
Expand Down Expand Up @@ -177,6 +177,10 @@ static void parse_commands_josn(string base_lib_dir, string json_file_path)
{
// Add specific handling for 37 models if needed
}
else if (file_name.Contains("MP5103"))
{
// Add specific handling for 37 models if needed
}
else // for tti models
{
outStr += get_def_buffer_definations();
Expand Down
23 changes: 17 additions & 6 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,29 @@ def parse_web_help_files(webHelpFoldersDir):

def parse():
description_list = []

if(str(Configuration.MODEL_NUMBER).find("26")!= -1):#2600
file_path = os.path.join("resources","2600","26xx-command_param_data_type.txt")

#2600
if(str(Configuration.MODEL_NUMBER).find("26")!= -1):
file_path = os.path.join("resources","2600","command_param_data_type.txt")
Configuration.PARAMS_TYPES_DETAILS = cmd_param.getParamTypeDetails(file_path)
file_path = os.path.join("resources","2600","manually_extracted_cmd_and_enums.json")
Configuration.MANUALLY_EXTRACTED_COMMANDS = HelperFunctions.parse_manual_json(file_path)

else:#tti

elif(str(Configuration.MODEL_NUMBER).find("MP5103")!= -1):

file_path = os.path.join("resources","trebuchet","manually_extracted_cmd_and_enums.json")
# get static enums types
Configuration.MANUALLY_EXTRACTED_COMMANDS = HelperFunctions.parse_manual_json(file_path)
file_path = os.path.join("resources","trebuchet","command_param_data_type.txt")
Configuration.PARAMS_TYPES_DETAILS = cmd_param.getParamTypeDetails(file_path)


#tti
else:
file_path = os.path.join("resources","tti","manually_extracted_cmd_and_enums.json")
# get static enums types
Configuration.MANUALLY_EXTRACTED_COMMANDS = HelperFunctions.parse_manual_json(file_path)
file_path = os.path.join("resources","tti","tti-command_param_data_type.txt")
file_path = os.path.join("resources","tti","command_param_data_type.txt")
Configuration.PARAMS_TYPES_DETAILS = cmd_param.getParamTypeDetails(file_path)


Expand Down
24 changes: 13 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tektronix/keithley_instrument_libraries",
"version": "0.18.4",
"version": "0.19.0",
"description": "",
"main": "index.js",
"scripts": {
Expand All @@ -20,10 +20,10 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@tektronix/web-help-documents": "0.18.0",
"@tektronix/web-help-documents": "0.19.0",
"@octokit/rest": "20.1.1",
"@types/node-fetch": "^2.6.11",
"axios": "1.7.4",
"axios": "1.8.2",
"decompress": "^4.2.1"
},
"dependencies": {
Expand Down
Loading
Loading