Merge PR #26476 into master

* refs/pull/26476/head:
	pybind: auto encode/decode cstr
	pybind: set language_level for cythonize explicitly

Reviewed-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Sage Weil 2019-02-22 07:11:28 -06:00
commit b700dca795
6 changed files with 8 additions and 3 deletions

View File

@ -205,6 +205,7 @@ setup(
extra_compile_args=flags['cflags']['extras'] + flags['ldflags']['extras'],
)
],
compiler_directives={'language_level': sys.version_info.major},
build_dir=os.environ.get("CYTHON_BUILD_DIR", None),
include_path=[
os.path.join(os.path.dirname(__file__), "..", "rados")

View File

@ -1,4 +1,4 @@
# cython: embedsignature=True
# cython: embedsignature=True, c_string_type=str, c_string_encoding=ascii
"""
This module is a thin wrapper around librados.

View File

@ -199,7 +199,9 @@ setup(
libraries=["rados"] + flags['ldflags']['l'],
extra_compile_args=flags['cflags']['extras'] + flags['ldflags']['extras'],
)
], build_dir=os.environ.get("CYTHON_BUILD_DIR", None)
],
compiler_directives={'language_level': sys.version_info.major},
build_dir=os.environ.get("CYTHON_BUILD_DIR", None)
),
classifiers=[
'Intended Audience :: Developers',

View File

@ -1,4 +1,4 @@
# cython: embedsignature=True
# cython: embedsignature=True, c_string_type=str, c_string_encoding=ascii
"""
This module is a thin wrapper around librbd.

View File

@ -204,6 +204,7 @@ setup(
extra_compile_args=flags['cflags']['extras'] + flags['ldflags']['extras'],
)
],
compiler_directives={'language_level': sys.version_info.major},
build_dir=os.environ.get("CYTHON_BUILD_DIR", None),
include_path=[
os.path.join(os.path.dirname(__file__), "..", "rados")

View File

@ -205,6 +205,7 @@ setup(
extra_compile_args=flags['cflags']['extras'] + flags['ldflags']['extras'],
)
],
compiler_directives={'language_level': sys.version_info.major},
build_dir=os.environ.get("CYTHON_BUILD_DIR", None),
include_path=[
os.path.join(os.path.dirname(__file__), "..", "rados")