mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-21 20:55:11 +00:00
Fix setup.py detail headers and add pip install tests to Travis
The default `install_headers` from `distutils` flattens all the headers into a single directory -- `detail` subdirectory was lost. This commit fixes this by overriding the setup with a custom header installer. Tests are added to Travis to make sure `setup.py sdist` and `pip install` do not miss any headers and that the directory structure is preserved. [skip appveyor]
This commit is contained in:
parent
e8b5074187
commit
1913f252d3
@ -65,7 +65,8 @@ matrix:
|
|||||||
# Documentation build:
|
# Documentation build:
|
||||||
- os: linux
|
- os: linux
|
||||||
language: docs
|
language: docs
|
||||||
env: DOCS STYLE LINT
|
env: DOCS STYLE LINT PIP
|
||||||
|
cache: false
|
||||||
install:
|
install:
|
||||||
- export PATH="~/.local/bin:$PATH"
|
- export PATH="~/.local/bin:$PATH"
|
||||||
- $PY_CMD -m pip install --user --upgrade sphinx sphinx_rtd_theme breathe flake8 pep8-naming
|
- $PY_CMD -m pip install --user --upgrade sphinx sphinx_rtd_theme breathe flake8 pep8-naming
|
||||||
@ -76,6 +77,12 @@ matrix:
|
|||||||
- $PY_CMD -m sphinx -W -b html docs docs/.build
|
- $PY_CMD -m sphinx -W -b html docs docs/.build
|
||||||
- tools/check-style.sh
|
- tools/check-style.sh
|
||||||
- flake8
|
- flake8
|
||||||
|
- |
|
||||||
|
# Make sure setup.py distributes and installs all the headers
|
||||||
|
$PY_CMD setup.py sdist
|
||||||
|
$PY_CMD -m pip install --user -U ./dist/*
|
||||||
|
installed=$($PY_CMD -c "import pybind11; print(pybind11.get_include(True) + '/pybind11')")
|
||||||
|
diff -rq $installed ./include/pybind11
|
||||||
cache:
|
cache:
|
||||||
directories:
|
directories:
|
||||||
- $HOME/.local/bin
|
- $HOME/.local/bin
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
include include/pybind11/*.h
|
recursive-include include/pybind11 *.h
|
||||||
include LICENSE README.md CONTRIBUTING.md
|
include LICENSE README.md CONTRIBUTING.md
|
||||||
|
20
setup.py
20
setup.py
@ -3,6 +3,7 @@
|
|||||||
# Setup script for PyPI; use CMakeFile.txt to build extension modules
|
# Setup script for PyPI; use CMakeFile.txt to build extension modules
|
||||||
|
|
||||||
from setuptools import setup
|
from setuptools import setup
|
||||||
|
from distutils.command.install_headers import install_headers
|
||||||
from pybind11 import __version__
|
from pybind11 import __version__
|
||||||
import os
|
import os
|
||||||
|
|
||||||
@ -17,7 +18,7 @@ else:
|
|||||||
'include/pybind11/detail/descr.h',
|
'include/pybind11/detail/descr.h',
|
||||||
'include/pybind11/detail/init.h',
|
'include/pybind11/detail/init.h',
|
||||||
'include/pybind11/detail/internals.h',
|
'include/pybind11/detail/internals.h',
|
||||||
'include/pybind11/detail/typeid.h'
|
'include/pybind11/detail/typeid.h',
|
||||||
'include/pybind11/attr.h',
|
'include/pybind11/attr.h',
|
||||||
'include/pybind11/buffer_info.h',
|
'include/pybind11/buffer_info.h',
|
||||||
'include/pybind11/cast.h',
|
'include/pybind11/cast.h',
|
||||||
@ -36,6 +37,22 @@ else:
|
|||||||
'include/pybind11/stl_bind.h',
|
'include/pybind11/stl_bind.h',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
class InstallHeaders(install_headers):
|
||||||
|
"""Use custom header installer because the default one flattens subdirectories"""
|
||||||
|
def run(self):
|
||||||
|
if not self.distribution.headers:
|
||||||
|
return
|
||||||
|
|
||||||
|
for header in self.distribution.headers:
|
||||||
|
subdir = os.path.dirname(os.path.relpath(header, 'include/pybind11'))
|
||||||
|
install_dir = os.path.join(self.install_dir, subdir)
|
||||||
|
self.mkpath(install_dir)
|
||||||
|
|
||||||
|
(out, _) = self.copy_file(header, install_dir)
|
||||||
|
self.outfiles.append(out)
|
||||||
|
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='pybind11',
|
name='pybind11',
|
||||||
version=__version__,
|
version=__version__,
|
||||||
@ -47,6 +64,7 @@ setup(
|
|||||||
packages=['pybind11'],
|
packages=['pybind11'],
|
||||||
license='BSD',
|
license='BSD',
|
||||||
headers=headers,
|
headers=headers,
|
||||||
|
cmdclass=dict(install_headers=InstallHeaders),
|
||||||
classifiers=[
|
classifiers=[
|
||||||
'Development Status :: 5 - Production/Stable',
|
'Development Status :: 5 - Production/Stable',
|
||||||
'Intended Audience :: Developers',
|
'Intended Audience :: Developers',
|
||||||
|
Loading…
Reference in New Issue
Block a user