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

Jump to bottom

Add annotations to generator #294

Merged
merged 41 commits into from
Jun 30, 2023
Merged

Add annotations to generator #294

merged 41 commits into from
Jun 30, 2023

Conversation

gpachecoNI
Copy link
Collaborator

TODO: Check the above box with an 'x' indicating you've read and followed CONTRIBUTING.md.

What does this Pull Request accomplish?

Includes the service annotation support in the generator.

  • Add Description, Collection, and Tags to the .serviceconfig
  • Provide optional command line options for the user. If not assigned just use "" (Empty)

Why should this Pull Request be merged?

AB#2408665

What testing has been done?

  • Add test with all new command lines.
  • Keep test where annotations were not being inputted to ensure they are optional.

@gpachecoNI
Copy link
Collaborator Author

I will change the target branch to Main once my other PR gets in.

@gpachecoNI gpachecoNI requested a review from cumitche June 22, 2023 19:58
@gpachecoNI gpachecoNI mentioned this pull request Jun 23, 2023
Merged
1 task
@gpachecoNI gpachecoNI force-pushed the users/gpacheco/AddServiceAnnotationSupport branch from de3714d to c545341 Compare June 23, 2023 15:15
@gpachecoNI gpachecoNI force-pushed the users/gpacheco/AddServiceAnnotationToGenerator branch from dea1d86 to db26e6d Compare June 23, 2023 15:35
@bkeryan
Copy link
Collaborator

bkeryan commented Jun 26, 2023

FYI, I created a releases/1.1 branch and updated main to version 1.2.0-dev0 in order to unblock these PRs.

@gpachecoNI gpachecoNI force-pushed the users/gpacheco/AddServiceAnnotationToGenerator branch from db26e6d to 4cb83ef Compare June 27, 2023 22:40
@gpachecoNI gpachecoNI requested a review from cumitche June 27, 2023 22:41
@gpachecoNI gpachecoNI changed the title [Do not submit] Add annotations to generator Add annotations to generator Jun 28, 2023
bkeryan
bkeryan requested changes Jun 28, 2023
View reviewed changes
ni_measurementlink_generator/ni_measurementlink_generator/template.py Outdated Show resolved Hide resolved
ni_measurementlink_generator/ni_measurementlink_generator/template.py Outdated Show resolved Hide resolved
ni_measurementlink_generator/ni_measurementlink_generator/template.py Outdated Show resolved Hide resolved
ni_measurementlink_generator/ni_measurementlink_generator/template.py Show resolved Hide resolved
ni_measurementlink_generator/ni_measurementlink_generator/template.py Outdated Show resolved Hide resolved
ni_measurementlink_generator/ni_measurementlink_generator/template.py Outdated Show resolved Hide resolved
ni_measurementlink_generator/ni_measurementlink_generator/template.py Outdated Show resolved Hide resolved
ni_measurementlink_generator/tests/test_assets/example_renders/SampleMeasurement.serviceconfig Show resolved Hide resolved
...surementlink_generator/ni_measurementlink_generator/templates/measurement.serviceconfig.mako Outdated Show resolved Hide resolved
ni_measurementlink_generator/tests/acceptance/test_generator.py Outdated Show resolved Hide resolved
@gpachecoNI gpachecoNI force-pushed the users/gpacheco/AddServiceAnnotationToGenerator branch from 4cb83ef to 62d90ec Compare June 29, 2023 18:36
@gpachecoNI gpachecoNI requested review from dixonjoel and bkeryan June 29, 2023 18:38
@gpachecoNI gpachecoNI requested a review from bkeryan June 29, 2023 22:19
bkeryan
bkeryan requested changes Jun 29, 2023
View reviewed changes
Copy link
Collaborator

@bkeryan bkeryan left a comment

Choose a reason for hiding this comment

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

This should be the last change

ni_measurementlink_generator/ni_measurementlink_generator/template.py Outdated Show resolved Hide resolved
ni_measurementlink_generator/ni_measurementlink_generator/template.py Outdated Show resolved Hide resolved
ni_measurementlink_generator/ni_measurementlink_generator/template.py Outdated Show resolved Hide resolved
ni_measurementlink_generator/ni_measurementlink_generator/template.py Outdated Show resolved Hide resolved
Base automatically changed from users/gpacheco/AddServiceAnnotationSupport to main June 30, 2023 14:49
@gpachecoNI gpachecoNI requested a review from bkeryan June 30, 2023 14:49
@github-actions
Copy link

Test Results

     12 files  ±0       12 suites  ±0   16m 21s ⏱️ - 3m 29s
   174 tests ±0     174 ✔️ ±0  0 💤 ±0  0 ❌ ±0 
2 088 runs  ±0  2 088 ✔️ ±0  0 💤 ±0  0 ❌ ±0 

Results for commit 6b52519. ± Comparison against base commit 98abe2b.

@gpachecoNI gpachecoNI merged commit a8386cc into main Jun 30, 2023
@gpachecoNI gpachecoNI deleted the users/gpacheco/AddServiceAnnotationToGenerator branch June 30, 2023 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dixonjoel dixonjoel dixonjoel approved these changes

@bkeryan bkeryan bkeryan approved these changes

@csjall csjall Awaiting requested review from csjall csjall is a code owner

@pbirkhol-ni pbirkhol-ni Awaiting requested review from pbirkhol-ni

@mshafer-NI mshafer-NI Awaiting requested review from mshafer-NI mshafer-NI is a code owner

@nstokes-nati nstokes-nati Awaiting requested review from nstokes-nati nstokes-nati is a code owner

@cumitche cumitche Awaiting requested review from cumitche

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@gpachecoNI @bkeryan @dixonjoel @cumitche