Skip to content

Use new get_include #47

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

Merged
merged 4 commits into from
Apr 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ matrix:
- os: linux
env: PYTHON=3.6
- os: linux
env: CONDA=2.7
env: CONDA=3.7
- os: linux
env: CONDA=3.6
- os: osx
env: PYTHON=2.7
- os: osx
env: PYTHON=3.6
- os: osx
env: CONDA=2.7
env: CONDA=3.7
- os: osx
env: CONDA=3.6
before_install:
Expand Down Expand Up @@ -50,7 +50,7 @@ install:
python -m pip install 'pybind11>=2.3'
python -m pip install --verbose dist/*.tar.gz
elif [ -n "$CONDA" ]; then
conda build conda.recipe
conda build conda.recipe --python $CONDA
conda install --use-local python_example
fi
script:
Expand Down
9 changes: 2 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@ class get_pybind_include(object):
until it is actually installed, so that the ``get_include()``
method can be invoked. """

def __init__(self, user=False):
self.user = user

def __str__(self):
import pybind11
return pybind11.get_include(self.user)
return pybind11.get_include()


ext_modules = [
Expand All @@ -28,7 +25,6 @@ def __str__(self):
include_dirs=[
# Path to pybind11 headers
get_pybind_include(),
get_pybind_include(user=True)
],
language='c++'
),
Expand Down Expand Up @@ -106,8 +102,7 @@ def build_extensions(self):
description='A test project using pybind11',
long_description='',
ext_modules=ext_modules,
install_requires=['pybind11>=2.4'],
setup_requires=['pybind11>=2.4'],
setup_requires=['pybind11>=2.5.0'],
cmdclass={'build_ext': BuildExt},
zip_safe=False,
)