-
Notifications
You must be signed in to change notification settings - Fork 491
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
do full upstream doc generation [skip ci] #1066
Conversation
The author should not be dropped, he is part of the round 3 submission. It seems that he is still missing in the upstream yml-file which could be the cause. The sse2 and ssse3 dependencies are due to the AES-implementation still bundled with the Dilithium code. The reason the script might have not picked it up is because the upstream-yml defines it in a |
Thanks for the background, @bhess. What's your recommendation then, how to proceed? Wait for an upstream YML-update to get the authors list right? Ensure to load the common.yml to be sure SSE is included -- or drop it as it may be superfluous? Or just keep dilithium.yml and kyber.yml as-is (manually created) and "just" include the new |
@baentsch As discussed, ideal would be to load the flags of the dependencies. At the same time it should be ok to keep the manually created yml for now as the content seems to be ok. Thanks. |
ps: just noticing that also the 'upstream' field in this PR has been changed for kyber and dilithium. These are valid updates compared to the manually created ymls (now it's the commit defined in copy_from_upstream.yml rather than what is defined in the upstream-yml). |
@bhess Please check the latest file contents: This code now merges 'required_flags' from Common_META (if present) into the OQS doc-YML master files. |
Thank you for the update! The changes the script made look good to me (except the removed Dilthium author, which will be added to upstream with pq-crystals/dilithium#50). |
Thanks for the re-confirmation that this is logically sound. Regarding contents, well, this is then up to the upstream to put it right. I'll then finalize the PR by integrating it into copy_from_upstream. |
This PR now integrates all upstream META information into the |
Let's hold this until after 0.7.0 release, I'm hoping that rc4 is the last release candidate. |
OK. Will merge only when 0.7.0 is final. |
Is this ready to merge? |
The logic is OK AFAIK, but the data produced by this code currently is not -> If this gets run before pq-crystals/dilithium#50 gets merged, this generates incorrect documentation for our project which I personally find not good: Thinking about it again and as unhappy as I am to not be able to integrate this work, I'd prefer to rather further delay this in line with the upstream (for which this code has been custom-made) than cause our documentation to turn wrong by merging now. Edit: Would it thus be reasonable to revert this to "Draft"? Didn't find the suitable button for this, though... |
added Common_META merge logic integrated src and doc upstream copy [skip ci]
82a4a16
to
559567f
Compare
Latest commit contains a rebase as well as a fix for correctly updating "upstream" information. Also contained are the results of a re-run of @bhess to re-check all docs (generated) regarding pqcrystals |
Thanks for this update! The docs including the upstream-field look accurate.
I don't see anything related in the script that has changed, but I can imagine that the order of the set() is not unique: https://github.com/open-quantum-safe/liboqs/pull/1066/files#diff-b12590f74247cf2fc0947d473a38c817dd76e877820d31e56a9a53ae73d7fb34R150 Perhaps the required_flags list could be sorted to have a unique order. |
Good suggestion: Thanks. So done (and one logic error removed). Please check again if you feel like it, @bhess. |
Looks good to me. Thank you! |
Fixes #1064.
Will not switch to Ready for Review before @xvzcf looked at the logic changes and @bhess confirmed the contents changes (dropping an author and build opts in Dilithium doesn't seem OK to just leave it to a script to decide). If the changes as per this PR are legit, we may need to re-release 0.7.0.
After possible changes, old
update_pqclean_alg_docs.py
will be deleted and the new script will be added tocopy_from_upstream.py
before merge.