Merge pull request #66 from datamade/master

updated crfsuite submodule to include msvc 2015 fix, closes #51

Author: kmike

.manylinux-install.sh

@@ -11,7 +11,6 @@ for PYBIN in /opt/python/*/bin; do
        [[ "${PYBIN}" == *"cp35"* ]] || \
        [[ "${PYBIN}" == *"cp36"* ]]; 
     then
-        "${PYBIN}/pip" install -r /io/requirements-doc.txt
         "${PYBIN}/pip" install tox
         "${PYBIN}/pip" install -U cython
         export PATH="${PYBIN}:$PATH"

.travis.yml

@@ -19,12 +19,12 @@ matrix:
   - os: osx
     language: generic
     env: 
-      - PYTHON='3.6.1'
+      - PYTHON='3.6.2'
       - TOXENV=py36
   - os: osx
     language: generic
     env:
-      - PYTHON='3.5.3'
+      - PYTHON='3.5.2'
       - TOXENV=py35
   - os: osx
     language: generic
@@ -39,7 +39,7 @@ matrix:
   - os: osx
     language: generic
     env: 
-      - PYTHON='2.7.12'
+      - PYTHON='2.7.13'
       - TOXENV=py27
   - sudo: required
     services:

MANIFEST.in

@@ -2,7 +2,6 @@ include LICENSE.txt
 include README.rst
 include CHANGES.rst
 include update_cpp.sh
-include include/inttypes.h
 
 recursive-include crfsuite *
 recursive-include liblbfgs *

crfsuite

@@ -23,16 +23,16 @@
     'pycrfsuite',
 ]
 
-if sys.platform == 'win32':
-    includes.extend(['crfsuite/win32', 'include'])
-
-
 class build_ext_check_gcc(build_ext):
     def build_extensions(self):
         c = self.compiler
         if c.compiler_type == 'unix' and 'gcc' in c.compiler:
             for e in self.extensions:
                 e.extra_compile_args=['-std=c99']
+        elif self.compiler.compiler_type == "msvc":
+            if sys.version_info[:2] < (3, 5):
+                c.include_dirs.extend(['crfsuite/win32'])
+                
         build_ext.build_extensions(self)