Skip to content

Release/2.2.3#692

Merged
milesAraya merged 21 commits intooist:develop-mainfrom
arayabrain:release/2.2.2
Aug 12, 2025
Merged

Release/2.2.3#692
milesAraya merged 21 commits intooist:develop-mainfrom
arayabrain:release/2.2.2

Conversation

@milesAraya
Copy link
Copy Markdown
Collaborator

Content

Added fix to solve error in using run_cluster.py to run snakemake.yaml files, in particular with new nwb_template format
Related PR: arayabrain#895

@milesAraya milesAraya self-assigned this Aug 8, 2025
@milesAraya milesAraya changed the base branch from develop-main to main August 8, 2025 05:58
@milesAraya milesAraya changed the base branch from main to develop-main August 8, 2025 05:58
@itutu-tienday
Copy link
Copy Markdown
Collaborator

@milesAraya
This PR is being created in the direction of oist:main <- arayabrain:release/2.2.2, but
Isn't the actual flow (official release procedure) the following?

  1. oist:develop-main <- arayabrain:release/2.2.2
  2. oist:main <- oist:develop-main

Comment thread pyproject.toml Outdated
@milesAraya
Copy link
Copy Markdown
Collaborator Author

@itutu-tienday There were some merge conflicts when trying to merge release/2.2.2 into optinist/main

  • I thought the issue might be something to do with develop-main / main base, so i changed, but this was not it, so i changed back. I was just checking.

  • To solve the issue i merged remote optinist/develop-main into release/2.2.2 and resolved the conflicts (it seems the pyproject resolution somehow snuck through the local merge block and caused a linter error, so i fixed that)

It seems this method of merging opinist/develop-main into the release branch seems like a good idea for these hotfix cases

Comment thread studio/app/common/core/rules/runner.py Outdated
Comment thread studio/app/common/core/snakemake/smk_utils.py Outdated
Remove code related to post_process as this is a cloud function

Remove code related to post_process as this is a cloud function

@classmethod
def __deep_merge(cls, dict1, dict2):
def __change_dict_key_exist(cls, input_info, rule_config: Rule):
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This method name appears to have already been changed in barebone develop-main (__change_dict_key_exist -> __align_input_info_content_keys).
The v2.2.2 release is OK, but please fix and test it when backporting to devleop-main after the release to avoid breaking existing methods in develop-main.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Okay

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

If the method does not exist in oist/optinist, you may want to use the latest method name (__align_input_info_content_keys) from the beginning. (There is no problem with leaving it as it is, so we will leave it up to you.)

Comment thread studio/app/common/core/rules/runner.py
Comment thread frontend/build/index.html Outdated
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/static/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="manifest" href="/static/manifest.json"/><title>OptiNiSt</title><script defer="defer" src="/static/js/main.4bda1ce5.js"></script><link href="/static/css/main.95e38137.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/static/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="manifest" href="/static/manifest.json"/><title>OptiNiSt</title><script defer="defer" src="/static/js/main.426cd4d4.js"></script><link href="/static/css/main.95e38137.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html> No newline at end of file
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

The frontend build materials have already been removed from barebone develop-main in response to the following PR:

Please be careful not to include these build materials when backporting to barebone.
*Alternatively, it may be better to exclude the frontend build from this hot fix release (though there is a restriction that the version number will not be updated).

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I think i just followed the release procedure. Does the release procedure need to be updated to explain how to remove the frontend build?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This is a special release because it's a hotfix release.
Personally, I think it's fine to leave the frontend materials out of the scope of this update. (As long as you record your intentions in the work log, it should be fine.)

If there's a possibility that the hotfix release will continue, it might be a good idea to release the frontend build materials and PR first at some point. (Once v2.4.0 is released, this issue won't recur.)

@milesAraya milesAraya changed the title Release/2.2.2 Release/2.2.3 Aug 12, 2025
@milesAraya milesAraya merged commit 3c3af22 into oist:develop-main Aug 12, 2025
5 checks passed
@milesAraya milesAraya mentioned this pull request Aug 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants