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

Merge 'upstream/master' (9c0aa69937) #47

Merged

Conversation

EricCousineau-TRI
Copy link
Collaborator

@EricCousineau-TRI EricCousineau-TRI commented Oct 15, 2020

Supersedes #46

WIP Branch: https://github.com/EricCousineau-TRI/pybind11/tree/feature-upstream-merge-wip

FYI @rwgk


EDIT: I (Eric) am going to just merge this as I see fit, because CI has gotten too messy.

For the author:


This change is Reviewable

dsaxton and others added 30 commits August 31, 2020 16:01
* ci: harden chrono test, mark another macos 4.9 dev failure

This should help with a little of the flakiness seen with the timing test

* Update tests/test_chrono.py

* Can also fail
* doc: avoid C++ types in docstrings

* A bit of rewording

* Another bit of rewording

* Third rewording
* feat: py::pos_only

* fix: review points from @YannickJadoul

* fix: review points from @bstaletic

* refactor: kwonly -> kw_only
…d#2462)

* fix: use classic extension handling unless otherwise requested

* fix: variable must be cached to be used externally
)

* Add note about specifying custom base.

* Update exception docs based on PR feedback.

* Fix trailing whitespace.

Co-authored-by: Michal Sustr <michal.sustr@aic.fel.cvut.cz>
* ci: only annotate linux for now

* style: block some common mistakes
* Add py::object casting example to embedding docs

* Move implicit cast example to object.rst

* Move to bottom and improve implicit casting text

* Fix xref

* Improve wording as per @bstaletic's suggestion
* fix: support nvcc and test

* fixup! fix: support nvcc and test

* docs: mention what compilers fail

* fix: much simpler logic

* refactor: slightly faster / clearer
…ybind#2476)

The variables PYBIND11_HAS_OPTIONAL, PYBIND11_HAS_EXP_OPTIONAL, PYBIND11_HAS_VARIANT,
__clang__, __APPLE__ were not checked for defined in a minortity of instances.

If the project using pybind11 sets -Wundef, the warnings will show.

