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

Skip first argument when calling main in launch script #38669

Merged
merged 1 commit into from
Jan 23, 2025

Conversation

jclarkeSTFC
Copy link
Contributor

@jclarkeSTFC jclarkeSTFC commented Jan 22, 2025

The first argument of sys.argv is the launch script path, so we don't need that.

Fixes #38654

To test:

Check that Windows and macOS installs launch without opening the launch script or giving any warning about it. Also check other arguments, e.g. --single-process. Linux launching is unaffected by this change.

https://builds.mantidproject.org/job/build_packages_from_branch/974/

I've uploaded the conda files to my channel, jclarkestfc/label/launch-script-fix

This does not require release notes because it's a fix for something that hasn't been released yet


Reviewer

Please comment on the points listed below (full description).
Your comments will be used as part of the gatekeeper process, so please comment clearly on what you have checked during your review. If changes are made to the PR during the review process then your final comment will be the most important for gatekeepers. In this comment you should make it clear why any earlier review is still valid, or confirm that all requested changes have been addressed.

Code Review

  • Is the code of an acceptable quality?
  • Does the code conform to the coding standards?
  • Are the unit tests small and test the class in isolation?
  • If there is GUI work does it follow the GUI standards?
  • If there are changes in the release notes then do they describe the changes appropriately?
  • Do the release notes conform to the release notes guide?

Functional Tests

  • Do changes function as described? Add comments below that describe the tests performed?
  • Do the changes handle unexpected situations, e.g. bad input?
  • Has the relevant (user and developer) documentation been added/updated?

Does everything look good? Mark the review as Approve. A member of @mantidproject/gatekeepers will take care of it.

Gatekeeper

If you need to request changes to a PR then please add a comment and set the review status to "Request changes". This will stop the PR from showing up in the list for other gatekeepers.

The first argument of sys.argv is the launch script, so
we don't need that.
@jclarkeSTFC jclarkeSTFC changed the base branch from main to release-next January 22, 2025 15:25
@jclarkeSTFC jclarkeSTFC added Bug Issues and pull requests that are regressions or would be considered a bug by users (e.g. crashing) macOS Only The issues related to macOS only. ISIS Team: Core Issue and pull requests managed by the Core subteam at ISIS Windows Only Only on Windows labels Jan 22, 2025
@jclarkeSTFC jclarkeSTFC added this to the Release 6.12 milestone Jan 22, 2025
@jclarkeSTFC jclarkeSTFC marked this pull request as ready for review January 23, 2025 12:21
@thomashampson thomashampson self-assigned this Jan 23, 2025
Copy link
Contributor

@thomashampson thomashampson left a comment

Choose a reason for hiding this comment

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

I have installed the Conda package on Windows and macOS and can confirm that this works as expected without opening the workbench script or outputting any error message about trying to open the workbench script. It's also allowing me to pass a script to the workbench command to open it in workbench. The --single-process argument also works as expected.

@MialLewis MialLewis merged commit c18ab18 into release-next Jan 23, 2025
10 checks passed
@MialLewis MialLewis deleted the 38654_launch_script_in_editor branch January 23, 2025 16:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Issues and pull requests that are regressions or would be considered a bug by users (e.g. crashing) ISIS Team: Core Issue and pull requests managed by the Core subteam at ISIS macOS Only The issues related to macOS only. Windows Only Only on Windows
Projects
None yet
Development

Successfully merging this pull request may close these issues.

mantid launch script opens in the editor on launch
3 participants