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 #4960

Merged
merged 10 commits into from
Dec 2, 2023
Merged

Commits on Nov 15, 2023

  1. Configuration menu
    Copy the full SHA
    b389ae7 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. fix(cmake): avoid really slow compile on emscripten (pybind#4642)

    * fix: avoid really slow compile on emscripten
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * Update tools/pybind11Common.cmake
    
    ---------
    
    Signed-off-by: Henry Schreiner <[email protected]>
    henryiii authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    6cf90e7 View commit details
    Browse the repository at this point in the history
  2. ci: add more versions of numpy/scipy/pypy (pybind#4714)

    * ci: add more versions of numpy/scipy/pypy
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * Apply suggestions from code review
    
    * style: pre-commit fixes
    
    * Update requirements.txt
    
    * Update requirements.txt
    
    * Apply suggestions from code review
    
    ---------
    
    Signed-off-by: Henry Schreiner <[email protected]>
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    henryiii and pre-commit-ci[bot] authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    6831666 View commit details
    Browse the repository at this point in the history
  3. fix(cmake): findpython issues and 3.12 support for pybind11_find_impo…

    …rt (pybind#4941)
    
    * fix(cmake): findpython issues and 3.12 support for pybind11_find_import
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * Update pybind11NewTools.cmake
    
    ---------
    
    Signed-off-by: Henry Schreiner <[email protected]>
    henryiii authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    9591cfb View commit details
    Browse the repository at this point in the history
  4. pybind11.pc: use pcfiledir for relative destinations (pybind#4830)

    * pybind11.pc: use pcfiledir for relative destinations
    
    If the datarootdir is absolute, just use the absolute path directly.
    However, if it is relative, we can compute the prefix from the location
    of the `.pc` file itself. This allows the install to be relocatable.
    
    * chore: use 3.20's cmake_path if available
    
    * style: pre-commit fixes
    
    * Update CMakeLists.txt
    
    ---------
    
    Co-authored-by: Henry Schreiner <[email protected]>
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    3 people authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    dc9b395 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. chore(deps): bump deadsnakes/action from 3.0.1 to 3.1.0 (pybind#4951)

    Bumps [deadsnakes/action](https://github.com/deadsnakes/action) from 3.0.1 to 3.1.0.
    - [Release notes](https://github.com/deadsnakes/action/releases)
    - [Commits](deadsnakes/action@v3.0.1...v3.1.0)
    
    ---
    updated-dependencies:
    - dependency-name: deadsnakes/action
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    4bb6163 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. fix(stl_bind): Enable bind_map with using declarations. (pybind#4952

    )
    
    * Enable `bind_map` with `using` declarations.
    
    * style: pre-commit fixes
    
    * Enable directives in bind_vector
    
    * Add tests for bind_ and using directives
    
    * style: pre-commit fixes
    
    * Remove C++17 functions
    
    * Fix test comment
    
    * Add minimal user like map py test
    
    ---------
    
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    AntoinePrv and pre-commit-ci[bot] authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    a67d786 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2023

  1. Merge branch 'master' into sh_merge_master

    Ralf W. Grosse-Kunstleve committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    686783b View commit details
    Browse the repository at this point in the history
  2. Tracking ci.yml changes from master.

    Ralf W. Grosse-Kunstleve committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    d373f16 View commit details
    Browse the repository at this point in the history
  3. Similar to pybind#4918: continue to be very specific.

    Ralf W. Grosse-Kunstleve committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    3d39f29 View commit details
    Browse the repository at this point in the history