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

Py suite #1730

Merged
merged 3 commits into from
Dec 4, 2024
Merged

Py suite #1730

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd74760
Allow suites to use import
jmthomas Dec 3, 2024
0011e6c
overflow-x: hidden for all admin tabs
jmthomas Dec 3, 2024
41aadc5
Merge branch 'main' into py_suite
jmthomas Dec 4, 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
2 changes: 1 addition & 1 deletion openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/lib/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
class Helper:
def help(self):
def print_help(self):
print("help")
2 changes: 1 addition & 1 deletion openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/procedures/collect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from INST2.lib.helper import Helper

helper = Helper()
helper.help()
helper.print_help()

number = ask("Enter a number.")
if not isinstance(number, (int, float)):
Expand Down
4 changes: 4 additions & 0 deletions ...smos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/procedures/my_script_suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from openc3.script.suite import Group, Suite

load_utility("INST2/procedures/utilities/clear.py")
# Load a target file library (not instrumented)
from INST2.lib.helper import Helper


class ExampleGroup(Group):
Expand Down Expand Up @@ -30,6 +32,8 @@ def script_3(self):
raise SkipScript

def helper(self):
helper = Helper()
helper.print_help()
if RunningScript.manual:
answer = ask("Are you sure?")
else:
Expand Down
1 change: 1 addition & 0 deletions openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/PluginsTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,7 @@ export default {
}
.list {
background-color: var(--color-background-surface-default) !important;
overflow-x: hidden;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to remove the horizontal scroll on the plugins tab

}
.v-theme--cosmosDark.v-list div:nth-child(odd) .v-list-item {
background-color: var(--color-background-base-selected) !important;
Expand Down
1 change: 1 addition & 0 deletions openc3-cosmos-script-runner-api/scripts/run_suite_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from openc3.script.suite_runner import SuiteRunner
from openc3.utilities.target_file import TargetFile
from openc3.script import *
import openc3.utilities.target_file_importer

openc3_scope = sys.argv[1] # argv[0] is the script name
path = sys.argv[2]
Expand Down
2 changes: 1 addition & 1 deletion openc3/python/test/utilities/test_target_file_importer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ def test_import(self):
# from INST2.lib.helper import Helper

# helper = Helper()
# self.assertEqual(helper.help(), 42)
# self.assertEqual(helper.print_help(), 42)
Loading