Merge pull request #28 from readbeyond/devel

Releasing as v1.3.2

Author: readbeyond

MANIFEST.in

@@ -1,6 +1,6 @@
 recursive-include aeneas/res *
 recursive-include aeneas/tools/res *
-include check_dependencies.py
+include aeneas_check_setup.py
 recursive-include docs *
 prune docs/build
 include LICENSE

README.md

@@ -2,8 +2,8 @@
 
 **aeneas** is a Python library and a set of tools to automagically synchronize audio and text.
 
-* Version: 1.3.1
-* Date: 2015-10-28
+* Version: 1.3.2
+* Date: 2015-11-11
 * Developed by: [ReadBeyond](http://www.readbeyond.it/)
 * Lead Developer: [Alberto Pettarin](http://www.albertopettarin.it/)
 * License: the GNU Affero General Public License Version 3 (AGPL v3)
@@ -75,8 +75,9 @@ or raw CSV/SSV/TSV/TXT/XML for further processing.
 2. `ffmpeg` and `ffprobe` executables available in your `$PATH`
 3. `espeak` executable available in your `$PATH`
 4. Python 2.7.x
-5. Python modules `BeautifulSoup`, `lxml`, `numpy`, and `pafy`
-6. (Optional but strongly suggested) Python C headers to compile the Python C extensions
+5. Python modules `BeautifulSoup`, `lxml`, and `numpy`
+6. (Optional, but strongly recommended) Python C headers to compile the Python C extensions
+7. (Optional, required only for downloading audio from YouTube) Python module `pafy`
 
 Depending on the format(s) of audio files you work with,
 you might need to install additional audio codecs for `ffmpeg`.
@@ -144,8 +145,9 @@ you can install all the dependencies by running
     $ git clone https://github.com/ReadBeyond/aeneas.git
     $ cd aeneas
     $ sudo pip install -r requirements.txt
+    (Optional: $ sudo pip install pafy)
     $ python setup.py build_ext --inplace
-    $ python check_dependencies.py
+    $ python aeneas_check_setup.py
     ```
 
     If the last command prints a success message,
@@ -226,8 +228,9 @@ Feel free to jump to step 9 if you already have
     $ git clone https://github.com/ReadBeyond/aeneas.git
     $ cd aeneas
     $ sudo pip install -r requirements.txt
+    (Optional: $ sudo pip install pafy)
     $ python setup.py build_ext --inplace
-    $ python check_dependencies.py
+    $ python aeneas_check_setup.py
     ```
 
     If the last command prints a success message,
@@ -536,6 +539,9 @@ APIs and Web application for ReadBeyond Sync,
 helped shaping the structure of this package
 for its asynchronous usage.
 
+**Chris Hubbard** prepared the files for
+packaging aeneas as a Debian/Ubuntu `.deb`.
+
 All the mighty [GitHub contributors](https://github.com/readbeyond/aeneas/graphs/contributors),
 and the members of the [Google Group](https://groups.google.com/d/forum/aeneas-forced-alignment).
 

README.txt

@@ -4,8 +4,8 @@ aeneas
 **aeneas** is a Python library and a set of tools to automagically
 synchronize audio and text.
 
--  Version: 1.3.1
--  Date: 2015-10-28
+-  Version: 1.3.2
+-  Date: 2015-11-11
 -  Developed by: `ReadBeyond <http://www.readbeyond.it/>`__
 -  Lead Developer: `Alberto Pettarin <http://www.albertopettarin.it/>`__
 -  License: the GNU Affero General Public License Version 3 (AGPL v3)
@@ -86,9 +86,11 @@ System Requirements
 2. ``ffmpeg`` and ``ffprobe`` executables available in your ``$PATH``
 3. ``espeak`` executable available in your ``$PATH``
 4. Python 2.7.x
-5. Python modules ``BeautifulSoup``, ``lxml``, ``numpy``, and ``pafy``
-6. (Optional but strongly suggested) Python C headers to compile the
+5. Python modules ``BeautifulSoup``, ``lxml``, and ``numpy``
+6. (Optional, but strongly recommended) Python C headers to compile the
    Python C extensions
+7. (Optional, required only for downloading audio from YouTube) Python
+   module ``pafy``
 
 Depending on the format(s) of audio files you work with, you might need
 to install additional audio codecs for ``ffmpeg``. Similarly, you might
@@ -156,8 +158,9 @@ Linux
        $ git clone https://github.com/ReadBeyond/aeneas.git
        $ cd aeneas
        $ sudo pip install -r requirements.txt
+       (Optional: $ sudo pip install pafy)
        $ python setup.py build_ext --inplace
-       $ python check_dependencies.py
+       $ python aeneas_check_setup.py
 
    If the last command prints a success message, you have all the
    required dependencies installed and you can confidently run
@@ -243,8 +246,9 @@ Feel free to jump to step 9 if you already have ``python``,
        $ git clone https://github.com/ReadBeyond/aeneas.git
        $ cd aeneas
        $ sudo pip install -r requirements.txt
+       (Optional: $ sudo pip install pafy)
        $ python setup.py build_ext --inplace
-       $ python check_dependencies.py
+       $ python aeneas_check_setup.py
 
    If the last command prints a success message, you have all the
    required dependencies installed and you can confidently run
@@ -363,8 +367,8 @@ Limitations and Missing Features
 -  Audio is assumed to be spoken: not suitable/YMMV for song captioning
 -  No protection against memory trashing if you feed extremely long
    audio files
--  On Mac OS X and Windows, audio synthesis might be slow (tens of
-   minutes) if you have thousands of text fragments
+-  On Mac OS X and Windows, audio synthesis might be slow if you have
+   thousands of text fragments
 
 TODO List
 ---------
@@ -380,6 +384,7 @@ TODO List
 -  Better documentation
 -  Testing other approaches, like HMM
 -  Publishing the package on PyPI
+-  Publishing the package on Debian repo
 
 Would you like to see one of the above points done? Consider
 `sponsoring <#supporting>`__ this project!
@@ -565,6 +570,9 @@ text.
 ReadBeyond Sync, helped shaping the structure of this package for its
 asynchronous usage.
 
+**Chris Hubbard** prepared the files for packaging aeneas as a
+Debian/Ubuntu ``.deb``.
+
 All the mighty `GitHub
 contributors <https://github.com/readbeyond/aeneas/graphs/contributors>`__,
 and the members of the `Google

VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

aeneas/__init__.py

@@ -56,7 +56,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/adjustboundaryalgorithm.py

@@ -19,7 +19,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/analyzecontainer.py

@@ -23,7 +23,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/audiofile.py

@@ -27,7 +27,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/cdtw.c

@@ -9,7 +9,7 @@ __copyright__ = """
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/cdtw_setup.py

@@ -22,7 +22,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 
@@ -38,7 +38,7 @@
 
 setup(
     name="cdtw",
-    version="1.3.1",
+    version="1.3.2",
     description="""
     Python C Extension for computing the DTW as fast as your bare metal allows.
     """,

aeneas/cew.c

@@ -9,7 +9,7 @@ __copyright__ = """
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/cew_setup.py

@@ -20,7 +20,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 
@@ -36,7 +36,7 @@
 
 setup(
     name="cew",
-    version="1.3.1",
+    version="1.3.2",
     description="""
     Python C Extension for synthesizing text with espeak.
     """,

aeneas/cmfcc.c

@@ -9,7 +9,7 @@ __copyright__ = """
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/cmfcc_setup.py

@@ -22,7 +22,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 
@@ -38,7 +38,7 @@
 
 setup(
     name="cmfcc",
-    version="1.3.1",
+    version="1.3.2",
     description="""
     Python C Extension for computing the MFCCs as fast as your bare metal allows.
     """,

aeneas/container.py

@@ -31,7 +31,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/downloader.py

@@ -17,7 +17,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/dtw.py

@@ -42,7 +42,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/espeakwrapper.py

@@ -22,7 +22,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 
@@ -183,7 +183,7 @@ def _synthesize_multiple_c_extension(
         fragments = text_file.fragments
         for fragment in fragments:
             f_lang = fragment.language
-            f_text = fragment.text
+            f_text = fragment.filtered_text
             if f_lang is None:
                 f_lang = Language.EN
             f_lang = self._replace_language(f_lang)
@@ -220,7 +220,7 @@ def _synthesize_multiple_c_extension(
             anchors.append([
                 intervals[i][0],
                 fragment.identifier,
-                fragment.text
+                fragment.filtered_text
             ])
             # increase the character counter
             num_chars += fragment.characters
@@ -270,7 +270,7 @@ def _synthesize_multiple_pure_python(
             # synthesize and get the duration of the output file
             self._log(["Synthesizing fragment %d", num])
             result = self._synthesize_fragment_pure_python(
-                text=fragment.text,
+                text=fragment.filtered_text,
                 language=language
             )
             (duration, sr_nu, enc_nu, data) = result

aeneas/executejob.py

@@ -25,7 +25,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/executetask.py

@@ -32,7 +32,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/ffmpegwrapper.py

@@ -19,7 +19,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/ffprobewrapper.py

@@ -20,7 +20,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __email__ = "[email protected]"
 __status__ = "Production"