[pybind11] 06/09: merge patched into master
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Fri Dec 23 16:56:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository pybind11.
commit 734bea90b5bc216476fafb7a89625933eaf34bf1
Merge: 3de62cb 473b9c8
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Fri Dec 23 16:32:21 2016 +0000
merge patched into master
.appveyor.yml | 44 +-
.gitignore | 11 +-
.travis.yml | 175 ++-
CMakeLists.txt | 215 ++-
CONTRIBUTING.md | 4 +-
MANIFEST.in | 1 +
README.md | 41 +-
debian/.git-dpm | 6 +-
debian/patches/0001-Use-system-include-path.patch | 31 +-
docs/advanced.rst | 1566 --------------------
docs/advanced/cast/chrono.rst | 81 +
docs/advanced/cast/custom.rst | 85 ++
docs/advanced/cast/eigen.rst | 50 +
docs/advanced/cast/functional.rst | 113 ++
docs/advanced/cast/index.rst | 41 +
docs/advanced/cast/overview.rst | 146 ++
docs/advanced/cast/stl.rst | 154 ++
docs/advanced/classes.rst | 643 ++++++++
docs/advanced/exceptions.rst | 142 ++
docs/advanced/functions.rst | 311 ++++
docs/advanced/misc.rst | 229 +++
docs/advanced/pycpp/index.rst | 13 +
docs/advanced/pycpp/numpy.rst | 302 ++++
docs/advanced/pycpp/object.rst | 96 ++
docs/advanced/pycpp/utilities.rst | 57 +
docs/advanced/smart_ptrs.rst | 156 ++
docs/basics.rst | 170 +--
docs/benchmark.rst | 5 +-
docs/changelog.rst | 293 +++-
docs/classes.rst | 122 +-
docs/compiling.rst | 141 +-
docs/conf.py | 8 +-
docs/faq.rst | 61 +-
docs/index.rst | 29 +-
docs/intro.rst | 17 +-
docs/limitations.rst | 13 +-
docs/reference.rst | 5 +-
docs/release.rst | 6 +-
example/CMakeLists.txt | 68 -
example/eigen.cpp | 73 -
example/eigen.py | 44 -
example/eigen.ref | 18 -
example/example.cpp | 62 -
example/example.h | 7 -
example/example1.cpp | 92 --
example/example1.py | 37 -
example/example1.ref | 26 -
example/example10.py | 34 -
example/example10.ref | 78 -
example/example11.cpp | 61 -
example/example11.py | 44 -
example/example11.ref | 49 -
example/example12.cpp | 102 --
example/example12.py | 36 -
example/example12.ref | 13 -
example/example13.py | 46 -
example/example13.ref | 25 -
example/example14.py | 50 -
example/example14.ref | 18 -
example/example15.py | 21 -
example/example15.ref | 2 -
example/example16.cpp | 24 -
example/example16.py | 12 -
example/example16.ref | 3 -
example/example17.cpp | 37 -
example/example17.py | 48 -
example/example17.ref | 11 -
example/example2.cpp | 172 ---
example/example2.py | 67 -
example/example2.ref | 137 --
example/example3.py | 27 -
example/example3.ref | 57 -
example/example4.cpp | 75 -
example/example4.py | 58 -
example/example4.ref | 40 -
example/example5.cpp | 110 --
example/example5.py | 53 -
example/example5.ref | 26 -
example/example6.py | 30 -
example/example6.ref | 21 -
example/example7.py | 32 -
example/example7.ref | 17 -
example/example8.cpp | 147 --
example/example8.py | 70 -
example/example8.ref | 243 ---
example/example9.py | 30 -
example/example9.ref | 22 -
example/issues.cpp | 111 --
example/issues.py | 57 -
example/issues.ref | 14 -
example/object.h | 160 --
example/run_test.py | 73 -
include/pybind11/attr.h | 197 ++-
include/pybind11/cast.h | 1119 ++++++++++----
include/pybind11/chrono.h | 160 ++
include/pybind11/common.h | 396 ++++-
include/pybind11/descr.h | 46 +-
include/pybind11/eigen.h | 285 ++--
include/pybind11/eval.h | 112 ++
include/pybind11/functional.h | 49 +-
include/pybind11/numpy.h | 1002 +++++++++++--
include/pybind11/operators.h | 13 +-
include/pybind11/options.h | 65 +
include/pybind11/pybind11.h | 1134 ++++++++++----
include/pybind11/pytypes.h | 712 ++++++---
include/pybind11/stl.h | 165 ++-
include/pybind11/stl_bind.h | 380 +++--
pybind11/__init__.py | 2 +-
pybind11/_version.py | 2 +-
setup.cfg | 8 +
setup.py | 2 +-
tests/CMakeLists.txt | 164 ++
tests/conftest.py | 239 +++
tests/constructor_stats.h | 276 ++++
tests/object.h | 175 +++
tests/pybind11_tests.cpp | 45 +
tests/pybind11_tests.h | 12 +
tests/test_alias_initialization.cpp | 62 +
tests/test_alias_initialization.py | 80 +
example/example7.cpp => tests/test_buffers.cpp | 40 +-
tests/test_buffers.py | 62 +
tests/test_callbacks.cpp | 149 ++
tests/test_callbacks.py | 98 ++
tests/test_chrono.cpp | 59 +
tests/test_chrono.py | 116 ++
tests/test_class_args.cpp | 68 +
tests/test_class_args.py | 8 +
.../installed_function/CMakeLists.txt | 12 +
.../installed_target/CMakeLists.txt | 18 +
tests/test_cmake_build/main.cpp | 10 +
.../subdirectory_function/CMakeLists.txt | 8 +
.../subdirectory_target/CMakeLists.txt | 15 +
tests/test_cmake_build/test.py | 5 +
tests/test_constants_and_functions.cpp | 104 ++
tests/test_constants_and_functions.py | 43 +
tests/test_copy_move_policies.cpp | 41 +
tests/test_copy_move_policies.py | 15 +
tests/test_docstring_options.cpp | 53 +
tests/test_docstring_options.py | 32 +
tests/test_eigen.cpp | 134 ++
tests/test_eigen.py | 145 ++
tests/test_enum.cpp | 68 +
tests/test_enum.py | 108 ++
tests/test_eval.cpp | 79 +
tests/test_eval.py | 19 +
tests/test_eval_call.py | 4 +
tests/test_exceptions.cpp | 173 +++
tests/test_exceptions.py | 74 +
tests/test_inheritance.cpp | 100 ++
tests/test_inheritance.py | 55 +
tests/test_issues.cpp | 401 +++++
tests/test_issues.py | 251 ++++
example/example13.cpp => tests/test_keep_alive.cpp | 21 +-
tests/test_keep_alive.py | 97 ++
tests/test_kwargs_and_defaults.cpp | 56 +
tests/test_kwargs_and_defaults.py | 57 +
tests/test_methods_and_attributes.cpp | 184 +++
tests/test_methods_and_attributes.py | 203 +++
example/example9.cpp => tests/test_modules.cpp | 27 +-
tests/test_modules.py | 54 +
tests/test_multiple_inheritance.cpp | 83 ++
tests/test_multiple_inheritance.py | 62 +
tests/test_numpy_array.cpp | 153 ++
tests/test_numpy_array.py | 274 ++++
tests/test_numpy_dtypes.cpp | 363 +++++
tests/test_numpy_dtypes.py | 225 +++
.../test_numpy_vectorize.cpp | 16 +-
tests/test_numpy_vectorize.py | 76 +
.../example14.cpp => tests/test_opaque_types.cpp | 20 +-
tests/test_opaque_types.py | 49 +
.../test_operator_overloading.cpp | 25 +-
tests/test_operator_overloading.py | 40 +
example/example15.cpp => tests/test_pickling.cpp | 38 +-
tests/test_pickling.py | 35 +
tests/test_python_types.cpp | 429 ++++++
tests/test_python_types.py | 406 +++++
.../test_sequences_and_iterators.cpp | 119 +-
tests/test_sequences_and_iterators.py | 90 ++
tests/test_smart_ptr.cpp | 240 +++
tests/test_smart_ptr.py | 203 +++
tests/test_stl_binders.cpp | 100 ++
tests/test_stl_binders.py | 140 ++
tests/test_virtual_functions.cpp | 347 +++++
tests/test_virtual_functions.py | 259 ++++
tools/FindPythonLibsNew.cmake | 37 +-
tools/check-style.sh | 83 ++
tools/libsize.py | 38 +
tools/pybind11Config.cmake.in | 92 ++
CMakeLists.txt => tools/pybind11Tools.cmake | 163 +-
189 files changed, 16528 insertions(+), 6418 deletions(-)
diff --cc debian/.git-dpm
index 9f2f0da,0000000..2df98d3
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- c775881fbf92234cefbe34ad5a62726fedbd3557
- c775881fbf92234cefbe34ad5a62726fedbd3557
- 6b567a7029dee46377c99503a97a39dbe06abfd1
++473b9c87f534623580a1d2bb1d887133bf9da8cc
++473b9c87f534623580a1d2bb1d887133bf9da8cc
++90da4af1ff3a4abbd4b647f2d8fa58a23972d210
+90da4af1ff3a4abbd4b647f2d8fa58a23972d210
+pybind11_2.0.0~rc1.orig.tar.gz
+48ccff5dc81bb37a225cea3f6143e79ecb35b7aa
+397840
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-system-include-path.patch
index fc7caa5,0000000..36e3b88
mode 100644,000000..100644
--- a/debian/patches/0001-Use-system-include-path.patch
+++ b/debian/patches/0001-Use-system-include-path.patch
@@@ -1,53 -1,0 +1,56 @@@
- From c775881fbf92234cefbe34ad5a62726fedbd3557 Mon Sep 17 00:00:00 2001
++From 473b9c87f534623580a1d2bb1d887133bf9da8cc Mon Sep 17 00:00:00 2001
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
- Date: Thu, 17 Nov 2016 16:34:09 +0000
- Subject: Use system include path.
++Date: Fri, 23 Dec 2016 16:31:56 +0000
++Subject: Use system include path
+
+---
+ pybind11/__init__.py | 8 +-------
- setup.py | 16 ----------------
- 2 files changed, 1 insertion(+), 23 deletions(-)
++ setup.py | 19 -------------------
++ 2 files changed, 1 insertion(+), 26 deletions(-)
+
+diff --git a/pybind11/__init__.py b/pybind11/__init__.py
- index dc0ddf6..21eab24 100644
++index a765692..a7d57c3 100644
+--- a/pybind11/__init__.py
++++ b/pybind11/__init__.py
- @@ -2,10 +2,4 @@ from ._version import version_info, __version__
++@@ -2,10 +2,4 @@ from ._version import version_info, __version__ # noqa: F401 imported but unuse
+
+
+ def get_include(*args, **kwargs):
+- import os
+- try:
+- from pip import locations
+- return os.path.dirname(
+- locations.distutils_scheme('pybind11', *args, **kwargs)['headers'])
+- except ImportError:
+- return 'include'
++ return '/usr/include'
+diff --git a/setup.py b/setup.py
- index 07465bb..0b9d7f4 100644
++index e9bc3c3..30cfb02 100644
+--- a/setup.py
++++ b/setup.py
- @@ -15,22 +15,6 @@ setup(
++@@ -15,25 +15,6 @@ setup(
+ download_url='https://github.com/wjakob/pybind11/tarball/v' + __version__,
+ packages=['pybind11'],
+ license='BSD',
+- headers=[
+- 'include/pybind11/attr.h',
+- 'include/pybind11/cast.h',
++- 'include/pybind11/chrono.h',
++- 'include/pybind11/common.h',
+- 'include/pybind11/complex.h',
+- 'include/pybind11/descr.h',
+- 'include/pybind11/eigen.h',
++- 'include/pybind11/eval.h',
++- 'include/pybind11/functional.h',
+- 'include/pybind11/numpy.h',
++- 'include/pybind11/operators.h',
++- 'include/pybind11/options.h',
+- 'include/pybind11/pybind11.h',
++- 'include/pybind11/pytypes.h',
+- 'include/pybind11/stl.h',
+- 'include/pybind11/stl_bind.h',
- - 'include/pybind11/common.h',
- - 'include/pybind11/functional.h',
- - 'include/pybind11/operators.h',
- - 'include/pybind11/pytypes.h',
- - 'include/pybind11/typeid.h'
++- 'include/pybind11/typeid.h',
+- ],
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Intended Audience :: Developers',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pybind11.git
More information about the debian-science-commits
mailing list