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

Release 6.0.0: Show 404 message instead of regen #3131

Merged
merged 3 commits into from
Oct 24, 2024

Conversation

krzywon
Copy link
Contributor

@krzywon krzywon commented Oct 22, 2024

Description

This fixes the documentation issue noted by @wpotrzebowski in #3129 (comment). The Mac rst files were all newer than the html files, which triggered the doc generation. Nothing (as of 11:52 EST 10/23) should trigger the documentation generation process at this point. If the files cannot be found, a 404 error will be shown instead of the documentation generation.

Tested using the installer from https://github.com/SasView/sasview/actions/runs/11465366459 and this fix seems to work.

@krzywon krzywon requested a review from wpotrzebowski October 22, 2024 18:20
Copy link
Contributor

@wpotrzebowski wpotrzebowski left a comment

Choose a reason for hiding this comment

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

Tested on Mac. It works as expected

Copy link
Contributor

@smk78 smk78 left a comment

Choose a reason for hiding this comment

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

Functionality test of build actions/runs/11466159520 on W10/x64.

Ran SasView. Went to the FitPage and selected Plugin Models and loaded a plugin in my plugins folder previously downloaded from the Marketplace (peak_voight). Computed the theory. Clicked Help...

At this point a full rebuild of all model documentation started (not just the plugins)! Somewhat tiresome.

This eventually returned this:
image

13:22:51 - ERROR: Traceback (most recent call last): File "sasmodels\generate.py", line 1177, in load_kernel_module __import__('sasmodels.models.'+model_name) ModuleNotFoundError: No module named 'sasmodels.models.C:\\Users\\smk78\\' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "sas\sascalc\doc_regen\makedocumentation.py", line 245, in make_documentation File "sas\sascalc\doc_regen\makedocumentation.py", line 214, in call_one_file File "sas\sascalc\doc_regen\makedocumentation.py", line 128, in call_regenmodel File "sas\sascalc\doc_regen\regenmodel.py", line 358, in process_model File "sasmodels\core.py", line 173, in load_model_info kernel_module = generate.load_kernel_module(model_string) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "sasmodels\generate.py", line 1185, in load_kernel_module kernel_module = load_custom_kernel_module(model_name) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "sasmodels\custom\__init__.py", line 61, in load_custom_kernel_module if need_reload(path): ^^^^^^^^^^^^^^^^^ File "sasmodels\custom\__init__.py", line 116, in need_reload return any(cache_time return any(cache_time 
13:22:51 - INFO: Documentation regeneration completed.

@smk78
Copy link
Contributor

smk78 commented Oct 24, 2024

Tested build actions/runs/11483417062 on W10/x64.

If you click Help on a FitPage with a plugin from the Marketplace the Documentation window now directs to fitting_help.html. The intended (hopefully) short-term workaround.

However, if you do the same thing for a plugin generated by Add/Multiply Models you still get the 'Your file could not be accessed' error above.

@krzywon krzywon merged commit 2e519c4 into release_6.0.0 Oct 24, 2024
40 checks passed
@krzywon krzywon deleted the mac-help-files-fix branch October 24, 2024 15:57
@smk78
Copy link
Contributor

smk78 commented Oct 24, 2024

Tested build actions/runs/11500170818 on W10/x64.

Both Marketplace plugins and Add/Multiply plugins now bring up fitting_help.html

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.

3 participants