On Wed, Feb 8, 2023 at 10:23 AM 'Martin R' via sage-devel
<sage-devel@googlegroups.com> wrote:
>
> Since the failures are
>
> sage -t --random-seed=130442615951932153031063473470828108756
> sage/schemes/elliptic_curves/ell_curve_isogeny.py # 1 doctest failed
> sage -t --random-seed=130442615951932153031063473470828108756
> sage/schemes/elliptic_curves/ell_number_field.py # 2 doctests failed
>
> I assume that the PR is based on an old branch, but the PR page does not
> contain "update branch".. It does contain "Merging is blocked", but I don't
> really understand what this means.
I just did
git fetch origin pull/34974/head
(with origin being the main new GitHub repo for sage)
to see the git log, and magically on https://github.com/sagemath/sage/pull/34974
there is now
This branch is out-of-date with the base branch
Merge the latest changes from develop into this branch.
and "Update branch" button just above "Merge is blocked"
(which is just a reflection of the fact that develop branch is
protected, you can't push/merge there (I can, as Admin, though))
Perhaps that was due to the base branch being so old, that no branch
info on that was computed by GitHub ahead of my fetch.
>
> Martin
> On Wednesday, 8 February 2023 at 10:42:24 UTC+1 dim...@gmail.com wrote:
>>
>>
>>
>> On Wed, 8 Feb 2023, 08:41 'Martin R' via sage-devel,
>> <sage-...@googlegroups.com> wrote:
>>>
>>> I cannot see any "update branch" button on
>>> https://github.com/sagemath/sage/pull/34974
>>>
>>> Where should I look for it?
>>
>>
>> This button is somewhere near the ticket status at the bottom - if your base
>> is indeed outdated.
>>
>> But check the commits on the branch.
>> I went on the merging spree last night, to gauge the performance of the CI a
>> bit.
>>
>>>
>>> Martin
>>>
>>> On Wednesday, 8 February 2023 at 00:32:49 UTC+1 dim...@gmail.com wrote:
>>>>
>>>> On Tue, Feb 7, 2023 at 10:42 PM David Roe <roed...@gmail.com> wrote:
>>>> >
>>>> > Thanks Dima!
>>>> >
>>>> > There is now an "Update branch" button at the bottom of each PR, which
>>>> > you can press if you're the originator of the PR and it will merge in
>>>> > develop
>>>>
>>>> (there is an option to rebase rather than to merge on this button -
>>>> although automatic rebase is less guaranteed)
>>>>
>>>> I was impatient and I pressed this for a number of PRs myself :-)
>>>> I see now CI passing for quite a number, looks quite good.
>>>>
>>>> Dima
>>>>
>>>> > David
>>>> >
>>>> > On Tue, Feb 7, 2023 at 8:18 PM Dima Pasechnik <dim...@gmail.com> wrote:
>>>> >>
>>>> >> done
>>>> >>
>>>> >> On Tue, Feb 7, 2023 at 6:54 PM John Cremona <john.c...@gmail.com> wrote:
>>>> >> >
>>>> >> > Strong yes from me.
>>>> >> >
>>>> >> > #34987 concerns a 3-line doctest where only the first has a #long
>>>> >> > time tag thought the other lines depend on the first having been run,
>>>> >> > so causes a failure when tested without --long. The fix adds two #
>>>> >> > long time tags
>>>> >> > #34964 trims some whitespace and changes "" to r""" in a few
>>>> >> > necessary places.
>>>> >> >
>>>> >> > On Tue, 7 Feb 2023 at 18:18, David Roe <roed...@gmail.com> wrote:
>>>> >> >>
>>>> >> >> Hi all,
>>>> >> >> Currently, almost all of the PRs on github aren't passing CI, and
>>>> >> >> thus have red Xs. The problem can be resolved by merging #34964 and
>>>> >> >> #34987. Several of us at Sage Days 117 propose to merge these two
>>>> >> >> PRs into the develop branch on Github tonight, to help improve the
>>>> >> >> reviewing process for everyone here, as well as for people who are
>>>> >> >> getting used to the new Github workflow. We don't anticipate this
>>>> >> >> becoming a regular occurrence (it's mainly a consequence of the
>>>> >> >> slightly different testing process on trac and github).
>>>> >> >>
>>>> >> >> If we hear no objections, we'll proceed in an hour and a half
>>>> >> >> (8:45pm CET, 2:45pm EST, 11:45am PST).
>>>> >> >> David
>>>> >> >>
>>>> >> >> --
>>>> >> >> You received this message because you are subscribed to the Google
>>>> >> >> Groups "sage-devel" group.
>>>> >> >> To unsubscribe from this group and stop receiving emails from it,
>>>> >> >> send an email to sage-devel+...@googlegroups.com.
>>>> >> >> To view this discussion on the web visit
>>>> >> >> https://groups.google.com/d/msgid/sage-devel/CAChs6_mnuBi-qd%3Da0%3DqAGt8Xp6SohQzWdtw%2B04t82MPq68ntPw%40mail.gmail.com.
>>>> >> >
>>>> >> > --
>>>> >> > You received this message because you are subscribed to the Google
>>>> >> > Groups "sage-devel" group.
>>>> >> > To unsubscribe from this group and stop receiving emails from it,
>>>> >> > send an email to sage-devel+...@googlegroups.com.
>>>> >> > To view this discussion on the web visit
>>>> >> > https://groups.google.com/d/msgid/sage-devel/CAD0p0K5c%2BOYxf8EAJ5bAA6cJUuzoMtpqwDCOHuKcEd1zjNfMrA%40mail.gmail.com.
>>>> >>
>>>> >> --
>>>> >> You received this message because you are subscribed to the Google
>>>> >> Groups "sage-devel" group.
>>>> >> To unsubscribe from this group and stop receiving emails from it, send
>>>> >> an email to sage-devel+...@googlegroups.com.
>>>> >> To view this discussion on the web visit
>>>> >> https://groups.google.com/d/msgid/sage-devel/CAAWYfq3hp_TRB9ALs__jutcP_us3TA%3DGUxthMS%3DNYGN1KzNkPw%40mail.gmail.com.
>>>> >
>>>> > --
>>>> > You received this message because you are subscribed to the Google
>>>> > Groups "sage-devel" group.
>>>> > To unsubscribe from this group and stop receiving emails from it, send
>>>> > an email to sage-devel+...@googlegroups.com.
>>>> > To view this discussion on the web visit
>>>> > https://groups.google.com/d/msgid/sage-devel/CAChs6_n392HmzN_7rnfeU_3%3DZLgC444LmGc7vQKAuseJq9POmg%40mail.gmail.com.
>>>
>>> --
>>> You received this message because you are subscribed to the Google Groups
>>> "sage-devel" group.
>>> To unsubscribe from this group and stop receiving emails from it, send an
>>> email to sage-devel+...@googlegroups.com.
>>>
>>> To view this discussion on the web visit
>>> https://groups.google.com/d/msgid/sage-devel/4e9ab964-b760-4fda-a195-d1e56e8bbf86n%40googlegroups.com.
>
> --
> You received this message because you are subscribed to the Google Groups
> "sage-devel" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to sage-devel+unsubscr...@googlegroups.com.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/sage-devel/096b1b96-6e0a-432a-bb25-5324777f301en%40googlegroups.com.
--
You received this message because you are subscribed to the Google Groups
"sage-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to sage-devel+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/sage-devel/CAAWYfq11bxUwa_6kDOxH_wfCABYMucqFJZYBNpvuxzVX7Ym-jg%40mail.gmail.com.
