8000 Merge pull request #3 from python/main · python/cpython@9d1551c · GitHub
[go: up one dir, main page]
Skip to content

Commit 9d1551c

Browse files
liam-gerstenliam-gersten
authored
Merge pull request #3 from python/main
Update fork
2 parents dca27a6 + 81387fe commit 9d1551c

File tree

246 files changed

+4577
-2055
lines changed
  • test_contextlib.py
  • test_coroutines.py
  • test_curses.py
  • test_dataclasses.py
  • test_dis.py
  • test_embed.py
  • test_except_star.py
  • test_fstring.py
  • test_gdb.py
  • test_genericalias.py
  • test_grammar.py
  • test_import
  • test_launcher.py
  • test_opcache.py
  • test_pdb.py
  • test_peepholer.py
  • test_plistlib.py
  • test_range.py
  • test_socketserver.py
  • test_sqlite3
  • test_strptime.py
  • test_super.py
  • test_tarfile.py
  • test_tempfile.py
  • test_threading.py
  • test_traceback.py
  • test_type_cache.py
  • test_types.py
  • test_typing.py
  • test_unittest
  • test_urllib2.py
  • test_weakref.py
  • trace.py
  • unittest
  • uuid.py
  • Makefile.pre.in
  • Misc
  • Modules
  • Objects
  • Parser
  • Python
  • Tools

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    246 files changed

    +4577
    -2055
    lines changed

    ‎.devcontainer/Dockerfile‎

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -9,8 +9,8 @@ ENV WASMTIME_HOME=/opt/wasmtime
    99
    ENV WASMTIME_VERSION=7.0.0
    1010
    ENV WASMTIME_CPU_ARCH=x86_64
    1111

    12-
    RUN dnf -y --nodocs install git clang xz python3-blurb dnf-plugins-core && \
    13-
    dnf -y --nodocs builddep python3 && \
    12+
    RUN dnf -y --nodocs --setopt=install_weak_deps=False install /usr/bin/{blurb,clang,curl,git,ln,tar,xz} 'dnf-command(builddep)' && \
    13+
    dnf -y --nodocs --setopt=install_weak_deps=False builddep python3 && \
    1414
    dnf -y clean all
    1515

    1616
    RUN mkdir ${WASI_SDK_PATH} && \

    ‎.github/CODEOWNERS‎

    Lines changed: 3 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -11,7 +11,7 @@
    1111
    configure* @erlend-aasland @corona10
    1212

    1313
    # asyncio
    14-
    **/*asyncio* @1st1 @asvetlov @gvanrossum @kumaraditya303
    14+
    **/*asyncio* @1st1 @asvetlov @gvanrossum @kumaraditya303 @willingc
    1515

    1616
    # Core
    1717
    **/*context* @1st1
    @@ -25,6 +25,8 @@ Objects/frameobject.c @markshannon
    2525
    Objects/call.c @markshannon
    2626
    Python/ceval.c @markshannon
    2727
    Python/compile.c @markshannon @iritkatriel
    28+
    Python/assemble.c @markshannon @iritkatriel
    29+
    Python/flowgraph.c @markshannon @iritkatriel
    2830
    Python/ast_opt.c @isidentical
    2931
    Lib/test/test_patma.py @brandtbucher
    3032
    Lib/test/test_peepholer.py @brandtbucher

    ‎.github/workflows/build.yml‎

    Lines changed: 4 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -308,6 +308,10 @@ jobs:
    308308
    run: echo "::add-matcher::.github/problem-matchers/gcc.json"
    309309
    - name: Install Dependencies
    310310
    run: sudo ./.github/workflows/posix-deps-apt.sh
    311+
    - name: Set up GCC-10 for ASAN
    312+
    uses: egor-tensin/setup-gcc@v1
    313+
    with:
    314+
    version: 10
    311315
    - name: Configure OpenSSL env vars
    312316
    run: |
    313317
    echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> $GITHUB_ENV

    ‎.github/workflows/doc.yml‎

    Lines changed: 22 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -56,11 +56,13 @@ jobs:
    5656

    5757
    # Add pull request annotations for Sphinx nitpicks (missing references)
    5858
    - name: 'Get list of changed files'
    59+
    if: github.event_name == 'pull_request'
    5960
    id: changed_files
    6061
    uses: Ana06/get-changed-files@v2.2.0
    6162
    with:
    6263
    filter: "Doc/**"
    6364
    - name: 'Build changed files in nit-picky mode'
    65+
    if: github.event_name == 'pull_request'
    6466
    continue-on-error: true
    6567
    run: |
    6668
    # Mark files the pull request modified
    @@ -77,6 +79,26 @@ jobs:
    7779
    # Build docs with the '-n' (nit-picky) option, convert warnings to errors (-W)
    7880
    make -C Doc/ PYTHON=../python SPHINXOPTS="-q -n -W --keep-going" html 2>&1
    7981
    82+
    # This build doesn't use problem matchers or check annotations
    83+
    # It also does not run 'make check', as sphinx-lint is not installed into the
    84+
    # environment.
    85+
    build_doc_oldest_supported_sphinx:
    86+
    name: 'Docs (Oldest Sphinx)'
    87+
    runs-on: ubuntu-latest
    88+
    timeout-minutes: 60
    89+
    steps:
    90+
    - uses: actions/checkout@v3
    91+
    - name: 'Set up Python'
    92+
    uses: actions/setup-python@v4
    93+
    with:
    94+
    python-version: '3.11' # known to work with Sphinx 3.2
    95+
    cache: 'pip'
    96+
    cache-dependency-path: 'Doc/requirements-oldest-sphinx.txt'
    97+
    - name: 'Install build dependencies'
    98+
    run: make -C Doc/ venv REQUIREMENTS="requirements-oldest-sphinx.txt"
    99+
    - name: 'Build HTML documentation'
    100+
    run: make -C Doc/ SPHINXOPTS="-q" SPHINXERRORHANDLING="-W --keep-going" html
    101+
    80102
    # Run "doctest" on HEAD as new syntax doesn't exist in the latest stable release
    81103
    doctest:
    82104
    name: 'Doctest'

    ‎.github/workflows/require-pr-label.yml‎

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -6,7 +6,7 @@ on:
    66

    77
    jobs:
    88
    label:
    9-
    name: DO-NOT-MERGE
    9+
    name: DO-NOT-MERGE / unresolved review
    1010
    runs-on: ubuntu-latest
    1111
    timeout-minutes: 10
    1212

    @@ -15,4 +15,4 @@ jobs:
    1515
    with:
    1616
    mode: exactly
    1717
    count: 0
    18-
    labels: "DO-NOT-MERGE"
    18+
    labels: "DO-NOT-MERGE, awaiting changes, awaiting change review"

    ‎Doc/Makefile‎

    Lines changed: 3 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -13,6 +13,7 @@ JOBS = auto
    1313
    PAPER =
    1414
    SOURCES =
    1515
    DISTVERSION = $(shell $(PYTHON) tools/extensions/patchlevel.py)
    16+
    REQUIREMENTS = requirements.txt
    1617
    SPHINXERRORHANDLING = -W
    1718

    1819
    # Internal variables.
    @@ -154,8 +155,8 @@ venv:
    154155
    echo "To recreate it, remove it first with \`make clean-venv'."; \
    155156
    else \
    156157
    $(PYTHON) -m venv $(VENVDIR); \
    157-
    $(VENVDIR)/bin/python3 -m pip install -U pip setuptools; \
    158-
    $(< C55B span class="pl-smi">VENVDIR)/bin/python3 -m pip install -r requirements.txt; \
    158+
    $(VENVDIR)/bin/python3 -m pip install --upgrade pip; \
    159+
    $(VENVDIR)/bin/python3 -m pip install -r $(REQUIREMENTS); \
    159160
    echo "The venv has been created in the $(VENVDIR) directory"; \
    160161
    fi
    161162

    ‎Doc/c-api/type.rst‎

    Lines changed: 9 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -232,6 +232,15 @@ Type Objects
    232232
    233233
    .. versionadded:: 3.11
    234234
    235+
    .. c:function:: int PyUnstable_Type_AssignVersionTag(PyTypeObject *type)
    236+
    237+
    Attempt to assign a version tag to the given type.
    238+
    239+
    Returns 1 if the type already had a valid version tag or a new one was
    240+
    assigned, or 0 if a new tag could not be assigned.
    241+
    242+
    .. versionadded:: 3.12
    243+
    235244
    236245
    Creating Heap-Allocated Types
    237246
    .............................

    ‎Doc/c-api/typeobj.rst‎

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1145,7 +1145,7 @@ and :c:type:`PyType_Type` effectively act as defaults.)
    11451145

    11461146
    .. data:: Py_TPFLAGS_MANAGED_DICT
    11471147

    1148-
    This bit indicates that instances of the class have a ``__dict___``
    1148+
    This bit indicates that instances of the class have a ``__dict__``
    11491149
    attribute, and that the space for the dictionary is managed by the VM.
    11501150

    11511151
    If this flag is set, :const:`Py_TPFLAGS_HAVE_GC` should also be set.

    ‎Doc/c-api/unicode.rst‎

    Lines changed: 9 additions & 9 deletions
    Original file line numberDiff line numberDiff line change
    @@ -509,6 +509,15 @@ APIs:
    509509
    arguments.
    510510
    511511
    512+
    .. c:function:: PyObject* PyUnicode_FromObject(PyObject *obj)
    513+
    514+
    Copy an instance of a Unicode subtype to a new true Unicode object if
    515+
    necessary. If *obj* is already a true Unicode object (not a subtype),
    516+
    return the reference with incremented refcount.
    517+
    518+
    Objects other than Unicode or its subtypes will cause a :exc:`TypeError`.
    519+
    520+
    512521
    .. c:function:: PyObject* PyUnicode_FromEncodedObject(PyObject *obj, \
    513522
    const char *encoding, const char *errors)
    514523
    @@ -616,15 +625,6 @@ APIs:
    616625
    .. versionadded:: 3.3
    617626
    618627
    619-
    .. c:function:: PyObject* PyUnicode_FromObject(PyObject *obj)
    620-
    621-
    Copy an instance of a Unicode subtype to a new true Unicode object if
    622-
    necessary. If *obj* is already a true Unicode object (not a subtype),
    623-
    return the reference with incremented refcount.
    624-
    625-
    Objects other than Unicode or its subtypes will cause a :exc:`TypeError`.
    626-
    627-
    628628
    Locale Encoding
    629629
    """""""""""""""
    630630

    ‎Doc/conf.py‎

    Lines changed: 7 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -76,6 +76,13 @@
    7676
    if venvdir is not None:
    7777
    exclude_patterns.append(venvdir + '/*')
    7878

    79+
    nitpick_ignore = [
    80+
    # Do not error nit-picky mode builds when _SubParsersAction.add_parser cannot
    81+
    # be resolved, as the method is currently undocumented. For context, see
    82+
    # https://github.com/python/cpython/pull/103289.
    83+
    ('py:meth', '_SubParsersAction.add_parser'),
    84+
    ]
    85+
    7986
    # Disable Docutils smartquotes for several translations
    8087
    smartquotes_excludes = {
    8188
    'languages': ['ja', 'fr', 'zh_TW', 'zh_CN'], 'builders': ['man', 'text'],

    0 commit comments

    Comments
     (0)
    0