Rebuild Python module when needed, remove checked-in autogenerated sources #107
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…cbf_stx.h from cbf.stx.y Heed the warning emitted by recent Bison (the api.pure option was probably introduced in 2.3b from 2008-05-27) and name the previously anonymous union typedef:ed to YYSTYPE in cbf_lex.h. The YYSTYPE typedef is retained in order to preserve the API, even though it may cause problems for downstream projects that also rely on Bison. Multiple targets in a rule appears to be a GNU make extension, but its use was already implied in Makefile. Do not include any generated files from the public headers.
Appears to have been manually added to the Bison-generated output.
Avoids false positive introduced in 79913a7.
Checked-in pycbf.py and pycbf_wrap.c were generated with SWIG 3.0.10 and interfere with the tests if run from the source directory; _pycbf.pyd is a 32-bit Windows binary. Fix Makefile to regenerate the SWIG interface files from current doc/CBFlib.html (checked-in CBFlib.txt is from 0.9.5, revised 22 February 2015; regenerating it requires e.g. links) and rebuild the Python module when necessary.
Remove unused LaTeX output; out-of-sync pycbf.toc may interfere with LaTeX. Escape underscores in text mode and do not use minipage for long listings. A container must have LaTeX (texlive-latex-recommended in Ubuntu) in order to build pycbf.pdf.
Member
|
Hey folks, this PR broke DIALS and cctbx since pycbf.py is gone. Can we revert this until further discussion? |
Collaborator
|
Tried to revert, but had conflicts:
git revert -m 1 b6eee47
Auto-merging CMakeLists.txt
CONFLICT (content): Merge conflict in CMakeLists.txt
Auto-merging Makefile
Auto-merging Makefile_LINUX
Auto-merging Makefile_MINGW
Auto-merging Makefile_MSYS2
Auto-merging Makefile_OSX
Auto-merging m4/Makefile.m4
Auto-merging pycbf/make_pycbf.py
Auto-merging pycbf/make_pycbf.w
Auto-merging pycbf/pycbf.tex
error: could not revert b6eee47... Merge pull request #107 from
hattne/make_pycbf
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git revert --continue".
hint: You can instead skip this commit with "git revert --skip".
hint: To abort and get back to the state before "git revert",
hint: run "git revert --abort".
Aborted the revert. We should talk about this. Should we go back to just
using nuweb or not?
…On Tue, Sep 9, 2025 at 8:14 AM Aaron S. Brewster ***@***.***> wrote:
*phyy-nx* left a comment (dials/cbflib#107)
<#107 (comment)>
Hey folks, this PR broke DIALS and cctbx since pycbf.py is gone. Can we
revert this until further discussion?
—
Reply to this email directly, view it on GitHub
<#107 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ABB6EAMPG226YK35PDIH3OT3R3ABNAVCNFSM6AAAAACBWC4DQWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZTENZQGQZTCMJZHE>
.
You are receiving this because you modified the open/close state.Message
ID: ***@***.***>
|
Collaborator
Author
|
I suspect this may be an issue with the build system. If this is right, running |
Collaborator
|
I'll wait quietly, but I do note that when running makefile tests with docker, always rebuilding with nuweb is not a problem. |
Collaborator
Author
Collaborator
|
merged 108 and it passed the CI tests
…On Tue, Sep 9, 2025 at 1:01 PM Johan Hattne ***@***.***> wrote:
*hattne* left a comment (dials/cbflib#107)
<#107 (comment)>
@phyy-nx <https://github.com/phyy-nx> does #108
<#108> fix the problem?
I don't think *nuweb* has anything to do with this. But I do think
further discussion may be warranted.
—
Reply to this email directly, view it on GitHub
<#107 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ABB6EAIDC73AARSRG76YSLL3R4BVRAVCNFSM6AAAAACBWC4DQWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZTENZRGU2TIOBWGA>
.
You are receiving this because you modified the open/close state.Message
ID: ***@***.***>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The SWIG-generated interface files are updated rather than removed: in the future they may be used directly, instead of relying on nuweb to (re)generate them;
pycbf.texis kept for the same reason. Also note thatpycbf.pdfis not built by default.