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

[smart_holder] git merge master #5076

Merged
merged 15 commits into from
Mar 28, 2024
Merged

Commits on Mar 21, 2024

  1. ci: skipping test for Windows Clang failure (pybind#5062)

    * ci: trying things for Windows Clang failure
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * WIP: try using older clang
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * tests: skip broken test
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * tests: try to skip test in tests
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * fix(tests): Prefer __version__ over MSVC
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * chore: avoid warning on Clang
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * Update tests/test_exceptions.py
    
    * Update tests/test_exceptions.py
    
    ---------
    
    Signed-off-by: Henry Schreiner <[email protected]>
    henryiii committed Mar 21, 2024
    1 Configuration menu
    Copy the full SHA
    ec73bda View commit details
    Browse the repository at this point in the history
  2. 1 Configuration menu
    Copy the full SHA
    ddb8b67 View commit details
    Browse the repository at this point in the history
  3. 1 Configuration menu
    Copy the full SHA
    65370f3 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. tests: hide warning on clang (pybind#5069)

    Signed-off-by: Henry Schreiner <[email protected]>
    henryiii committed Mar 26, 2024
    1 Configuration menu
    Copy the full SHA
    e0f2c71 View commit details
    Browse the repository at this point in the history
  2. feat: make numpy.h compatible with both NumPy 1.x and 2.x (pybind#5050

    )
    
    * API: Make `numpy.h` compatible with both NumPy 1.x and 2.x
    
    * TST: Update numpy dtype flags test to not covert flags to char
    
    * API: Add `numpy2.h` instead and make `numpy.h` safe
    
    This means that users of `numpy.h` cannot be broken, but need to
    update to `numpy2.h` if they want to compile for NumPy 2.
    
    Using Macros simply and didn't bother to try to remove unnecessary
    code paths.
    
    * API: Rather than `numpy2.h` use a define for the user.
    
    * Thread `PYBIND11_NUMPY2_SUPPORT` through things and try to adept test matrix
    
    * Small fixups (shouldn't matter)?
    
    * Fixup.  Does upgrading scipy help?  (it shouldn't?)
    
    (Some other small fixup)
    
    * Use NumPy 2 nightlies for ubuntu-latest job also
    
    * BUG: Fix numpy.bool check
    
    * TST: Fix complexwarning
    
    * BUG: Fix the fact that only the 50 slot is filled with the copy alias
    
    (There were 3 functions all doing the same, only this slot survived 2.x)
    
    * TST: One more test tweak
    
    * TST: Use "long" name for long, since it changed on windows
    
    * TST: Apparently we didn't always have ulong, so just use `L`
    
    * TST: Enforce dtype='l' for test as default isn't long anymore on windows
    
    * Rename macro and invert logic to PYBIND11_NUMPY_1_ONLY
    
    * PYBIND11_INTERNAL_NUMPY_1_ONLY_DETECTED
    
    * Test and code comment expansion
    
    * CI: Use pre-releases of numpy/scipy from pip via explicit version
    
    * CI: NumPy 2 only available on almalinux (as it is Python >=3.9)
    
    * MAINT: Match name more exactly and adopt error phrasing
    
    * MAINT: Pushed early, move helper to be private member
    
    * fix error message compilation when using NumPy 1.x-only backcompat
    
    * silence name shadowing warning
    
    * chore: minor optimization
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    ---------
    
    Signed-off-by: Henry Schreiner <[email protected]>
    Co-authored-by: Ralf W. Grosse-Kunstleve <[email protected]>
    Co-authored-by: Henry Schreiner <[email protected]>
    3 people committed Mar 26, 2024
    1 Configuration menu
    Copy the full SHA
    705efcc View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Bug fixes: Add missing handle_type_name specializations. (pybind#5073)

    * Transfer bug fixes from pybind#4888 wholesale. Full test coverage for all fixes is still missing.
    
    * Add cmake option(PYBIND11_DISABLE_HANDLE_TYPE_NAME_DEFAULT_IMPLEMENTATION) and use in some tests.
    Ralf W. Grosse-Kunstleve committed Mar 27, 2024
    1 Configuration menu
    Copy the full SHA
    0efff79 View commit details
    Browse the repository at this point in the history
  2. fix: fully qualify usages of concat to protect against ADL (pybind#4955)

    * Call concat with proper namespace in cast.h
    
    * Apply suggestions from code review
    
    * tests: add test for ADL on concat
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * fix: fully qualify all usages of concat
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    ---------
    
    Signed-off-by: Henry Schreiner <[email protected]>
    Co-authored-by: Henry Schreiner <[email protected]>
    volkm and henryiii committed Mar 27, 2024
    1 Configuration menu
    Copy the full SHA
    67c9c56 View commit details
    Browse the repository at this point in the history
  3. chore: prepare 2.12.0 (pybind#5070)

    * chore: prepare 2.12.0
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * docs: more info on numpy 2
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * docs: mention NumPy 2 in README
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * docs: add release date
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * docs: add 4955
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * Update changelog.rst
    
    * docs: address review comments
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    ---------
    
    Signed-off-by: Henry Schreiner <[email protected]>
    henryiii committed Mar 27, 2024
    1 Configuration menu
    Copy the full SHA
    6b5674f View commit details
    Browse the repository at this point in the history
  4. 1 Configuration menu
    Copy the full SHA
    3e9dfa2 View commit details
    Browse the repository at this point in the history
  5. docs: remove extra space

    Signed-off-by: Henry Schreiner <[email protected]>
    henryiii committed Mar 27, 2024
    1 Configuration menu
    Copy the full SHA
    b91b584 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. chore: get back to work

    Signed-off-by: Henry Schreiner <[email protected]>
    henryiii committed Mar 28, 2024
    1 Configuration menu
    Copy the full SHA
    7af193e 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 Mar 28, 2024
    Configuration menu
    Copy the full SHA
    826f615 View commit details
    Browse the repository at this point in the history
  3. Tracking ci.yml changes from master.

    Ralf W. Grosse-Kunstleve committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    e215ded View commit details
    Browse the repository at this point in the history
  4. chore: bump cmake to 3.29 (pybind#5075)

    Signed-off-by: Henry Schreiner <[email protected]>
    henryiii committed Mar 28, 2024
    1 Configuration menu
    Copy the full SHA
    7f2214b View commit details
    Browse the repository at this point in the history
  5. Merge branch 'master' into sh_merge_master

    Ralf W. Grosse-Kunstleve committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    c55ee33 View commit details
    Browse the repository at this point in the history