Merge 113d2e9 into d25511f

.travis.yml

@@ -1,28 +1,24 @@
 language: python
 
-dist: precise
+dist: xenial
 
 python:
+  - "2.7"
   - "3.6"
-
+  - "3.7"
+
 before_install:
   - export TZ=Europe/Brussels
-  - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi
-  - bash miniconda.sh -b -p $HOME/miniconda
-  - export PATH="$HOME/miniconda/bin:$PATH"
-  - conda update --yes conda
-  - conda install --yes numpy scipy
   - pip install --quiet pytest pytest-cov pytest-xdist chardet
 
 install:
   - python setup.py install --quiet
   - pip freeze
-  # Install and compile libsvm and liblinear
-  - sudo apt-get install -y build-essential
-  - git clone https://github.com/cjlin1/libsvm
-  - cd libsvm; make lib; sudo cp libsvm.so.2 /lib; sudo ln -s /lib/libsvm.so.2 /lib/libsvm.so; cd ..
-  - git clone https://github.com/cjlin1/liblinear
-  - cd liblinear; make lib; sudo cp liblinear.so.3 /lib; sudo ln -s /lib/liblinear.so.3 /lib/liblinear.so; cd ..
+  - path_to_libsvm=$(ldconfig -p | grep -m1 "libsvm.so.2" | cut -d ' ' -f4)
+  - if [[ -e $path_to_libsvm ]]; then sudo rm -f $path_to_libsvm; fi
+  - path_to_liblinear=$(ldconfig -p | grep -m1 "liblinear.so.3" | cut -d ' ' -f4)
+  - if [[ -e $path_to_liblinear ]]; then sudo rm -f $path_to_liblinear; fi
+  - sudo ldconfig
 
 script:
   - pytest --cov=pattern

README.md

@@ -6,6 +6,7 @@ Pattern
 [![PyPi version](http://img.shields.io/pypi/v/pattern.svg?style=flat)](https://pypi.python.org/pypi/pattern)
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-green.svg?style=flat)](https://github.com/clips/pattern/blob/master/LICENSE.txt)
 
+[![forthebadge](https://forthebadge.com/images/badges/made-with-python.svg)](https://forthebadge.com)  
 Pattern is a web mining module for Python. It has tools for:
 
  * Data Mining: web services (Google, Twitter, Wikipedia), web crawler, HTML DOM parser
@@ -84,7 +85,9 @@ Version
 License
 -------
 
-**BSD**, see `LICENSE.txt` for further details.
+**BSD**
+
+Click [here](https://github.com/clips/pattern/blob/master/LICENSE.txt) for further details.
 
 Reference
 ---------

pattern/text/__init__.py

@@ -606,7 +606,7 @@ def _read(path, encoding="utf-8", comment=";;;"):
             if not line or (comment and line.startswith(comment)):
                 continue
             yield line
-    raise StopIteration
+    return
 
 
 class Lexicon(lazydict):