-
-
Notifications
You must be signed in to change notification settings - Fork 672
back up/restore conftest.py #39363
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
back up/restore conftest.py #39363
Conversation
@vbraun - please have a look whether this doesn't break anything in your machinery |
@orlitzky - can you have a look? |
CI is failing in building docker images with
No idea what wrapper this is. @kwankyu - do you know? |
I may not be understanding this correctly, but isn't it just referring to the file, newly created by this PR, called "configure_wrapper"? |
Perhaps I've broken |
No idea either.
If something is broken, the standard way is to fix it (after understanding how it went broken), not to remove it. |
Creating configure scripts using Anyhow, my latest attempt shows that it's not the issue. The issue is that the docker does not find https://github.com/sagemath/sage/actions/runs/12916470243/job/36020720010?pr=39363#step:13:517 |
I saw your post on the autoconf list and had been planning to try this. It's worse than you say:
|
|
Are we in one of these situations when our docker-based CI won't work until this PR is merged in |
I have no idea what you are asking... What is "these situations"? I was not following the present issue and have no background understanding. |
By the way, I do not object to changing "make configure" with "./bootstrap" for now if it helps. But removing the existing feature "make configure" as you seem to advocate is another matter. |
basically, running ./configure removes all the files matching to preserve our workflow, we rename configure to real_configure and install |
Probably #39373 , let's see. |
Documentation preview for this PR (built with commit e08d5cc; changes) is ready! 🎉 |
@user202729 - CI passes (modulo unrelated doctest failures on some platforms). Can you give this a positive review? |
I would not have any objections, either, but it is a publicly advertised way to install Sage — it's in the top-level README.md, for example — and so |
This goes without saying, certainly. The thing is that |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
haven't actually reviewed it carefully, just a few minor changes then should be good
docker/Dockerfile
Outdated
ARG SAGE_NUM_THREADS="2" | ||
ENV SAGE_NUM_THREADS $SAGE_NUM_THREADS | ||
RUN make configure | ||
RUN ./bootstrap |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does make configure
still work? (if yes maybe leave it alone to be conservative, if not maybe we need to fix it)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, make configure
should still work. However, I don't know how, and trying to figure it out gives me a headache. OK, let's revert this change and see.
As an alternate approach, can we rename |
Thinking about it, maybe that can be automated with |
everybody is welcome to provide a better fix. I'm a bit tired of pytest now. |
To be fair, naming it something else might lead to some confusion. If this works we might as well merge it in until some other issue comes up. |
Since it's a
Doctesting is not hard but still requires a bit of work. Biggest problem, as to be expected, is that sage's doctest runner has a couple of special non-standard "features" that need to be migrated. Current status can be seen at #36981.
I hope to announce doctest support with pytest in a month or so (which would then be accompanied with a soft deprecation of |
Do these two comments represent work that needs doing on this PR? |
well, yes - namely, the last command, |
as autoconf's generated configure clobbers conftest*, we are saving conftest.py from it by making a backup copy and then restoring it after the real configure was run.
This reverts commit 48a81bd.
f6d72ba
to
e08d5cc
Compare
Unless I've done something stupid,
will delete |
with this branch, or without? without this branch, anything that triggers a run of ./configure will delete it. |
It was with the branch which is in 10.6.rc0 |
Huh, apparently a copy of this was included in #39655 . But different SHA-1. Also… I notice the comment I mentioned about changing |
there are lots of weird switches for |
@vbraun - this had been merged, right? could you tag it properly, etc? |
That was the problem I pointed out, this somehow get merged without any positive review. Seems nobody object so... |
@user202729 - please feel free to do a follow-up PR. I ran (real)_configure 100s of times, and a couple of times had to restore deleted file by |
OK, I can see this - our recursive make, self-modifying build system calls |
The configure_wrapper swallows exit codes, so configure failures are not seen by the shell. This is fixed in #40906 |
this will fix #39357
📝 Checklist
⌛ Dependencies