Re: [sage-release] Sage 10.2.rc2 released

2023-11-13 Thread David Coudert 
I’ll call for more help if not ;)

Thank you for all the work Volker.

Best,
David.

> Le 13 nov. 2023 à 16:12, Volker Braun  a écrit :
> 
> Sorry for the confusion, hopefully the erroneous script is now fixed ;)
> 
> On Monday, November 13, 2023 at 2:30:18 PM UTC+1 david@gmail.com 
>  wrote:
> Hello,
> 
> Yesterday I have synchronized my fork on GitHub with 10.2.rc2 and it went 
> well, but today I see that « This branch is 1 commit ahead, 1 commit behind 
> sagemath:develop » O_o. See  https://github.com/dcoudert/sage/ 
> 
> It seems that I have to resolve that manually, but I’m not sure how.
> 
> I also see that one of my PR has conflicts that must be resolved, certainly 
> due to forced push (https://github.com/sagemath/sage/pull/36705 
> ). I will check that when I will 
> be able to properly synchronize my own fork of the develop branch.
> 
> Best,
> David.
> 
> 
> 
>> Le 13 nov. 2023 à 09:52, Eric Gourgoulhon > > a écrit :
>> 
> 
>> Thank you for having merged https://github.com/sagemath/sage/pull/36529 
>>  !
>> 
>> Eric.
>> 
>> 
>> Le dimanche 12 novembre 2023 à 22:42:41 UTC+1, Volker Braun a écrit :
>> As always, you can get the latest beta version from the "develop" git 
>> branch. Alternatively, the self-contained source tarball is at 
>> http://www.sagemath.org/download-latest.html 
>> 
>> 
>> 
>> 4430e4cc37c (tag: 10.2.rc2, github/develop) Updated SageMath version to 
>> 10.2.rc2
>> 883e05f8ee0 gh-36698: src/sage/combinat/root_system/coxeter_group.py: Fix 
>> typo in lazy_import
>> a0872bed5c9 gh-36671: build/pkgs/openblas: Stop openblas from using explicit 
>> `make -j N`; but use `make -j 1` on `ubuntu-trusty`
>> 405e166238e gh-36669: Sage knows Hadamard matrices <1201, not 1001
>> bb7cf9b7c64 gh-36529: src/sage/misc/latex.py: fix view()
>> e349b002499 (tag: 10.2.rc1) Updated SageMath version to 10.2.rc1
>> 
> 
>> -- 
>> You received this message because you are subscribed to the Google Groups 
>> "sage-release" group.
>> To unsubscribe from this group and stop receiving emails from it, send an 
>> email to sage-release...@googlegroups.com 
>> .
>> To view this discussion on the web visit 
>> https://groups.google.com/d/msgid/sage-release/c2a87e5a-5645-439a-99b5-88a0c5661862n%40googlegroups.com
>>  
>> .
> 
> 
> -- 
> You received this message because you are subscribed to the Google Groups 
> "sage-release" group.
> To unsubscribe from this group and stop receiving emails from it, send an 
> email to sage-release+unsubscr...@googlegroups.com 
> .
> To view this discussion on the web visit 
> https://groups.google.com/d/msgid/sage-release/cfa297c4-576c-45d9-acc9-63bc183e5ce8n%40googlegroups.com
>  
> .

-- 
You received this message because you are subscribed to the Google Groups 
"sage-release" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-release+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/sage-release/44D1E487-770A-4506-870D-F0DCBEA4E3C5%40gmail.com.

Re: [sage-release] Sage 10.2.rc2 released

2023-11-13 Thread Volker Braun 
Sorry for the confusion, hopefully the erroneous script is now fixed ;)

On Monday, November 13, 2023 at 2:30:18 PM UTC+1 david@gmail.com wrote:

