Skip to content

Commit

Permalink
Merge pull request #237 from narekgharibyan/master
Browse files Browse the repository at this point in the history
release 0.2.3
  • Loading branch information
narekgharibyan authored Aug 31, 2017
2 parents 5fe9238 + bad6f0b commit d7ae0bb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ matrix:
osx_image: xcode7.3
compiler: clang
env: BUILD_TYPE=osx PYTHON_VERSION=35
- os: osx
osx_image: xcode7.3
compiler: clang
env: BUILD_TYPE=osx PYTHON_VERSION=pypy2
# temporarily disabled pypy builds on osx
# till https://bitbucket.org/pypy/pypy/issues/2626/invalid-conversion-from-const-char-to-char is released
# - os: osx
# osx_image: xcode7.3
# compiler: clang
# env: BUILD_TYPE=osx PYTHON_VERSION=pypy2

before_install:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./travis/setup_osx.sh ; fi
Expand Down
10 changes: 5 additions & 5 deletions pykeyvi/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ def symlink_keyvi():

additional_compile_flags = []

# workaround for https://bitbucket.org/pypy/pypy/issues/2626/invalid-conversion-from-const-char-to-char
if os.environ['PYTHON_VERSION'] == 'pypy2':
additional_compile_flags.append('-fpermissive')

# re-map the source files in the debug symbol tables to there original location so that stepping in a debugger works
if pykeyvi_source_path is not None:
additional_compile_flags.append('-fdebug-prefix-map={}={}'.format(pykeyvi_source_path, keyvi_source_path))
Expand Down Expand Up @@ -173,10 +177,6 @@ def run(self):
os.makedirs(mac_os_static_libs_dir)

for lib in linklibraries_static_or_dynamic:
# workaround: temp disabled static link with snappy:
# see: https://github.com/Homebrew/homebrew-core/issues/15722
if lib == 'snappy':
continue
lib_file_name = 'lib{}.a'.format(lib)
src_file = path.join('/usr/local/lib', lib_file_name)
dst_file = path.join(mac_os_static_libs_dir, lib_file_name)
Expand Down Expand Up @@ -225,7 +225,7 @@ def run(self):

PACKAGE_NAME = 'pykeyvi'

version = '0.2.2'
version = '0.2.3'

install_requires = [
'msgpack-python',
Expand Down

0 comments on commit d7ae0bb

Please sign in to comment.