Skip to content

Merge 'upstream/master' (1caf1d06) #43

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

Conversation

EricCousineau-TRI
Copy link
Collaborator

@EricCousineau-TRI EricCousineau-TRI commented Aug 3, 2020

Resolves RobotLocomotion/drake#13800

Process:


This change is Reviewable

AWhetter and others added 30 commits June 29, 2020 11:48
The PyEval_InitThreads() and PyEval_ThreadsInitialized() functions are
now deprecated and will be removed in Python 3.11. Calling
PyEval_InitThreads() now does nothing. The GIL is initialized by
Py_Initialize() since Python 3.7.
pybind11_add_module fails because FindPythonLibsNew.cmake try to link PythonXX.lib, but the first letter "p" should be lowercase.
* Adding pybind11::cast overload for rvalue references
* Error out eval_file

* Enable dynamic attribute support for Pypy >= 6

* Add a test for dynamic attribute support

* Skip test for eval_file on pypy

* Workaround for __qualname__ on PyPy3

* Add a PyPy3.6 7.3.0 build

* Only disable in PyPy3

* Fix travis testing

* No numpy and scipy for pypy

* Enable test on pypy2

* Fix logic in eval_file

* Skip a few tests due to bugs in PyPy

* scipy wheels are broken. make pypy2 a failrue

Co-authored-by: Andreas Kloeckner <[email protected]>
* Change NAMESPACE_BEGIN and NAMESPACE_END macros into PYBIND11_NAMESPACE_BEGIN and PYBIND11_NAMESPACE_END

* Fix sudden HomeBrew 'python not installed' error

* Sweep difference in 'Class.__init__() must be called when overriding __init__' error message between CPython and PyPy under the rug

* Homebrew updated to 3.8 yesterday.

Co-authored-by: Henry Schreiner <[email protected]>
This avoids a potential conflict with names in the same scope of the
same name as the embedded module, like namespaces or other global
variables.

Fixes pybind#2172
* Fix undefined memoryview format

* Add missing <algorithm> header

* Add workaround for py27 array compatibility

* Workaround py27 memoryview behavior

* Fix memoryview constructor from buffer_info

* Workaround PyMemoryView_FromMemory availability in py27

* Fix up memoryview tests

* Update memoryview test from buffer to check signedness

* Use static factory method to create memoryview

* Remove ndim arg from memoryview::frombuffer and add tests

* Allow ndim=0 memoryview and documentation fixup

* Use void* to align to frombuffer method signature

* Add const variants of frombuffer and frommemory

* Add memory view section in doc

* Fix docs

* Add test for null buffer

* Workaround py27 nullptr behavior in test

* Rename frombuffer to from_buffer
- look for windows python lib when using mingw & msys
  - if not found, then look for system python lib as before
…tibility. (pybind#2314)

Tested with 2.7.18rc1, built with Py_UNICODE_SIZE 4.
Change also tested with Python 3.8.
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: 0 of 127 files reviewed, 1 unresolved discussion (waiting on @EricCousineau-TRI)

a discussion (no related file):
Working: I have no idea how to test out transitioning for GitHub actions, so meh for now.
Filed: RobotLocomotion/drake#13800


@EricCousineau-TRI
Copy link
Collaborator Author

EricCousineau-TRI commented Aug 3, 2020

This is a can o' worms. Going to cherry-pick route.

EDIT: Updated.

…3-upstream

# Conflicts:
#	.travis.yml
#	docs/advanced/classes.rst
#	docs/compiling.rst
#	include/pybind11/detail/common.h
#	include/pybind11/pytypes.h
#	tests/CMakeLists.txt
#	tests/test_class.cpp
#	tests/test_class.py
#	tests/test_methods_and_attributes.py
#	tools/pybind11Tools.cmake
They cause errors otherwise
@EricCousineau-TRI EricCousineau-TRI force-pushed the feature-2020-08-03-upstream branch from cd0533e to 6e8628e Compare September 6, 2020 16:32
@EricCousineau-TRI
Copy link
Collaborator Author

EricCousineau-TRI commented Sep 6, 2020

Reviewer checklist:

  • Does the commit title look correct? (does it only contain up to 1caf1d0 of upstream?)
  • Do the drake-specific changes (the last few commits) look OK? (no windows, no PyPy, no Python 2.7 / 3.5)
  • Do the new CI checks look correct? (Ubuntu, Mac, Python versions?)

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.

+@rpoyner-tri for review, please. Please see the reviewer checklist in this PR (no need to review the upstream code itself):
#43 (comment)

Reviewable status: 0 of 129 files reviewed, all discussions resolved (waiting on @rpoyner-tri)

a discussion (no related file):

Previously, EricCousineau-TRI (Eric Cousineau) wrote…

Working: I have no idea how to test out transitioning for GitHub actions, so meh for now.
Filed: RobotLocomotion/drake#13800

OK Done.

I just pushed a change to robotlocomotion/drake that enabled a placeholder GitHub Actions config which allows actions to run on PRs (which will have modified actions):
https://github.com/RobotLocomotion/pybind11/blob/8bc3aa1011819e61bc8a77aae2e45167bd3bff82/.github/workflows/ci.yml


Copy link

@rpoyner-tri rpoyner-tri left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 122 of 127 files at r1, 7 of 7 files at r2.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@EricCousineau-TRI EricCousineau-TRI merged commit 58a368e into RobotLocomotion:drake Sep 8, 2020
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.

pybind11: Should upgrade to use GitHub actions CI