Merge pull request #33 from matsui528/bug_fix_setup

fix install bug of pybind11 by updating setup.py

docs/source/changelog.rst

@@ -1,6 +1,10 @@
 Changelog
 =============
 
+v0.2.6 (August 1, 2019)
+----------------------------
+- `#33 <https://github.com/matsui528/rii/pull/33>`_ Bug fix to install pybind11 without error
+
 
 v0.2.5 (August 1, 2019)
 ----------------------------

requirements.txt

@@ -1,3 +1,3 @@
-pybind11>=2.2
+pybind11>=2.3
 nanopq
 

rii/__init__.py

@@ -1,5 +1,5 @@
 __all__ = ['Rii']
-__version__ = '0.2.5'
+__version__ = '0.2.6'
 
 from .rii import Rii
 

setup.py

@@ -3,6 +3,7 @@
 import sys
 import setuptools
 import re
+import subprocess
 
 with open('README.md') as f:
     readme = f.read()
@@ -24,6 +25,11 @@ class get_pybind_include(object):
     method can be invoked. """
 
     def __init__(self, user=False):
+        try:
+            import pybind11
+        except ImportError:
+            if subprocess.call([sys.executable, '-m', 'pip', 'install', 'pybind11']):
+                raise RuntimeError('pybind11 install failed.')
         self.user = user
 
     def __str__(self):
@@ -62,19 +68,17 @@ def has_flag(compiler, flagname):
             return False
     return True
 
-
 def cpp_flag(compiler):
-    """Return the -std=c++[11/14] compiler flag.
-
-    The c++14 is prefered over c++11 (when it is available).
+    """Return the -std=c++[11/14/17] compiler flag.
+    The newer version is prefered over c++11 (when it is available).
     """
-    if has_flag(compiler, '-std=c++14'):
-        return '-std=c++14'
-    elif has_flag(compiler, '-std=c++11'):
-        return '-std=c++11'
-    else:
-        raise RuntimeError('Unsupported compiler -- at least C++11 support '
-                           'is needed!')
+    flags = ['-std=c++17', '-std=c++14', '-std=c++11']
+
+    for flag in flags:
+        if has_flag(compiler, flag): return flag
+
+    raise RuntimeError('Unsupported compiler -- at least C++11 support '
+                       'is needed!')
 
 
 class BuildExt(build_ext):
@@ -122,6 +126,7 @@ def build_extensions(self):
     license='MIT',
     packages=find_packages(),
     install_requires=requirements,
+    setup_requires=['pybind11>=2.3'],
     ext_modules=ext_modules,
     cmdclass={'build_ext': BuildExt},
     zip_safe=False