Merge remote-tracking branch 'upstream/devel' into devel

Author: pettarin

docs/source/changelog.rst

@@ -17,6 +17,7 @@ v1.5.1 (2016-07-25)
 #. Fixed a numerical issue in ``dtw.py`` by explicit stating ``dtype=int`` in ``centers`` initializer, pure Python code only
 #. Extension ``cew`` compiled for Mac OS X and Windows
 #. Added links to installers for Mac OS X and Windows in the documentation
+#. Explicitly requiring lxml v3.6.0 and BeautifulSoup4 v4.4.1 due to a change in BeautifulSoup4 v4.5.0 API (to be investigated later)
 
 v1.5.0.3 (2016-04-23)
 ---------------------

docs/source/clitutorial.rst

@@ -366,7 +366,7 @@ Examples:
 
     python -m aeneas.tools.execute_task --example-json -r="c_extensions=False"
 
-#. disable only the ``cew`` Python C extension, while ``cdtw`` and ``cmfcc`` will stil run (if compiled)::
+#. disable only the ``cew`` Python C extension, while ``cdtw`` and ``cmfcc`` will still run (if compiled)::
 
     python -m aeneas.tools.execute_task --example-json -r="cew=False"
 

docs/source/libtutorial.rst

@@ -9,7 +9,7 @@ Overview
 Although a majority of ``aeneas`` users work with the built-in command line tools,
 ``aeneas`` is primarily designed for being used as a Python library.
 Even the ``aeneas.tools`` can be used programmatically,
-thanks to their standardize I/O interface.
+thanks to their standard I/O interface.
 
 .. Topic:: Example
 

requirements.txt

@@ -1,3 +1,3 @@
-BeautifulSoup4>=4.4
-lxml>=3.0
+BeautifulSoup4==4.4.1
+lxml==3.6.0
 numpy>=1.9

setup.py

@@ -239,8 +239,8 @@ def prepare_cew_for_windows():
     license="GNU Affero General Public License v3 (AGPL v3)",
     long_description=LONG_DESCRIPTION,
     install_requires=[
-        "BeautifulSoup4>=4.4",
-        "lxml>=3.0",
+        "BeautifulSoup4==4.4.1",
+        "lxml==3.6.0",
         "numpy>=1.9"
     ],
     extras_require={