[Python-Dev] Re: Can't sync cpython main to my fork

2021-05-06 Thread Brett Cannon
Just today, GitHub launched a new feature to sync a branch with upstream via the web UI. https://github.blog/changelog/2021-05-06-sync-an-out-of-date-branch-of-a-fork-from-the-web On Thu., May 6, 2021, 15:16 Ethan Furman, wrote: > On 5/6/21 7:14 AM, Jelle Zijlstra wrote: > > > Maybe others

[Python-Dev] Re: Can't sync cpython main to my fork

2021-05-06 Thread Ethan Furman
On 5/6/21 7:14 AM, Jelle Zijlstra wrote: > Maybe others have different workflows, but I don't see much of a need > for keeping your fork's main branch up to date. I will occasionally do a `git push origin main` just to shut up the messages about being behind/ahead; other than that, I have no

[Python-Dev] Re: Can't sync cpython main to my fork

2021-05-06 Thread Skip Montanaro
> Maybe others have different workflows, but I don't see much of a need for > keeping your fork's main branch up to date. My workflow is something like > this: > > % git remote -v > origin g...@github.com:JelleZijlstra/cpython.git (fetch) > origin g...@github.com:JelleZijlstra/cpython.git (push)

[Python-Dev] Re: Documenting collections.abc __class_getitem__ type hints

2021-05-06 Thread Paul Bryan
I should have probably written my message more clearly. I'm referring to the specific expected parameters for generic types, especially those in collections.abc (e.g. Callable, Coroutine, ...). Each expects different parameters depending on its type. Other examples, where are the (non-deprecated)

[Python-Dev] Re: Can't sync cpython main to my fork

2021-05-06 Thread Mariatta
I also don't keep my fork in sync, and never needed to. I use the same workflow as Jelle. On Thu., May 6, 2021, 7:18 a.m. Jelle Zijlstra, wrote: > > > El jue, 6 may 2021 a las 6:58, Skip Montanaro () > escribió: > >> > Your main branch in GitHub has some commits they are not in >>

[Python-Dev] Re: Can't sync cpython main to my fork

2021-05-06 Thread Jelle Zijlstra
El jue, 6 may 2021 a las 6:58, Skip Montanaro () escribió: > > Your main branch in GitHub has some commits they are not in > python/cpython. > > https://github.com/smontanaro/cpython/commits/main > > Regarding this. How else am I to keep my fork in sync with > python/cpython other than by the

[Python-Dev] Re: Documenting collections.abc __class_getitem__ type hints

2021-05-06 Thread Luciano Ramalho
Hello, Paul. The docs for __class_getitem__ are here: https://docs.python.org/3/reference/datamodel.html#emulating-generic-types I think the Data Model chapter is the right place for it. Cheers, Luciano On Thu, May 6, 2021 at 2:14 AM Paul Bryan wrote: > > I'm looking through the

[Python-Dev] Re: Can't sync cpython main to my fork

2021-05-06 Thread Skip Montanaro
> Your main branch in GitHub has some commits they are not in python/cpython. > https://github.com/smontanaro/cpython/commits/main Regarding this. How else am I to keep my fork in sync with python/cpython other than by the occasional pull upstream/push origin process? That's what all those merges

[Python-Dev] Re: Can't sync cpython main to my fork

2021-05-06 Thread Skip Montanaro
Thanks for the recipe to fix my problem. Your main branch in GitHub has some commits they are not in python/cpython. > https://github.com/smontanaro/cpython/commits/main Is there a way to easily tell how they differ? My (obvious to me, but wrong) guess was git diff upstream/main origin/main

[Python-Dev] Re: Can't sync cpython main to my fork

2021-05-06 Thread Stefan Ring
On Thu, May 6, 2021 at 2:46 PM Skip Montanaro wrote: > > I looked at the fast-forward stuff in 'git push --help' but couldn't > decipher what it told me, or more importantly, how it related to my > problem. It's not clear to me how python/cpython:main can be behind > smontanaro/cpython:main.

[Python-Dev] Re: Can't sync cpython main to my fork

2021-05-06 Thread Inada Naoki
Your main branch in GitHub has some commits they are not in python/cpython. https://github.com/smontanaro/cpython/commits/main If you don't mind to trash all changes in your local and Github main branch, you can sync main branches by: # delete all changes in your worktree and main branch. $ git

[Python-Dev] Can't sync cpython main to my fork

2021-05-06 Thread Skip Montanaro
(Sorry, this is probably not really python-dev material, but I'm stuck trying to bring my fork into sync with python/cpython.) I don't know if I did something to my fork or if the master->main change did something to me, but I am unable to sync my smontanaro/cpython main with the python/cpython

[Python-Dev] Re: PEP 654: Exception Groups and except* [REPOST]

2021-05-06 Thread Irit Katriel via Python-Dev
Hi Nathaniel, Philosophy of Science 101: nobody knows what TheBestSolution is and nobody ever will. That said, when we decided to submit PEP 654, that was a point in time when we came to believe that we found the right solution. We made significant changes later following feedback we agreed

[Python-Dev] Re: PEP 654: Exception Groups and except* [REPOST]

2021-05-06 Thread Nathaniel Smith
On Thu, May 6, 2021 at 2:17 AM Nathaniel Smith wrote: > > On Thu, Apr 29, 2021 at 9:14 AM Yury Selivanov > wrote: > > Nathaniel, at this point it's clear that this thread somehow does not > > help us understand what you want. Could you please just write your own > > PEP clearly outlining your

[Python-Dev] Re: PEP 654: Exception Groups and except* [REPOST]

2021-05-06 Thread Nathaniel Smith
On Thu, Apr 29, 2021 at 9:14 AM Yury Selivanov wrote: > Nathaniel, at this point it's clear that this thread somehow does not > help us understand what you want. Could you please just write your own > PEP clearly outlining your proposal, its upsides and downsides? > Without a PEP from you this