Skip to content
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.

Sign up for GitHub

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

Jump to bottom

bpo-45532: Replace 'default' with 'main' as default in sys.version #29100

Merged
merged 1 commit into from
Oct 20, 2021
Merged

bpo-45532: Replace 'default' with 'main' as default in sys.version #29100

merged 1 commit into from
Oct 20, 2021

Conversation

youknowone
Copy link
Contributor

@youknowone youknowone commented Oct 20, 2021 •
edited by bedevere-bot
Loading

@corona10 corona10 added needs backport to 3.9 only security fixes needs backport to 3.10 only security fixes labels Oct 20, 2021
corona10
corona10 requested changes Oct 20, 2021
View reviewed changes
Modules/getbuildinfo.c Show resolved Hide resolved
@bedevere-bot
Copy link

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@youknowone youknowone force-pushed the git-id-fallback-main branch 2 times, most recently from 01b0fa3 to a4d1c4f Compare October 20, 2021 16:11
@youknowone youknowone force-pushed the git-id-fallback-main branch from a4d1c4f to 18ef124 Compare October 20, 2021 16:16
corona10
corona10 approved these changes Oct 20, 2021
View reviewed changes
Copy link
Member

@corona10 corona10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@youknowone youknowone force-pushed the git-id-fallback-main branch from 18ef124 to 2b71c47 Compare October 20, 2021 16:41
@corona10 corona10 merged commit d2cd5ee into python:main Oct 20, 2021
@miss-islington
Copy link
Contributor

Thanks @youknowone for the PR, and @corona10 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9, 3.10.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 20, 2021
@youknowone @miss-islington
bpo-45532: Replace 'default' with 'main' as default in sys.version (p…
669f46f 
…ythonGH-29100)

(cherry picked from commit d2cd5ee)

Co-authored-by: Jeong YunWon <69878+youknowone@users.noreply.github.com>
@bedevere-bot
Copy link

GH-29106 is a backport of this pull request to the 3.10 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Oct 20, 2021
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 20, 2021
@youknowone @miss-islington
bpo-45532: Replace 'default' with 'main' as default in sys.version (p…
cad5180 
…ythonGH-29100)

(cherry picked from commit d2cd5ee)

Co-authored-by: Jeong YunWon <69878+youknowone@users.noreply.github.com>
@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Oct 20, 2021
@bedevere-bot
Copy link

GH-29107 is a backport of this pull request to the 3.9 branch.

miss-islington added a commit that referenced this pull request Oct 20, 2021
@miss-islington @youknowone
bpo-45532: Replace 'default' with 'main' as default in sys.version (G…
696a89f 
…H-29100)

(cherry picked from commit d2cd5ee)

Co-authored-by: Jeong YunWon <69878+youknowone@users.noreply.github.com>
miss-islington added a commit that referenced this pull request Oct 20, 2021
@miss-islington @youknowone
bpo-45532: Replace 'default' with 'main' as default in sys.version (G…
1249ce7 
…H-29100)

(cherry picked from commit d2cd5ee)

Co-authored-by: Jeong YunWon <69878+youknowone@users.noreply.github.com>
@youknowone youknowone deleted the git-id-fallback-main branch October 20, 2021 18:19
@bedevere-bot
Copy link

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot ARM64 macOS 3.9 has failed when building commit 1249ce7.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/726/builds/60) and take a look at the build logs.
  4. Check if the failure is related to this commit (1249ce7) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/726/builds/60

Failed tests:

  • test_importlib

Summary of the results of the build (if available):

==

Click to see traceback logs 
Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.9.pablogsal-macos-m1.macos-with-brew/build/Lib/multiprocessing/resource_tracker.py", line 201, in main
    cache[rtype].remove(name)
KeyError: '/psm_57d5c5b5'


Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.9.pablogsal-macos-m1.macos-with-brew/build/Lib/multiprocessing/resource_tracker.py", line 201, in main
    cache[rtype].remove(name)
KeyError: '/psm_1d9f08ba'

shihai1991 added a commit to shihai1991/cpython that referenced this pull request Oct 21, 2021
@shihai1991
Merge branch 'main' into bpo_45113_3
9d162ef 
* main: (263 commits)
  bpo-45521: Fix a bug in the obmalloc radix tree code. (pythonGH-29051)
  bpo-45522: Allow to disable freelists on build time (pythonGH-29056)
  bpo-34451: Document prompt and output toggle feature in html tutorial (pythonGH-27105)
  bpo-44019: Add operator.call() to __all__ for the operator module (pythonGH-29110)
  bpo-45315: PyType_FromSpec: Copy spec->name and have the type own the memory for its name (pythonGH-29103)
  bpo-44220: Export PyStructSequence_UnnamedField in the limited API (pythonGH-26331)
  bpo-44174: [Enum] add reference to name mangling (pythonGH-29116)
  bpo-45548: add some missing entries to `Modules/Setup` (pythonGH-29115)
  bpo-35673: Add a public alias for namespace package __loader__ attribute (python#29049)
  bpo-45192: Fix a bug that infers the type of an os.PathLike[bytes] object as str (pythonGH-28323)
  bpo-45527: Don't count cache hits, just misses. (pythonGH-29092)
  bpo-45320: Remove long-deprecated inspect methods (pythonGH-28618)
  bpo-41374: Remove obsolete exclusion of netinet/tcp.h on Cygwin (pythonGH-21649)
  bpo-45532: Replace 'default' with 'main' as default in sys.version (pythonGH-29100)
  bpo-45464: [doc] Explain that subclassing multiple exceptions is fragile (pythonGH-29094)
  Cleanup a couple of comments left on PR 28775 post-merge. (pythonGH-29079)
  bpo-45536: Check OpenSSL APIs in configure (pythonGH-29088)
  Add PEPs 593 & 647 to list of PEPs at top of typing docs (pythonGH-29097)
  Add a comment about how to fix bogus test_host_resolution_bad_address failures (python#29085)
  bpo-44525: Specialize simple Python calls. (pythonGH-29033)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@corona10 corona10 corona10 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@youknowone @bedevere-bot @miss-islington @corona10 @the-knights-who-say-ni