[Python-modules-commits] [subliminal] 01/07: Import subliminal_1.1.1.orig.tar.gz

Etienne Millon emillon-guest at moszumanska.debian.org
Sun Mar 13 16:47:11 UTC 2016


This is an automated email from the git hooks/post-receive script.

emillon-guest pushed a commit to branch master
in repository subliminal.

commit 71163fadfb6e0688fabd7dc1b4a3fcecc390d754
Author: Etienne Millon <me at emillon.org>
Date:   Sun Mar 13 14:04:01 2016 +0100

    Import subliminal_1.1.1.orig.tar.gz
---
 HISTORY.rst                           | 108 +++++-
 LICENSE                               |   2 +-
 PKG-INFO                              | 220 +++++++++---
 README.rst                            | 106 ++++--
 requirements.txt                      |  10 +-
 setup.cfg                             |   3 +
 setup.py                              | 114 ++++--
 subliminal.egg-info/PKG-INFO          | 220 +++++++++---
 subliminal.egg-info/SOURCES.txt       |  11 +-
 subliminal.egg-info/entry_points.txt  |  18 +-
 subliminal.egg-info/requires.txt      |  35 +-
 subliminal/__init__.py                |  16 +-
 subliminal/api.py                     | 634 +++++++++++++++++++++-------------
 subliminal/cache.py                   |  55 +--
 subliminal/cli.py                     | 563 ++++++++++++++++++++++--------
 subliminal/converters/addic7ed.py     |   9 +-
 subliminal/converters/podnapisi.py    |  32 --
 subliminal/converters/thesubdb.py     |  25 ++
 subliminal/converters/tvsubtitles.py  |   9 +-
 subliminal/exceptions.py              |  24 +-
 subliminal/providers/__init__.py      | 149 +++++---
 subliminal/providers/addic7ed.py      | 311 ++++++++++-------
 subliminal/providers/bierdopje.py     | 135 --------
 subliminal/providers/napiprojekt.py   | 101 ++++++
 subliminal/providers/opensubtitles.py | 263 +++++++++-----
 subliminal/providers/podnapisi.py     | 214 ++++++------
 subliminal/providers/subscenter.py    | 228 ++++++++++++
 subliminal/providers/thesubdb.py      |  86 ++---
 subliminal/providers/tvsubtitles.py   | 240 +++++++------
 subliminal/score.py                   | 169 +++++----
 subliminal/subtitle.py                | 370 +++++++++++++++-----
 subliminal/tests/__init__.py          |  14 -
 subliminal/tests/common.py            |  19 -
 subliminal/tests/test_providers.py    | 453 ------------------------
 subliminal/tests/test_subliminal.py   | 174 ----------
 subliminal/video.py                   | 474 ++++++++++++++++---------
 36 files changed, 3269 insertions(+), 2345 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index faa0698..01a674b 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,15 +1,68 @@
 Changelog
-=========
+---------
+
+1.1.1
+^^^^^
+**release date:** 2016-01-03
+
+* Fix scanning videos on bad MKV files
+
+
+1.1
+^^^
+**release date:** 2015-12-29
+
+* Fix library usage example in README
+* Fix for series name with special characters in addic7ed provider
+* Fix id property in thesubdb provider
+* Improve matching on titles
+* Add support for nautilus context menu with translations
+* Add support for searching subtitles in a separate directory
+* Add subscenter provider
+* Add support for python 3.5
+
+
+1.0.1
+^^^^^
+**release date:** 2015-07-23
+
+* Fix unicode issues in CLI (python 2 only)
+* Fix score scaling in CLI (python 2 only)
+* Improve error handling in CLI
+* Color collect report in CLI
+
+
+1.0
+^^^
+**release date:** 2015-07-22
+
+* Many changes and fixes
+* New test suite
+* New documentation
+* New CLI
+* Added support for SubsCenter
+
+
+0.7.5
+^^^^^
+**release date:** 2015-03-04
+
+* Update requirements
+* Remove BierDopje provider
+* Add pre-guessed video optional argument in scan_video
+* Improve hearing impaired support
+* Fix TVSubtitles and Podnapisi providers
+
 
 0.7.4
------
+^^^^^
 **release date:** 2014-01-27
 
 * Fix requirements for guessit and babelfish
 
 
 0.7.3
------
+^^^^^
 **release date:** 2013-11-22
 
 * Fix windows compatibility
@@ -19,7 +72,7 @@ Changelog
 
 
 0.7.2
------
+^^^^^
 **release date:** 2013-11-10
 
 * Fix TVSubtitles for ambiguous series
@@ -32,7 +85,7 @@ Changelog
 
 
 0.7.1
------
+^^^^^
 **release date:** 2013-11-06
 
 * Improve CLI
@@ -42,7 +95,7 @@ Changelog
 
 
 0.7.0
------
+^^^^^
 **release date:** 2013-10-29
 
 **WARNING:** Complete rewrite of subliminal with backward incompatible changes
@@ -59,8 +112,23 @@ Changelog
 * Drop a few providers
 * And much more...
 
+
+0.6.4
+^^^^^
+**release date:** 2013-05-19
+
+* Fix requirements due to enzyme 0.3
+
+
+0.6.3
+^^^^^
+**release date:** 2013-01-17
+
+* Fix requirements due to requests 1.0
+
+
 0.6.2
------
+^^^^^
 **release date:** 2012-09-15
 
 * Fix BierDopje
@@ -71,8 +139,9 @@ Changelog
 * Add possible services in help message of the CLI
 * Allow existing filenames to be passed without the ./ prefix
 
+
 0.6.1
------
+^^^^^
 **release date:** 2012-06-24
 
 * Fix subtitle release name in BierDopje
@@ -89,9 +158,11 @@ Changelog
 * Fix guessit.Language in Video.scan
 * Fix language detection of subtitles
 
+
 0.6.0
------
+^^^^^
 **release date:** 2012-06-16
+
 **WARNING:** Backward incompatible changes
 
 * Fix --workers option in CLI
@@ -105,13 +176,14 @@ Changelog
 
 
 0.5.1
------
+^^^^^
 **release date:** 2012-03-25
 
 * Improve error handling of enzyme parsing
 
+
 0.5
----
+^^^
 **release date:** 2012-03-25
 **WARNING:** Backward incompatible changes
 
@@ -124,15 +196,17 @@ Changelog
 * Remove class Subliminal
 * Remove permissions handling
 
+
 0.4
----
+^^^
 **release date:** 2011-11-11
 
 * Many fixes
 * Better error handling
 
+
 0.3
----
+^^^
 **release date:** 2011-08-18
 
 * Fix a bug when series is not guessed by guessit
@@ -142,16 +216,18 @@ Changelog
 * Add possibility to choose mode of created files
 * Add more checks before adjusting permissions
 
+
 0.2
----
+^^^
 **release date:** 2011-07-11
 
 * Fix plugin configuration
 * Fix some encoding issues
 * Remove extra logging
 
+
 0.1
----
-**release date:** not released yet
+^^^
+**release date:** *private release*
 
 * Initial release
diff --git a/LICENSE b/LICENSE
index 405d05b..6167325 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 Antoine Bertin
+Copyright (c) 2015 Antoine Bertin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/PKG-INFO b/PKG-INFO
index ff621dc..3c61beb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: subliminal
-Version: 0.7.4
+Version: 1.1.1
 Summary: Subtitles, faster than your thoughts
 Home-page: https://github.com/Diaoul/subliminal
 Author: Antoine Bertin
@@ -8,75 +8,170 @@ Author-email: diaoulael at gmail.com
 License: MIT
 Description: Subliminal
         ==========
+        Subtitles, faster than your thoughts.
         
-        Subliminal is a python library to search and download subtitles.
-        It comes with an easy to use CLI (command-line interface) suitable for direct use or cron jobs.
+        .. image:: https://img.shields.io/pypi/v/subliminal.svg
+            :target: https://pypi.python.org/pypi/subliminal
+            :alt: Latest Version
         
-        .. image:: https://travis-ci.org/Diaoul/subliminal.png?branch=develop
-            :target: https://travis-ci.org/Diaoul/subliminal
+        .. image:: https://travis-ci.org/Diaoul/subliminal.svg?branch=master
+           :target: https://travis-ci.org/Diaoul/subliminal
+           :alt: Travis CI build status
         
-        .. image:: https://coveralls.io/repos/Diaoul/subliminal/badge.png?branch=develop
-            :target: https://coveralls.io/r/Diaoul/subliminal?branch=develop 
+        .. image:: https://readthedocs.org/projects/subliminal/badge/?version=latest
+           :target: https://subliminal.readthedocs.org/
+           :alt: Documentation Status
         
+        .. image:: https://coveralls.io/repos/Diaoul/subliminal/badge.svg?branch=master&service=github
+           :target: https://coveralls.io/github/Diaoul/subliminal?branch=master
+           :alt: Code coverage
         
-        Providers
-        ---------
-        Subliminal uses multiple providers to give users a vast choice and have a better chance to find the
-        best matching subtitles. Providers are extensible through a dedicated entry point.
+        .. image:: https://img.shields.io/github/license/Diaoul/subliminal.svg
+           :target: https://github.com/Diaoul/subliminal/blob/master/LICENSE
+           :alt: License
+        
+        .. image:: https://img.shields.io/badge/gitter-join%20chat-1dce73.svg
+           :alt: Join the chat at https://gitter.im/Diaoul/subliminal
+           :target: https://gitter.im/Diaoul/subliminal
         
-        * Addic7ed
-        * BierDopje
-        * OpenSubtitles
-        * Podnapisi
-        * TheSubDB
-        * TvSubtitles
+        
+        :Project page: https://github.com/Diaoul/subliminal
+        :Documentation: https://subliminal.readthedocs.org/
         
         
         Usage
         -----
         CLI
         ^^^
-        Download english subtitles::
+        Download English subtitles::
         
-            $ subliminal -l en -- The.Big.Bang.Theory.S05E18.HDTV.x264-LOL.mp4
-            1 subtitle downloaded
+            $ subliminal download -l en The.Big.Bang.Theory.S05E18.HDTV.x264-LOL.mp4
+            Collecting videos  [####################################]  100%
+            1 video collected / 0 video ignored / 0 error
+            Downloading subtitles  [####################################]  100%
+            Downloaded 1 subtitle
         
         Library
         ^^^^^^^
-        Download best subtitles in French and English for videos less than one week old in a video folder,
-        skipping videos that already have subtitles whether they are embedded or not::
+        Download best subtitles in French and English for videos less than two weeks old in a video folder:
+        
+        .. code:: python
         
-            from babelfish import Language
             from datetime import timedelta
-            import subliminal
-            
+        
+            from babelfish import Language
+            from subliminal import download_best_subtitles, region, save_subtitles, scan_videos
+        
             # configure the cache
-            subliminal.cache_region.configure('dogpile.cache.dbm', arguments={'filename': '/path/to/cachefile.dbm'})
+            region.configure('dogpile.cache.dbm', arguments={'filename': 'cachefile.dbm'})
         
-            # scan for videos in the folder and their subtitles
-            videos = subliminal.scan_videos(['/path/to/video/folder'], subtitles=True, embedded_subtitles=True, age=timedelta(weeks=1))
+            # scan for videos newer than 2 weeks and their existing subtitles in a folder
+            videos = [v for v in scan_videos('/video/folder') if v.age < timedelta(weeks=2)]
         
-            # download
-            subliminal.download_best_subtitles(videos, {Language('eng'), Language('fra')}, age=timedelta(week=1))
+            # download best subtitles
+            subtitles = download_best_subtitles(videos, {Language('eng'), Language('fra')})
         
+            # save them to disk, next to the video
+            for v in videos:
+                save_subtitles(v, subtitles[v])
         
-        License
-        -------
-        MIT
+        
+        Nautilus integration
+        --------------------
+        Screenshots
+        ^^^^^^^^^^^
+        .. image:: http://i.imgur.com/NCwELpB.png
+           :alt: Menu
+        
+        .. image:: http://i.imgur.com/Y58ky88.png
+           :alt: Configuration
+        
+        .. image:: http://i.imgur.com/qem3DGj.png
+           :alt: Choose subtitles
+        
+        Install
+        ^^^^^^^
+        1. Install subliminal on your system
+           ``sudo pip install -U subliminal``
+        2. Install nautilus-python with your package manager
+           ``sudo apt-get install nautilus-python``
+        3. Create the extension directory
+           ``mkdir -p ~/.local/share/nautilus-python/extensions/subliminal``
+        4. Copy the script
+           ``cp examples/nautilus.py ~/.local/share/nautilus-python/extensions/subliminal-nautilus.py``
+        5. Copy UI files
+           ``cp -R examples/ui ~/.local/share/nautilus-python/extensions/subliminal/``
+        6. (Optional) Create a translation directory for your language
+           ``mkdir -p ~/.local/share/nautilus-python/extensions/subliminal/locale/fr/LC_MESSAGES``
+        7. (Optional) Install the translation
+           ``msgfmt examples/i18n/fr.po -o ~/.local/share/nautilus-python/extensions/subliminal/locale/fr/LC_MESSAGES/subliminal.mo``
         
         
         Changelog
-        =========
+        ---------
+        
+        1.1.1
+        ^^^^^
+        **release date:** 2016-01-03
+        
+        * Fix scanning videos on bad MKV files
+        
+        
+        1.1
+        ^^^
+        **release date:** 2015-12-29
+        
+        * Fix library usage example in README
+        * Fix for series name with special characters in addic7ed provider
+        * Fix id property in thesubdb provider
+        * Improve matching on titles
+        * Add support for nautilus context menu with translations
+        * Add support for searching subtitles in a separate directory
+        * Add subscenter provider
+        * Add support for python 3.5
+        
+        
+        1.0.1
+        ^^^^^
+        **release date:** 2015-07-23
+        
+        * Fix unicode issues in CLI (python 2 only)
+        * Fix score scaling in CLI (python 2 only)
+        * Improve error handling in CLI
+        * Color collect report in CLI
+        
+        
+        1.0
+        ^^^
+        **release date:** 2015-07-22
+        
+        * Many changes and fixes
+        * New test suite
+        * New documentation
+        * New CLI
+        * Added support for SubsCenter
+        
+        
+        0.7.5
+        ^^^^^
+        **release date:** 2015-03-04
+        
+        * Update requirements
+        * Remove BierDopje provider
+        * Add pre-guessed video optional argument in scan_video
+        * Improve hearing impaired support
+        * Fix TVSubtitles and Podnapisi providers
+        
         
         0.7.4
-        -----
+        ^^^^^
         **release date:** 2014-01-27
         
         * Fix requirements for guessit and babelfish
         
         
         0.7.3
-        -----
+        ^^^^^
         **release date:** 2013-11-22
         
         * Fix windows compatibility
@@ -86,7 +181,7 @@ Description: Subliminal
         
         
         0.7.2
-        -----
+        ^^^^^
         **release date:** 2013-11-10
         
         * Fix TVSubtitles for ambiguous series
@@ -99,7 +194,7 @@ Description: Subliminal
         
         
         0.7.1
-        -----
+        ^^^^^
         **release date:** 2013-11-06
         
         * Improve CLI
@@ -109,7 +204,7 @@ Description: Subliminal
         
         
         0.7.0
-        -----
+        ^^^^^
         **release date:** 2013-10-29
         
         **WARNING:** Complete rewrite of subliminal with backward incompatible changes
@@ -126,8 +221,23 @@ Description: Subliminal
         * Drop a few providers
         * And much more...
         
+        
+        0.6.4
+        ^^^^^
+        **release date:** 2013-05-19
+        
+        * Fix requirements due to enzyme 0.3
+        
+        
+        0.6.3
+        ^^^^^
+        **release date:** 2013-01-17
+        
+        * Fix requirements due to requests 1.0
+        
+        
         0.6.2
-        -----
+        ^^^^^
         **release date:** 2012-09-15
         
         * Fix BierDopje
@@ -138,8 +248,9 @@ Description: Subliminal
         * Add possible services in help message of the CLI
         * Allow existing filenames to be passed without the ./ prefix
         
+        
         0.6.1
-        -----
+        ^^^^^
         **release date:** 2012-06-24
         
         * Fix subtitle release name in BierDopje
@@ -156,9 +267,11 @@ Description: Subliminal
         * Fix guessit.Language in Video.scan
         * Fix language detection of subtitles
         
+        
         0.6.0
-        -----
+        ^^^^^
         **release date:** 2012-06-16
+        
         **WARNING:** Backward incompatible changes
         
         * Fix --workers option in CLI
@@ -172,13 +285,14 @@ Description: Subliminal
         
         
         0.5.1
-        -----
+        ^^^^^
         **release date:** 2012-03-25
         
         * Improve error handling of enzyme parsing
         
+        
         0.5
-        ---
+        ^^^
         **release date:** 2012-03-25
         **WARNING:** Backward incompatible changes
         
@@ -191,15 +305,17 @@ Description: Subliminal
         * Remove class Subliminal
         * Remove permissions handling
         
+        
         0.4
-        ---
+        ^^^
         **release date:** 2011-11-11
         
         * Many fixes
         * Better error handling
         
+        
         0.3
-        ---
+        ^^^
         **release date:** 2011-08-18
         
         * Fix a bug when series is not guessed by guessit
@@ -209,23 +325,25 @@ Description: Subliminal
         * Add possibility to choose mode of created files
         * Add more checks before adjusting permissions
         
+        
         0.2
-        ---
+        ^^^
         **release date:** 2011-07-11
         
         * Fix plugin configuration
         * Fix some encoding issues
         * Remove extra logging
         
+        
         0.1
-        ---
-        **release date:** not released yet
+        ^^^
+        **release date:** *private release*
         
         * Initial release
         
 Keywords: subtitle subtitles video movie episode tv show
 Platform: UNKNOWN
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -234,5 +352,7 @@ Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Multimedia :: Video
diff --git a/README.rst b/README.rst
index 33e11ea..dcd8ce0 100644
--- a/README.rst
+++ b/README.rst
@@ -1,57 +1,99 @@
 Subliminal
 ==========
+Subtitles, faster than your thoughts.
 
-Subliminal is a python library to search and download subtitles.
-It comes with an easy to use CLI (command-line interface) suitable for direct use or cron jobs.
+.. image:: https://img.shields.io/pypi/v/subliminal.svg
+    :target: https://pypi.python.org/pypi/subliminal
+    :alt: Latest Version
 
-.. image:: https://travis-ci.org/Diaoul/subliminal.png?branch=develop
-    :target: https://travis-ci.org/Diaoul/subliminal
+.. image:: https://travis-ci.org/Diaoul/subliminal.svg?branch=master
+   :target: https://travis-ci.org/Diaoul/subliminal
+   :alt: Travis CI build status
 
-.. image:: https://coveralls.io/repos/Diaoul/subliminal/badge.png?branch=develop
-    :target: https://coveralls.io/r/Diaoul/subliminal?branch=develop 
+.. image:: https://readthedocs.org/projects/subliminal/badge/?version=latest
+   :target: https://subliminal.readthedocs.org/
+   :alt: Documentation Status
 
+.. image:: https://coveralls.io/repos/Diaoul/subliminal/badge.svg?branch=master&service=github
+   :target: https://coveralls.io/github/Diaoul/subliminal?branch=master
+   :alt: Code coverage
 
-Providers
----------
-Subliminal uses multiple providers to give users a vast choice and have a better chance to find the
-best matching subtitles. Providers are extensible through a dedicated entry point.
+.. image:: https://img.shields.io/github/license/Diaoul/subliminal.svg
+   :target: https://github.com/Diaoul/subliminal/blob/master/LICENSE
+   :alt: License
 
-* Addic7ed
-* BierDopje
-* OpenSubtitles
-* Podnapisi
-* TheSubDB
-* TvSubtitles
+.. image:: https://img.shields.io/badge/gitter-join%20chat-1dce73.svg
+   :alt: Join the chat at https://gitter.im/Diaoul/subliminal
+   :target: https://gitter.im/Diaoul/subliminal
+
+
+:Project page: https://github.com/Diaoul/subliminal
+:Documentation: https://subliminal.readthedocs.org/
 
 
 Usage
 -----
 CLI
 ^^^
-Download english subtitles::
+Download English subtitles::
 
-    $ subliminal -l en -- The.Big.Bang.Theory.S05E18.HDTV.x264-LOL.mp4
-    1 subtitle downloaded
+    $ subliminal download -l en The.Big.Bang.Theory.S05E18.HDTV.x264-LOL.mp4
+    Collecting videos  [####################################]  100%
+    1 video collected / 0 video ignored / 0 error
+    Downloading subtitles  [####################################]  100%
+    Downloaded 1 subtitle
 
 Library
 ^^^^^^^
-Download best subtitles in French and English for videos less than one week old in a video folder,
-skipping videos that already have subtitles whether they are embedded or not::
+Download best subtitles in French and English for videos less than two weeks old in a video folder:
+
+.. code:: python
 
-    from babelfish import Language
     from datetime import timedelta
-    import subliminal
-    
+
+    from babelfish import Language
+    from subliminal import download_best_subtitles, region, save_subtitles, scan_videos
+
     # configure the cache
-    subliminal.cache_region.configure('dogpile.cache.dbm', arguments={'filename': '/path/to/cachefile.dbm'})
+    region.configure('dogpile.cache.dbm', arguments={'filename': 'cachefile.dbm'})
+
+    # scan for videos newer than 2 weeks and their existing subtitles in a folder
+    videos = [v for v in scan_videos('/video/folder') if v.age < timedelta(weeks=2)]
+
+    # download best subtitles
+    subtitles = download_best_subtitles(videos, {Language('eng'), Language('fra')})
 
-    # scan for videos in the folder and their subtitles
-    videos = subliminal.scan_videos(['/path/to/video/folder'], subtitles=True, embedded_subtitles=True, age=timedelta(weeks=1))
+    # save them to disk, next to the video
+    for v in videos:
+        save_subtitles(v, subtitles[v])
 
-    # download
-    subliminal.download_best_subtitles(videos, {Language('eng'), Language('fra')}, age=timedelta(week=1))
 
+Nautilus integration
+--------------------
+Screenshots
+^^^^^^^^^^^
+.. image:: http://i.imgur.com/NCwELpB.png
+   :alt: Menu
 
-License
--------
-MIT
+.. image:: http://i.imgur.com/Y58ky88.png
+   :alt: Configuration
+
+.. image:: http://i.imgur.com/qem3DGj.png
+   :alt: Choose subtitles
+
+Install
+^^^^^^^
+1. Install subliminal on your system
+   ``sudo pip install -U subliminal``
+2. Install nautilus-python with your package manager
+   ``sudo apt-get install nautilus-python``
+3. Create the extension directory
+   ``mkdir -p ~/.local/share/nautilus-python/extensions/subliminal``
+4. Copy the script
+   ``cp examples/nautilus.py ~/.local/share/nautilus-python/extensions/subliminal-nautilus.py``
+5. Copy UI files
+   ``cp -R examples/ui ~/.local/share/nautilus-python/extensions/subliminal/``
+6. (Optional) Create a translation directory for your language
+   ``mkdir -p ~/.local/share/nautilus-python/extensions/subliminal/locale/fr/LC_MESSAGES``
+7. (Optional) Install the translation
+   ``msgfmt examples/i18n/fr.po -o ~/.local/share/nautilus-python/extensions/subliminal/locale/fr/LC_MESSAGES/subliminal.mo``
diff --git a/requirements.txt b/requirements.txt
index a83b650..d6e1198 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1 @@
-beautifulsoup4>=4.3.2
-guessit>=0.6.2,<0.7
-requests>=2.0.1
-enzyme>=0.4.0
-html5lib>=0.99
-dogpile.cache>=0.5.2
-babelfish>=0.4.0,<0.5
-charade>=1.0.3
-pysrt>=0.5.0
+-e .
diff --git a/setup.cfg b/setup.cfg
index ac28ccf..66692a4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,6 @@
+[aliases]
+test = pytest
+
 [build_sphinx]
 source-dir = docs/
 build-dir = docs/_build
diff --git a/setup.py b/setup.py
index 06a7c0f..0223017 100644
--- a/setup.py
+++ b/setup.py
@@ -1,40 +1,86 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+import io
+import re
+import sys
+
 from setuptools import setup, find_packages
 
 
+# requirements
+setup_requirements = ['pytest-runner'] if {'pytest', 'test', 'ptr'}.intersection(sys.argv) else []
+
+install_requirements = ['guessit>=0.9.1,<2.0', 'babelfish>=0.5.2', 'enzyme>=0.4.1', 'beautifulsoup4>=4.2.0',
+                        'requests>=2.0', 'click>=4.0', 'dogpile.cache>=0.5.4', 'stevedore>=1.0.0',
+                        'chardet>=2.3.0', 'pysrt>=1.0.1', 'six>=1.9.0']
+
+test_requirements = ['sympy', 'vcrpy>=1.6.1', 'pytest', 'pytest-pep8', 'pytest-flakes', 'pytest-cov']
+if sys.version_info < (3, 3):
+    test_requirements.append('mock')
+
+dev_requirements = ['tox', 'sphinx', 'transifex-client', 'wheel']
+
+# package informations
+with io.open('subliminal/__init__.py', 'r') as f:
+    version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]$', f.read(), re.MULTILINE).group(1)
+
+if not version:
+    raise RuntimeError('Cannot find version information')
+
+with io.open('README.rst', 'r', encoding='utf-8') as f:
+    readme = f.read()
+
+with io.open('HISTORY.rst', 'r', encoding='utf-8') as f:
+    history = f.read()
+
+
 setup(name='subliminal',
-    version='0.7.4',
-    license='MIT',
-    description='Subtitles, faster than your thoughts',
-    long_description=open('README.rst').read() + '\n\n' + open('HISTORY.rst').read(),
-    keywords='subtitle subtitles video movie episode tv show',
-    url='https://github.com/Diaoul/subliminal',
-    author='Antoine Bertin',
-    author_email='diaoulael at gmail.com',
-    packages=find_packages(),
-    classifiers=['Development Status :: 4 - Beta',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-        'Topic :: Multimedia :: Video'],
-    entry_points={
-        'console_scripts': ['subliminal = subliminal.cli:subliminal'],
-        'subliminal.providers': ['addic7ed = subliminal.providers.addic7ed:Addic7edProvider',
-                                 'bierdopje = subliminal.providers.bierdopje:BierDopjeProvider',
-                                 'opensubtitles = subliminal.providers.opensubtitles:OpenSubtitlesProvider',
-                                 'podnapisi = subliminal.providers.podnapisi:PodnapisiProvider',
-                                 'thesubdb = subliminal.providers.thesubdb:TheSubDBProvider',
-                                 'tvsubtitles = subliminal.providers.tvsubtitles:TVsubtitlesProvider'],
-        'babelfish.language_converters': ['addic7ed = subliminal.converters.addic7ed:Addic7edConverter',
-                                          'podnapisi = subliminal.converters.podnapisi:PodnapisiConverter',
-                                          'tvsubtitles = subliminal.converters.tvsubtitles:TVsubtitlesConverter']
-    },
-    install_requires=open('requirements.txt').readlines(),
-    test_suite='subliminal.tests.suite')
+      version=version,
+      license='MIT',
+      description='Subtitles, faster than your thoughts',
+      long_description=readme + '\n\n' + history,
+      keywords='subtitle subtitles video movie episode tv show',
+      url='https://github.com/Diaoul/subliminal',
+      author='Antoine Bertin',
+      author_email='diaoulael at gmail.com',
+      packages=find_packages(),
+      classifiers=[
+          'Development Status :: 5 - Production/Stable',
+          'Intended Audience :: Developers',
+          'License :: OSI Approved :: MIT License',
+          'Operating System :: OS Independent',
+          'Programming Language :: Python',
+          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 3.3',
+          'Programming Language :: Python :: 3.4',
+          'Programming Language :: Python :: 3.5',
+          'Topic :: Software Development :: Libraries :: Python Modules',
+          'Topic :: Multimedia :: Video'
+      ],
+      entry_points={
+          'subliminal.providers': [
+              'addic7ed = subliminal.providers.addic7ed:Addic7edProvider',
+              'opensubtitles = subliminal.providers.opensubtitles:OpenSubtitlesProvider',
+              'podnapisi = subliminal.providers.podnapisi:PodnapisiProvider',
+              'subscenter = subliminal.providers.subscenter:SubsCenterProvider',
+              'thesubdb = subliminal.providers.thesubdb:TheSubDBProvider',
+              'tvsubtitles = subliminal.providers.tvsubtitles:TVsubtitlesProvider'
+          ],
+          'babelfish.language_converters': [
+              'addic7ed = subliminal.converters.addic7ed:Addic7edConverter',
+              'thesubdb = subliminal.converters.thesubdb:TheSubDBConverter',
+              'tvsubtitles = subliminal.converters.tvsubtitles:TVsubtitlesConverter'
+          ],
+          'console_scripts': [
+              'subliminal = subliminal.cli:subliminal'
+          ]
+      },
+      setup_requires=setup_requirements,
+      install_requires=install_requirements,
+      tests_require=test_requirements,
+      extras_require={
+          'test': test_requirements,
+          'dev': dev_requirements
+      })
diff --git a/subliminal.egg-info/PKG-INFO b/subliminal.egg-info/PKG-INFO
index ff621dc..3c61beb 100644
--- a/subliminal.egg-info/PKG-INFO
+++ b/subliminal.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: subliminal
-Version: 0.7.4
+Version: 1.1.1
 Summary: Subtitles, faster than your thoughts
 Home-page: https://github.com/Diaoul/subliminal
 Author: Antoine Bertin
@@ -8,75 +8,170 @@ Author-email: diaoulael at gmail.com
 License: MIT
 Description: Subliminal
         ==========
+        Subtitles, faster than your thoughts.
         
-        Subliminal is a python library to search and download subtitles.
-        It comes with an easy to use CLI (command-line interface) suitable for direct use or cron jobs.
+        .. image:: https://img.shields.io/pypi/v/subliminal.svg
+            :target: https://pypi.python.org/pypi/subliminal
+            :alt: Latest Version
         
-        .. image:: https://travis-ci.org/Diaoul/subliminal.png?branch=develop
-            :target: https://travis-ci.org/Diaoul/subliminal
+        .. image:: https://travis-ci.org/Diaoul/subliminal.svg?branch=master
+           :target: https://travis-ci.org/Diaoul/subliminal
+           :alt: Travis CI build status
         
-        .. image:: https://coveralls.io/repos/Diaoul/subliminal/badge.png?branch=develop
-            :target: https://coveralls.io/r/Diaoul/subliminal?branch=develop 
+        .. image:: https://readthedocs.org/projects/subliminal/badge/?version=latest
+           :target: https://subliminal.readthedocs.org/
+           :alt: Documentation Status
         
+        .. image:: https://coveralls.io/repos/Diaoul/subliminal/badge.svg?branch=master&service=github
+           :target: https://coveralls.io/github/Diaoul/subliminal?branch=master
+           :alt: Code coverage
         
-        Providers
-        ---------
-        Subliminal uses multiple providers to give users a vast choice and have a better chance to find the
-        best matching subtitles. Providers are extensible through a dedicated entry point.
+        .. image:: https://img.shields.io/github/license/Diaoul/subliminal.svg
+           :target: https://github.com/Diaoul/subliminal/blob/master/LICENSE
+           :alt: License
+        
+        .. image:: https://img.shields.io/badge/gitter-join%20chat-1dce73.svg
+           :alt: Join the chat at https://gitter.im/Diaoul/subliminal
+           :target: https://gitter.im/Diaoul/subliminal
         
-        * Addic7ed
-        * BierDopje
-        * OpenSubtitles
-        * Podnapisi
-        * TheSubDB
-        * TvSubtitles
+        
+        :Project page: https://github.com/Diaoul/subliminal
+        :Documentation: https://subliminal.readthedocs.org/
         
         
         Usage
         -----
         CLI
         ^^^
-        Download english subtitles::
+        Download English subtitles::
         
-            $ subliminal -l en -- The.Big.Bang.Theory.S05E18.HDTV.x264-LOL.mp4
-            1 subtitle downloaded
+            $ subliminal download -l en The.Big.Bang.Theory.S05E18.HDTV.x264-LOL.mp4
+            Collecting videos  [####################################]  100%
+            1 video collected / 0 video ignored / 0 error
+            Downloading subtitles  [####################################]  100%
+            Downloaded 1 subtitle
... 6068 lines suppressed ...

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/subliminal.git



More information about the Python-modules-commits mailing list