The test build is also modified to catch the problem.
…py::error_already_set if not (bis) (pybind#2477)

* Add check if `str(handle)` correctly converted the object, and throw py::error_already_set if not

* Fix tests on Python 3

* Apply @rwgk's fixes to cherry-picked commits from pybind#2392
* Added guards to the includes

Added new CI config

Added new trigger

Changed CI workflow name

Debug CI

Debug CI

Debug CI

Debug CI

Added flags fro PGI

Disable Eigen

Removed tests that fail

Uncomment lines

* fix: missing include

fix: minor style cleanup

tests: support skipping

ci: remove and tighten a bit

fix: try msvc workaround for pgic

* tests: split up prealoc tests

* fix: PGI compiler fix

* fix: PGI void_t only

* fix: try to appease nvcc

* ci: better ordering for slow tests

* ci: minor improvements to testing

* ci: Add NumPy to testing

* ci: Eigen generates CUDA warnings / PGI errors

* Added CentOS7 back for a moment

* Fix YAML

* ci: runs-on missing

* centos7 is missing pytest

* ci: use C++11 on CentOS 7

* ci: test something else

* Try just adding flags on CentOS 7

* fix: CentOS 7

* refactor: move include to shared location

* Added verbose flag

* Try to use system cmake3 on CI

* Try to use system cmake3 on CI, attempt2

* Try to use system cmake3 on CI, attempt3

* tests: not finding pytest should be a warning, not a fatal error

* tests: cleanup

* Weird issue?

* fix: final polish

Co-authored-by: Andrii Verbytskyi <andrii.verbytskyi@mpp.mpg.de>
Co-authored-by: Henry Schreiner <henryschreineriii@gmail.com>
Co-authored-by: Andrii Verbytskyi <averbyts@cern.ch>
Why only for pointers? Because C casts are hard to grep for.
* feat: type<T>()

* refactor: using py::type as class

* refactor: py::object as base

* wip: tigher api

* refactor: fix conversion and limit API further

* docs: some added notes from @EricCousineau-TRI

* refactor: use py::type::of
…e C- or F-contiguity flags (pybind#2484)

* Stop py::array_t arguments from accepting arrays that do not match the C- or F-contiguity flags

* Add trivially-contiguous arrays to the tests
…E and PYBIND11_OVERLOAD_PURE (pybind#2325)

* Wrap PYBIND11_OVERLOAD_NAME and PYBIND11_OVERLOAD_PURE_NAME in do { ... } while (false), and resolve trailing semicolon

* Deprecate PYBIND11_OVERLOAD_* and get_overload in favor of PYBIND11_OVERRIDE_* and get_override

* Correct erroneous usage of 'overload' instead of 'override' in the implementation and internals

* Fix tests to use non-deprecated PYBIND11_OVERRIDE_* macros

* Update docs to use override instead of overload where appropriate, and add warning about deprecated aliases

* Add semicolons to deprecated PYBIND11_OVERLOAD macros to match original behavior

* Remove deprecation of PYBIND11_OVERLOAD_* macros and get_overload

* Add note to changelog and upgrade guide
```
/pybind11/include/pybind11/iostream.h:71:9: warning: Call to virtual method 'pythonbuf::sync' during destruction bypasses virtual dispatch [clang-analyzer-optin.cplusplus.VirtualCall]
        sync();
        ^
/pybind11/tests/test_iostream.cpp:72:5: note: Calling '~scoped_ostream_redirect'
    });
```
…uctor from PyObject* to handle (pybind#2467)

* Change base parameter type in register_exception and excepion constructor from PyObject* to handle

* Fix compilation error passing `handle` to `PyObject*`
dependabot bot and others added 3 commits February 9, 2021 17:00
…ybind#2851)

Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from v1.4.1 to v1.4.2.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.4.1...27b3170)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: OnlineCop <onlinecop@gmail.com>
* Add initial implementation

* Add few more methods

* Add tests

* Fix a typo

* Use std::string constructor which takes size

* Fix implicit sign conversion error

* Add size method and test

* Remove implicit conversion

* Fix bytearray constructors and operator std::string()

* Make implicit bytearray constructor explicit

* Rerun tests

* Add null check

* Rerun tests

* Rerun tests - 2

* Remove NULL check
Copy link
Collaborator Author

@EricCousineau-TRI EricCousineau-TRI left a comment

Choose a reason for hiding this comment

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

Reviewable status: 1 of 173 files reviewed, 1 unresolved discussion (waiting on @EricCousineau-TRI and @SeanCurtis-TRI)


README_DRAKE.md, line 165 at r2 (raw file):

Previously, EricCousineau-TRI (Eric Cousineau) wrote…

nit spelling "expand"

Done.


README_DRAKE.md, line 167 at r2 (raw file):

Previously, SeanCurtis-TRI (Sean Curtis) wrote…

I see what you were going for, but since both targets to be evaluated include the word "latest", I'd interpreted your use of the word, not as new information, but as a reference to the listed targets.

Perhaps indicating that there may be multiple results, and the ubuntu-latest and mac-latest that should be checked are in the most recent result.

Done, I think. (Soz for delay)

The link has now expired, and I don't know how to ask GitHub Actions to keep results around forever.

Can we defer updating this til another PR? (base CI is now broken, due to my delay I believe)

@EricCousineau-TRI
Copy link
Collaborator Author

EricCousineau-TRI commented Feb 15, 2021

Hm... Given that this PR and master is now flat-out failing, I'm going to take executive power and just merge things myself in a separate PR.

@SeanCurtis-TRI Once I have baseline stuff working, I'll ensure that we can pick back up on the review.

@EricCousineau-TRI EricCousineau-TRI changed the title Merge 'upstream/master' (c4a8b5bb) Merge 'upstream/master' (417067ee) Feb 15, 2021
Copy link
Collaborator Author

@EricCousineau-TRI EricCousineau-TRI left a comment

Choose a reason for hiding this comment

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

-@SeanCurtis-TRI per above text - I'm going to just make this work 'cause CI got messy

Reviewable status: 1 of 193 files reviewed, 1 unresolved discussion (waiting on @EricCousineau-TRI)

dependabot bot and others added 8 commits February 17, 2021 18:48
…p. (pybind#2841)

* Splitting out detail/type_caster_base.h from cast.h.
* Include cleanup guided by include-what-you-use 0.12 based on clang version 9.0.1-11.
* [dtype]: add type() method to access type attribute of PyArray_Descr (eq. to dtype.char in Python)

* [dtype] change type() name method to char_() to be compliant with Python numpy interface

* [dtype] fix by pre-commit

* [dtype] Change comments and solutions format for test

* Clarify documentation and move note about dtype.char vs PyArray_Descr::type to a plain, non-doxygen comment

* Fix and extend tests

* Fix the supposedly fixed tests

* Fix the fixed tests again

Co-authored-by: Bertrand MICHEL <bertrand.michel@onera.fr>
Co-authored-by: Yannick Jadoul <yannick.jadoul@belgacom.net>
…ions from bindings code. Back-porting from smart_holder branch, to minimize diffs and potential for merge conflicts. (pybind#2875)

Thanks Wenzel!
@EricCousineau-TRI EricCousineau-TRI changed the title Merge 'upstream/master' (417067ee) Merge 'upstream/master' (9c0aa69937) Mar 4, 2021
@EricCousineau-TRI EricCousineau-TRI self-assigned this Mar 4, 2021
Copy link
Collaborator Author

@EricCousineau-TRI EricCousineau-TRI left a comment

Choose a reason for hiding this comment

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

Self-stamp to avoid bitrot: +@EricCousineau-TRI :lgtm:

Reviewable status: 1 of 196 files reviewed, 1 unresolved discussion (waiting on @EricCousineau-TRI)

Copy link
Collaborator Author

@EricCousineau-TRI EricCousineau-TRI left a comment

Choose a reason for hiding this comment

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

Reviewable status: 1 of 196 files reviewed, all discussions resolved (waiting on @EricCousineau-TRI)

a discussion (no related file):

Previously, EricCousineau-TRI (Eric Cousineau) wrote…

Working:

Should ensure that downstream CI passes:
RobotLocomotion/drake#14225

OK Manually tested downstream Drake on macsim. Was commit of Drake that uses pybind11 that didn't yet include multiple-inheritance fix, but meh:
RobotLocomotion/drake@78b4814


Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.