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.

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

git merge smart_holder (pybind/pybind11#5185) #30131

Merged
merged 6 commits into from
Jun 22, 2024
Merged

Commits on Jun 21, 2024

  1. Add Python 3.10, 3.11, 3.12 to win32 job matrix. (google#5179)

    * Add Python 3.10, 3.11, 3.12 to win32 job matrix.
    
    * Quotes around Python version numbers (win32 job).
    
    * tests/requirements.txt: no scipy for Python >= 3.10 under win32
    
    * Try running `cmake --build . --target cpptest` on all platforms (`standard` job).
    Ralf W. Grosse-Kunstleve authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    5552cbf View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2024

  1. feat: remove Python 3.6 support (google#5177)

    * Change Python version guard: PYTHON < 3.7 IS UNSUPPORTED.
    
    * Replace or remove Python 3.6 jobs.
    
    * Move appveyor to Python 3.8
    
    * Change `[tool.pylint]` `master.py-version` from `3.6` to `3.8`
    
    * Change `[tool.pylint]` `master.py-version` to `3.7`
    
    * Remove `centos:7` job; Change almalinux:8 job to use Python 3.8
    
    * Try 🐍 3.8 • ubuntu-20.04 • x64 without `-DCMAKE_CXX_FLAGS="-D_=1"`
    
    * Update setup.cfg as suggested by @henryiii
    
    * Try running `cmake --build . --target cpptest` on all platforms (`standard` job).
    
    * Disable deadsnakes jobs entirely.
    
    * Apply PR google#5179: Add Python 3.10, 3.11, 3.12 to win32 job matrix.
    
    * Add back `-DCMAKE_CXX_FLAGS="-D_=1"` but do not install boost in that case.
    
    * PY_VERSION_HEX < 3.7 cleanup pass: include/pybind11
    
    * WITH_THREAD cleanup pass: include/pybind11
    
    * Undo incorrect change.
    
    * Revert "Disable deadsnakes jobs entirely."
    
    This reverts commit bbcd0087b2d52e0130f96792dd5dd03704280a57.
    
    * WITH_THREAD cleanup pass: tests/
    
    * Change Python version guard in pybind11/__init__.py: pybind11 does not support Python < 3.7.
    
    * Misc cleanup pass
    
    * chore: use future imports
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * Update tests/test_numpy_array.py
    
    * Update test_numpy_array.py
    
    ---------
    
    Signed-off-by: Henry Schreiner <[email protected]>
    Co-authored-by: Henry Schreiner <[email protected]>
    Ralf W. Grosse-Kunstleve and henryiii authored Jun 22, 2024
    Configuration menu
    Copy the full SHA
    f1a2e03 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into sh_merge_master

    Ralf W. Grosse-Kunstleve committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    d958b78 View commit details
    Browse the repository at this point in the history
  3. Tracking ci.yml changes from master.

    Ralf W. Grosse-Kunstleve committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    67d6788 View commit details
    Browse the repository at this point in the history
  4. ruff automatic fixes: from __future__ import annotations

    ```
    ruff.....................................................................Failed
    - hook id: ruff
    - files were modified by this hook
    
    Fixed 44 errors:
    - tests/test_class_sh_basic.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_disowning.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_disowning_mi.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_factory_constructors.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_inheritance.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_mi_thunks.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_module_local.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_property.py:
        1 × I002 (missing-required-import)
    - tests/test_class_sh_property_non_owning.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_shared_ptr_copy_move.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_trampoline_basic.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_trampoline_self_life_support.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_trampoline_shared_from_this.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_trampoline_shared_ptr_cpp_arg.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_trampoline_unique_ptr.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_unique_ptr_custom_deleter.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_unique_ptr_member.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_class_sh_virtual_py_cpp_mix.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_classh_mock.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_descr_src_loc.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_exc_namespace_visibility.py:
        1 × I002 (missing-required-import)
    - tests/test_type_caster_odr_guard_1.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    - tests/test_type_caster_odr_guard_2.py:
        1 × I001 (unsorted-imports)
        1 × I002 (missing-required-import)
    
    Found 44 errors (44 fixed, 0 remaining).
    ```
    Ralf W. Grosse-Kunstleve committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    a8bc5f7 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'smart_holder' into pybind11k_merge_sh

    Conflicts resolved:
        .github/workflows/pip.yml
        include/pybind11/detail/internals.h
        tests/test_methods_and_attributes.py
        tests/test_pickling.py
        tests/test_python_multiple_inheritance.py
    
    Additional `WITH_THREAD` removal in files that only exist in pybind11k:
        abi_platform_id.h
        cross_extension_shared_state.h
    Ralf W. Grosse-Kunstleve committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    8fb23f6 View commit details
    Browse the repository at this point in the history