From 774fa191c4966ecc0e2677c0c5e38f88466d8ca9 Mon Sep 17 00:00:00 2001
From: narekgharibyan <narekgharibyan@gmail.com>
Date: Fri, 25 Aug 2017 11:28:33 +0200
Subject: [PATCH 1/3]  - removed workaround for snappy static build, as it's
 already fixed  - bumped package version

---
 pykeyvi/setup.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pykeyvi/setup.py b/pykeyvi/setup.py
index d564d64a..1e1c7b70 100644
--- a/pykeyvi/setup.py
+++ b/pykeyvi/setup.py
@@ -173,10 +173,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)
@@ -225,7 +221,7 @@ def run(self):
 
     PACKAGE_NAME = 'pykeyvi'
 
-    version = '0.2.2'
+    version = '0.2.3'
 
     install_requires = [
         'msgpack-python',

From fa76ec2c4dc3b0212fcbf7e39d4214c3e0dec271 Mon Sep 17 00:00:00 2001
From: narekgharibyan <narekgharibyan@gmail.com>
Date: Tue, 29 Aug 2017 14:39:15 +0200
Subject: [PATCH 2/3]  - added '-fpermissive' to workaround code compile issue
 for pypy

---
 pykeyvi/setup.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pykeyvi/setup.py b/pykeyvi/setup.py
index 1e1c7b70..a9b6209d 100644
--- a/pykeyvi/setup.py
+++ b/pykeyvi/setup.py
@@ -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))

From bad6f0b7db38edc33e882c3f24f84e9bd22120a8 Mon Sep 17 00:00:00 2001
From: narekgharibyan <narekgharibyan@gmail.com>
Date: Wed, 30 Aug 2017 15:23:42 +0200
Subject: [PATCH 3/3]  - temporarily disabled pypy builds on osx

---
 .travis.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 17a2362d..6adb7567 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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