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

FIX: fix model date format in the user model docstring #2713

Merged

Conversation

mrakitin
Copy link
Contributor

Description

This PR fixes the date format appearing in the "Authorship and Verification" section of the generated user model. Before the fix, the dates were displayed as 2024YYY-01m-16d. After the fix, they look like: 2024-01-16.

It's part of the https://github.com/SasView/sasview/wiki/ContributorCampXII camp.

Fixes # (issue/issues)

How Has This Been Tested?

The fix was tested by comparing the output of the generated models before (with v6.0.0-alpha1) and after the fix.

Before:

image

After:

image

Review Checklist (please remove items if they don't apply):

  • Code has been reviewed
  • Functionality has been tested
  • Windows installer (GH artifact) has been tested (installed and worked)
  • MacOSX installer (GH artifact) has been tested (installed and worked)
  • User documentation is available and complete (if required)
  • Developers documentation is available and complete (if required)
  • The introduced changes comply with SasView license (BSD 3-Clause)

@wpotrzebowski wpotrzebowski self-requested a review January 17, 2024 05:25
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.

Code looks good. The reason why Mac installer is failing is lack to acceess to certifcates when forking. (Somethinig I tried to fix before the contributor camp but failed).

@mrakitin
Copy link
Contributor Author

Thanks for your review, @wpotrzebowski!
Is the target branch (main) fine? Or should I retarget it to release_6.0.0?

@wpotrzebowski
Copy link
Contributor

Thanks for your review, @wpotrzebowski! Is the target branch (main) fine? Or should I retarget it to release_6.0.0?

Good point! We will need it for both but please rebase to 6.0.0 for now and then we will merge to main (after release I suppose)

@mrakitin mrakitin changed the base branch from main to release_6.0.0 January 17, 2024 22:15
@mrakitin mrakitin force-pushed the fix-model-date-format-metadata branch from 9ee2283 to 9faafdc Compare January 17, 2024 22:16
@mrakitin
Copy link
Contributor Author

OK, I rebased my commit on the release_6.0.0 (checked out fresh from the release_6.0.0 branch and cherry-picked the 9ee2283b75265c024f2ce685842224bafeac4845 commit).

@wpotrzebowski
Copy link
Contributor

I am merging this PR even though it fails. However it fails because it is opened as a fork and cannot upload artifacts.

@wpotrzebowski wpotrzebowski merged commit 3f26840 into SasView:release_6.0.0 Jan 18, 2024
2 of 17 checks passed
@mrakitin mrakitin deleted the fix-model-date-format-metadata branch January 20, 2024 02:33
@mrakitin
Copy link
Contributor Author

Thank you, @wpotrzebowski!

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