Update to lz4 r130, export fast_compress method in python module, bump release to 0.8

.travis.yml

@@ -4,5 +4,7 @@ python:
   - 2.7
   - 3.2
   - 3.3
-install: 
+  - 3.4
+  - 3.5
+install:
 script: python setup.py test

LICENSE

@@ -0,0 +1,28 @@
+Copyright (c) 2012-2013, Steeve Morin
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of Steeve Morin nor the names of its contributors may be
+   used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

MANIFEST.in

@@ -1,2 +1,4 @@
 include README.rst
 include src/*.h
+include tests/*.py
+exclude tests/*.pyc

README.rst

@@ -36,7 +36,7 @@ The bindings provides some aliases too::
     True
     >>> lz4.LZ4_uncompress == lz4.uncompress == z4.decompress == lz4.loads
     True
-    >>> lz4.VERSION == lz4.__version__  # e.g. "0.7.0"
+    >>> lz4.VERSION == lz4.__version__  # e.g. "0.8.0"
     True
     >>>
 

setup.py

@@ -2,9 +2,63 @@
 
 
 from setuptools import setup, find_packages, Extension
+import subprocess
+import os
+from distutils import ccompiler
 
-VERSION = (0, 7, 0)
+VERSION = (0, 8, 0)
 VERSION_STR = ".".join([str(x) for x in VERSION])
+LZ4_VERSION = "r131"
+
+# Check to see if we have a lz4 library installed on the system and
+# use it if so. If not, we'll use the bundled library. If lz4 is
+# installed it will have a pkg-config file, so we'll use pkg-config to
+# check for existence of the library.
+pkg_config_exe = os.environ.get('PKG_CONFIG', None) or 'pkg-config'
+cmd = '{0} --exists liblz4'.format(pkg_config_exe).split()
+liblz4_found = subprocess.call(cmd) == 0
+
+if liblz4_found:
+    # Use system lz4, and don't set optimization and warning flags for
+    # the compiler. Specifically we don't define LZ4_VERSION since the
+    # system lz4 library could be updated (that's the point of a
+    # shared library).
+    if ccompiler.get_default_compiler() == "msvc":
+        extra_compile_args = ["/Ot", "/Wall"]
+        define_macros = [("VERSION","\\\"%s\\\"" % VERSION_STR),]
+    else:
+        extra_compile_args = ["-std=c99",]
+        define_macros = [("VERSION","\"%s\"" % VERSION_STR),]
+
+    lz4mod = Extension('lz4',
+                       [
+                           'src/python-lz4.c'
+                       ],
+                       extra_compile_args=extra_compile_args,
+                       define_macros=define_macros,
+                       libraries=['lz4'],
+    )
+else:
+    # Use the bundled lz4 libs, and set the compiler flags as they
+    # historically have been set. We do set LZ4_VERSION here, since it
+    # won't change after compilation.
+    if ccompiler.get_default_compiler() == "msvc":
+        extra_compile_args = ["/Ot", "/Wall"]
+        define_macros = [("VERSION","\\\"%s\\\"" % VERSION_STR), ("LZ4_VERSION","\\\"%s\\\"" % LZ4_VERSION)]
+    else:
+        extra_compile_args = ["-std=c99","-O3","-Wall","-W","-Wundef"]
+        define_macros = [("VERSION","\"%s\"" % VERSION_STR), ("LZ4_VERSION","\"%s\"" % LZ4_VERSION)]
+
+    lz4mod = Extension('lz4',
+                       [
+                           'src/lz4.c',
+                           'src/lz4hc.c',
+                           'src/python-lz4.c'
+                       ],
+                       extra_compile_args=extra_compile_args,
+                       define_macros=define_macros,
+    )
+
 
 setup(
     name='lz4',
@@ -16,22 +70,8 @@
     url='https://github.com/steeve/python-lz4',
     packages=find_packages('src'),
     package_dir={'': 'src'},
-    ext_modules=[
-        Extension('lz4', [
-            'src/lz4.c',
-            'src/lz4hc.c',
-            'src/python-lz4.c'
-        ], extra_compile_args=[
-            "-std=c99",
-            "-O3",
-            "-Wall",
-            "-W",
-            "-Wundef",
-            "-DVERSION=\"%s\"" % VERSION_STR,
-            "-DLZ4_VERSION=\"r119\"",
-        ])
-    ],
-    setup_requires=["nose>=1.0"],
+    ext_modules=[lz4mod,],
+    tests_require=["nose>=1.0"],
     test_suite = "nose.collector",
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -42,5 +82,7 @@
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
     ],
 )