> Hello,
>
> Yesterday I have synchronized my fork on GitHub with 10.2.rc2 and it went 
> well, but today I see that « This branch is 1 commit ahead, 1 commit 
> behind sagemath:develop » O_o. See  https://github.com/dcoudert/sage/
> It seems that I have to resolve that manually, but I’m not sure how.
>
> I also see that one of my PR has conflicts that must be resolved, 
> certainly due to forced push (https://github.com/sagemath/sage/pull/36705). 
> I will check that when I will be able to properly synchronize my own fork 
> of the develop branch.
>
> Best,
> David.
>
>
> Le 13 nov. 2023 à 09:52, Eric Gourgoulhon  a écrit :
>
> Thank you for having merged https://github.com/sagemath/sage/pull/36529 !
>
> Eric.
>
>
> Le dimanche 12 novembre 2023 à 22:42:41 UTC+1, Volker Braun a écrit :
>
>> As always, you can get the latest beta version from the "develop" git 
>> branch. Alternatively, the self-contained source tarball is at 
>> http://www.sagemath.org/download-latest.html
>>
>>
>> 4430e4cc37c (tag: 10.2.rc2, github/develop) Updated SageMath version to 
>> 10.2.rc2
>> 883e05f8ee0 gh-36698: src/sage/combinat/root_system/coxeter_group.py: Fix 
>> typo in lazy_import
>> a0872bed5c9 gh-36671: build/pkgs/openblas: Stop openblas from using 
>> explicit `make -j N`; but use `make -j 1` on `ubuntu-trusty`
>> 405e166238e gh-36669: Sage knows Hadamard matrices <1201, not 1001
>> bb7cf9b7c64 gh-36529: src/sage/misc/latex.py: fix view()
>> e349b002499 (tag: 10.2.rc1) Updated SageMath version to 10.2.rc1
>>
>
> -- 
> You received this message because you are subscribed to the Google Groups 
> "sage-release" group.
> To unsubscribe from this group and stop receiving emails from it, send an 
> email to sage-release...@googlegroups.com.
> To view this discussion on the web visit 
> https://groups.google.com/d/msgid/sage-release/c2a87e5a-5645-439a-99b5-88a0c5661862n%40googlegroups.com
>  
> 
> .
>
>
>

-- 
You received this message because you are subscribed to the Google Groups 
"sage-release" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-release+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/sage-release/cfa297c4-576c-45d9-acc9-63bc183e5ce8n%40googlegroups.com.

Re: [sage-release] Sage 10.2.rc2 released

2023-11-13 Thread David Coudert 
Thank you Dima.

The branch that was not properly synchronized with rc2 is origin/develop.
Github suggested to remove the last commit from develop and now it’s saying 
that the branch is synchronized with sagemath/sage:develop.
Let’s hope it will stay like that ;)

Best,
David.



