Commit fd11730a authored by Ajay Patel's avatar Ajay Patel

Fix SO_PREFIX and set PYTHONPATH in Travis

parent f8e127aa
Pipeline #36780556 canceled with stages
in 34 minutes and 35 seconds
......@@ -24,6 +24,8 @@ script:
- /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
- brew install [email protected] --without-multilib
- export CC="/usr/local/Cellar/gcc/8.2.0/bin/gcc-8"
- export PYTHONPATH=$(python -c "import site; print(site.getsitepackages())[0]")
- echo $PYTHONPATH
- $PIP install pip setuptools -U
- $PIP install cibuildwheel==0.10.0
- eval "buildwheel() { cibuildwheel --output-dir wheelhouse >>buildwheel.log 2>&1; }"
......
......@@ -116,7 +116,7 @@ def get_modules(THIRD_PARTY, INTERNAL, PROJ_PATH,
libraries.append(ICU)
includes.append(ICU)
link_args.append('-L' + ICU)
SO_PREFIX = PACKAGE_NAME + '.third_party.sqlite3'
SO_PREFIX = PACKAGE_NAME + '.third_party.sqlite3.'
SQLITE_PRE = os.path.relpath(
os.path.join(SQLITE3, 'sqlite3.c.pre.c'), PROJ_PATH)
......@@ -427,7 +427,7 @@ def get_modules(THIRD_PARTY, INTERNAL, PROJ_PATH,
outfile.write('#endif\n')
module = 'sqlite3'
pyinit_source = source_for_module_with_pyinit(module, 'sqlite3')
pyinit_source = source_for_module_with_pyinit(module)
icu_source = [os.path.relpath(os.path.join(SQLITE3, 'icu.cpp'), PROJ_PATH)]
zlib_sources = [
os.path.relpath(
......@@ -455,7 +455,7 @@ def get_modules(THIRD_PARTY, INTERNAL, PROJ_PATH,
def sqlite_extension(ext, skip=[], module=None):
module = module or ext
pyinit_source = source_for_module_with_pyinit(module, 'sqlite3')
pyinit_source = source_for_module_with_pyinit(module)
return Extension(
SO_PREFIX + module,
sources=([
......@@ -476,7 +476,7 @@ def get_modules(THIRD_PARTY, INTERNAL, PROJ_PATH,
if os.path.basename(source) in skip:
continue
module = os.path.basename(source)[:-2]
pyinit_source = source_for_module_with_pyinit(module, 'sqlite3')
pyinit_source = source_for_module_with_pyinit(module)
miscs.append(
Extension(SO_PREFIX + module,
sources=[source] + zlib_sources + [pyinit_source],
......
__version_info__ = ('0', '0', '57')
__version_info__ = ('0', '0', '58')
__version__ = '.'.join(__version_info__)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment