Merge branch 'develop' into reduce-release-parsing

.pullapprove.yml

@@ -4,40 +4,14 @@ reject_regex: (^Rejected|^Fix it)
 reset_on_push: false
 reviewers:
   -
-    name: backend-devs
+    name: devs
     required: 1
     members:
       - duramato
       - fernandog
       - labrys
       - medariox
+      - ratoaq2
       - p0psicles
-      - adaur
-# # CONDITIONS REQUIRE PRO ACCOUNT
-#    conditions:
-#      branches:
-#        - master
-#        - beta
-#        - develop
-#      files:
-#        - "*.py"
-  -
-    name: gui-devs
-    required: 1
-    members:
-      - Labrys
       - OmgImAlexis
-      - p0psicles
-# # CONDITIONS REQUIRE PRO ACCOUNT
-#    conditions:
-#      branches:
-#        - master
-#        - beta
-#        - develop
-#      files:
-#        - "gui/"
-  -
-    name: support
-    required: 0
-    members:
-      - neoatomic
+      - adaur

lib/subliminal/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 __title__ = 'subliminal'
-__version__ = '2.0.rc1'
+__version__ = '2.0.3'
 __short_version__ = '.'.join(__version__.split('.')[:2])
 __author__ = 'Antoine Bertin'
 __license__ = 'MIT'

lib/subliminal/cli.py

@@ -6,6 +6,7 @@
 from __future__ import division
 from collections import defaultdict
 from datetime import timedelta
+import glob
 import json
 import logging
 import os
@@ -15,7 +16,7 @@
 from babelfish import Error as BabelfishError, Language
 import click
 from dogpile.cache.backends.file import AbstractFileLock
-from dogpile.core import ReadWriteMutex
+from dogpile.util.readwrite_lock import ReadWriteMutex
 from six.moves import configparser
 
 from subliminal import (AsyncProviderPool, Episode, Movie, Video, __version__, check_video, compute_score, get_scores,
@@ -266,7 +267,8 @@ def subliminal(ctx, addic7ed, itasa, legendastv, opensubtitles, subscenter, cach
 def cache(ctx, clear_subliminal):
     """Cache management."""
     if clear_subliminal:
-        os.remove(os.path.join(ctx.parent.params['cache_dir'], cache_file))
+        for file in glob.glob(os.path.join(ctx.parent.params['cache_dir'], cache_file) + '*'):
+            os.remove(file)
         click.echo('Subliminal\'s cache cleared.')
     else:
         click.echo('Nothing done.')