> Le 13 nov. 2023 à 14:49, Dima Pasechnik  a écrit :
> 
> On Mon, Nov 13, 2023 at 1:30 PM David Coudert  > wrote:
> 
>> Yesterday I have synchronized my fork on GitHub with 10.2.rc2 and it went 
>> well, but today I see that « This branch is 1 commit ahead, 1 commit behind 
>> sagemath:develop » O_o. See  https://github.com/dcoudert/sage/ 
>> 
>> It seems that I have to resolve that manually, but I’m not sure how.
> 
> suppose you're on your branch, and origin/develop is the current
> develop branch (rc2), already "git fetch"'ed.
> Then run
> 
>   git rebase origin/develop
> 
> and hopefully it will go automatically
> 
> (you can always do "git rebase --abort" if something goes wrong)
> 
> Often you'd see
> CONFLICT... (in such and such file); so you edit this file and "git
> add" it (and same for all the conflicts you see)
> and type
> 
>   git rebase --continue
> 
> Use "git status" to see where you are in the rebase process.
> 
> HTH
> Dima
> 
> 
> 
> 
>> 
>> I also see that one of my PR has conflicts that must be resolved, certainly 
>> due to forced push (https://github.com/sagemath/sage/pull/36705). I will 
>> check that when I will be able to properly synchronize my own fork of the 
>> develop branch.
>> 
>> Best,
>> David.
>> 
>> 
>> Le 13 nov. 2023 à 09:52, Eric Gourgoulhon  a écrit :
>> 
>> Thank you for having merged https://github.com/sagemath/sage/pull/36529 !
>> 
>> Eric.
>> 
>> 
>> Le dimanche 12 novembre 2023 à 22:42:41 UTC+1, Volker Braun a écrit :
>>> 
>>> As always, you can get the latest beta version from the "develop" git 
>>> branch. Alternatively, the self-contained source tarball is at 
>>> http://www.sagemath.org/download-latest.html
>>> 
>>> 
>>> 4430e4cc37c (tag: 10.2.rc2, github/develop) Updated SageMath version to 
>>> 10.2.rc2
>>> 883e05f8ee0 gh-36698: src/sage/combinat/root_system/coxeter_group.py: Fix 
>>> typo in lazy_import
>>> a0872bed5c9 gh-36671: build/pkgs/openblas: Stop openblas from using 
>>> explicit `make -j N`; but use `make -j 1` on `ubuntu-trusty`
>>> 405e166238e gh-36669: Sage knows Hadamard matrices <1201, not 1001
>>> bb7cf9b7c64 gh-36529: src/sage/misc/latex.py: fix view()
>>> e349b002499 (tag: 10.2.rc1) Updated SageMath version to 10.2.rc1
>> 
>> 
>> --
>> You received this message because you are subscribed to the Google Groups 
>> "sage-release" group.
>> To unsubscribe from this group and stop receiving emails from it, send an 
>> email to sage-release+unsubscr...@googlegroups.com.
>> To view this discussion on the web visit 
>> https://groups.google.com/d/msgid/sage-release/c2a87e5a-5645-439a-99b5-88a0c5661862n%40googlegroups.com.
>> 
>> 
>> --
>> You received this message because you are subscribed to the Google Groups 
>> "sage-release" group.
>> To unsubscribe from this group and stop receiving emails from it, send an 
>> email to sage-release+unsubscr...@googlegroups.com 
>> .
>> To view this discussion on the web visit 
>> https://groups.google.com/d/msgid/sage-release/26D5FF0E-52FF-4D16-B34D-9EF3B0E41454%40gmail.com
>>  
>> .
> 
> -- 
> You received this message because you are subscribed to the Google Groups 
> "sage-release" group.
> To unsubscribe from this group and stop receiving emails from it, send an 
> email to sage-release+unsubscr...@googlegroups.com 
> .
> To view this discussion on the web visit 
> https://groups.google.com/d/msgid/sage-release/CAAWYfq2GDtnePYrL%3DxL_cJACuujYicoCVH9eM3NUymDUKXqodA%40mail.gmail.com
>  
> .

-- 
You received this message because you are subscribed to the Google Groups 
"sage-release" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-release+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/sage-release/46DE8FF0-BE4B-4E02-A406-09B29D9983DA%40gmail.com.

Re: [sage-release] Sage 10.2.rc2 released

2023-11-13 Thread Dima Pasechnik 
On Mon, Nov 13, 2023 at 1:30 PM David Coudert  wrote:

> Yesterday I have synchronized my fork on GitHub with 10.2.rc2 and it went 
> well, but today I see that « This branch is 1 commit ahead, 1 commit behind 
> sagemath:develop » O_o. See  https://github.com/dcoudert/sage/
> It seems that I have to resolve that manually, but I’m not sure how.

suppose you're on your branch, and origin/develop is the current
develop branch (rc2), already "git fetch"'ed.
Then run

   git rebase origin/develop

and hopefully it will go automatically

(you can always do "git rebase --abort" if something goes wrong)

Often you'd see
CONFLICT... (in such and such file); so you edit this file and "git
add" it (and same for all the conflicts you see)
and type

   git rebase --continue

Use "git status" to see where you are in the rebase process.

HTH
Dima




>
> I also see that one of my PR has conflicts that must be resolved, certainly 
> due to forced push (https://github.com/sagemath/sage/pull/36705). I will 
> check that when I will be able to properly synchronize my own fork of the 
> develop branch.
>
> Best,
> David.
>
>
> Le 13 nov. 2023 à 09:52, Eric Gourgoulhon  a écrit :
>
> Thank you for having merged https://github.com/sagemath/sage/pull/36529 !
>
> Eric.
>
>
> Le dimanche 12 novembre 2023 à 22:42:41 UTC+1, Volker Braun a écrit :
>>
>> As always, you can get the latest beta version from the "develop" git 
>> branch. Alternatively, the self-contained source tarball is at 
>> http://www.sagemath.org/download-latest.html
>>
>>
>> 4430e4cc37c (tag: 10.2.rc2, github/develop) Updated SageMath version to 
>> 10.2.rc2
>> 883e05f8ee0 gh-36698: src/sage/combinat/root_system/coxeter_group.py: Fix 
>> typo in lazy_import
>> a0872bed5c9 gh-36671: build/pkgs/openblas: Stop openblas from using explicit 
>> `make -j N`; but use `make -j 1` on `ubuntu-trusty`
>> 405e166238e gh-36669: Sage knows Hadamard matrices <1201, not 1001
>> bb7cf9b7c64 gh-36529: src/sage/misc/latex.py: fix view()
>> e349b002499 (tag: 10.2.rc1) Updated SageMath version to 10.2.rc1
>
>
> --
> You received this message because you are subscribed to the Google Groups 
> "sage-release" group.
> To unsubscribe from this group and stop receiving emails from it, send an 
> email to sage-release+unsubscr...@googlegroups.com.
> To view this discussion on the web visit 
> https://groups.google.com/d/msgid/sage-release/c2a87e5a-5645-439a-99b5-88a0c5661862n%40googlegroups.com.
>
>
> --
> You received this message because you are subscribed to the Google Groups 
> "sage-release" group.
> To unsubscribe from this group and stop receiving emails from it, send an 
> email to sage-release+unsubscr...@googlegroups.com.
> To view this discussion on the web visit 
> https://groups.google.com/d/msgid/sage-release/26D5FF0E-52FF-4D16-B34D-9EF3B0E41454%40gmail.com.

-- 
You received this message because you are subscribed to the Google Groups 
"sage-release" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-release+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/sage-release/CAAWYfq2GDtnePYrL%3DxL_cJACuujYicoCVH9eM3NUymDUKXqodA%40mail.gmail.com.

Re: [sage-release] Sage 10.2.rc2 released

2023-11-13 Thread David Coudert 
Hello,

Yesterday I have synchronized my fork on GitHub with 10.2.rc2 and it went well, 
but today I see that « This branch is 1 commit ahead, 1 commit behind 
sagemath:develop » O_o. See  https://github.com/dcoudert/sage/
It seems that I have to resolve that manually, but I’m not sure how.

I also see that one of my PR has conflicts that must be resolved, certainly due 
to forced push (https://github.com/sagemath/sage/pull/36705 
). I will check that when I will 
be able to properly synchronize my own fork of the develop branch.

Best,
David.


> Le 13 nov. 2023 à 09:52, Eric Gourgoulhon  a écrit :
> 
> Thank you for having merged https://github.com/sagemath/sage/pull/36529 
>  !
> 
> Eric.
> 
> 
> Le dimanche 12 novembre 2023 à 22:42:41 UTC+1, Volker Braun a écrit :
> As always, you can get the latest beta version from the "develop" git branch. 
> Alternatively, the self-contained source tarball is at 
> http://www.sagemath.org/download-latest.html 
> 
> 
> 
> 4430e4cc37c (tag: 10.2.rc2, github/develop) Updated SageMath version to 
> 10.2.rc2
> 883e05f8ee0 gh-36698: src/sage/combinat/root_system/coxeter_group.py: Fix 
> typo in lazy_import
> a0872bed5c9 gh-36671: build/pkgs/openblas: Stop openblas from using explicit 
> `make -j N`; but use `make -j 1` on `ubuntu-trusty`
> 405e166238e gh-36669: Sage knows Hadamard matrices <1201, not 1001
> bb7cf9b7c64 gh-36529: src/sage/misc/latex.py: fix view()
> e349b002499 (tag: 10.2.rc1) Updated SageMath version to 10.2.rc1
> 
> -- 
> You received this message because you are subscribed to the Google Groups 
> "sage-release" group.
> To unsubscribe from this group and stop receiving emails from it, send an 
> email to sage-release+unsubscr...@googlegroups.com 
> .
> To view this discussion on the web visit 
> https://groups.google.com/d/msgid/sage-release/c2a87e5a-5645-439a-99b5-88a0c5661862n%40googlegroups.com
>  
> .

-- 
You received this message because you are subscribed to the Google Groups 
"sage-release" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-release+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/sage-release/26D5FF0E-52FF-4D16-B34D-9EF3B0E41454%40gmail.com.

[sage-release] Sage 10.2.rc2 released

2023-11-12 Thread Volker Braun 
As always, you can get the latest beta version from the "develop" git 
branch. Alternatively, the self-contained source tarball is at 
http://www.sagemath.org/download-latest.html


4430e4cc37c (tag: 10.2.rc2, github/develop) Updated SageMath version to 
10.2.rc2
883e05f8ee0 gh-36698: src/sage/combinat/root_system/coxeter_group.py: Fix 
typo in lazy_import
a0872bed5c9 gh-36671: build/pkgs/openblas: Stop openblas from using 
explicit `make -j N`; but use `make -j 1` on `ubuntu-trusty`
405e166238e gh-36669: Sage knows Hadamard matrices <1201, not 1001
bb7cf9b7c64 gh-36529: src/sage/misc/latex.py: fix view()
e349b002499 (tag: 10.2.rc1) Updated SageMath version to 10.2.rc1

-- 
You received this message because you are subscribed to the Google Groups 
"sage-release" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-release+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/sage-release/a12af485-5932-4adf-a354-ef400cc991afn%40googlegroups.com.