Merge pull request #6824 from pymedusa/release/release-0.3.3

Release 0.3.3

.github/check_version.py

@@ -1,6 +1,7 @@
 """Check Medusa app version before release"""
 from __future__ import print_function, unicode_literals
 
+import io
 import os
 import re
 import subprocess
@@ -58,15 +59,16 @@ def __repr__(self):
 
 
 def search_file_for_version():
+    """Get the app version from the code."""
     version_file = VERSION_FILE.split('/')
     filename = os.path.abspath(os.path.join(TRAVIS_BUILD_DIR, *version_file))
-    with open(filename, 'r') as fh:
-        data = fh.readlines()
+    with io.open(filename, 'r', encoding='utf-8') as fh:
+        for line in fh:
+            match = VERSION_LINE_REGEXP.match(line)
+            if match:
+                return Version(match.group(1))
 
-    for line in data:
-        match = VERSION_LINE_REGEXP.findall(line)
-        if match:
-            return Version(match[0])
+    raise ValueError('Failed to get the app version!')
 
 
 # Are we merging either develop or a release branch into master in a pull request?

.gitignore

@@ -15,8 +15,6 @@ failed.db*
 autoProcessTV.cfg
 server.crt
 server.key
-medusa.egg-info
-.eggs
 
 #  Medusa Test Related   #
 ######################
@@ -66,6 +64,13 @@ Thumbs.db
 *~
 *.torrent
 
+# Python build related #
+######################
+build/
+dist/
+pymedusa.egg-info
+.eggs
+
 # Grunt/Gulp/Node build related #
 ######################
 **/bower_components

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.3.3 (2019-06-12)
+
+#### New Features
+- Added new provider Beyond-hd ([#6802](https://github.com/pymedusa/Medusa/pull/6802))
+
+#### Fixes
+- Fixed error when changing episode quality but not changing status ([#6784](https://github.com/pymedusa/Medusa/pull/6784))
+- Fixed Jackett providers returning empty torrents on magnet redirect ([#6790](https://github.com/pymedusa/Medusa/pull/6790))
+- Fixed error when using KnowIt with MediaInfo ([#6796](https://github.com/pymedusa/Medusa/pull/6796))
+
+-----
+
 ## 0.3.2 (2019-06-05)
 
 #### New Features
@@ -41,7 +53,7 @@
 #### New Features
 - Added support for Python 3 (>= 3.5.0) ([#4982](https://github.com/pymedusa/Medusa/pull/4982))
 - Added feature to search episodes early or late compared to their scheduled airdate ([#5874](https://github.com/pymedusa/Medusa/pull/5874))
-- Added per show required/preferred words exclude option ([#4982](https://github.com/pymedusa/Medusa/pull/6033))
+- Added per show required/preferred words exclude option ([#6033](https://github.com/pymedusa/Medusa/pull/6033))
 
 #### Improvements
 - Vueified the partial mako template showheader.mako into show-header.vue ([#6189](https://github.com/pymedusa/Medusa/pull/6189))

MANIFEST.in

@@ -0,0 +1,21 @@
+recursive-include medusa *.py
+graft themes
+
+graft ext
+graft ext2
+graft ext3
+graft lib
+graft lib2
+graft lib3
+
+graft runscripts
+
+include CHANGELOG.md
+include COPYING.txt
+include readme.md
+include requirements.txt
+include SickBeard.py
+include start.py
+
+global-exclude __pycache__
+global-exclude *.py[cod]

dredd/api-description.yml

@@ -2565,11 +2565,12 @@ parameters:
     description: The configuration to retrieve
     type: string
     enum:
-      - main
+      - main # Keep main first, as the tests use it
       - consts
       - metadata
-      - search
       - notifiers
+      - search
+      - system
   log-level:
     name: level
     in: query

ext/adba/aniDBlink.py

@@ -21,7 +21,6 @@
 import sys
 import threading
 import zlib
-from builtins import bytes
 from time import time, sleep
 
 from .aniDBerrors import *
@@ -213,7 +212,13 @@ def _send(self, command):
         command.started = time()
         data = command.raw_data()
 
-        self.sock.sendto(bytes(data, "ASCII"), self.target)
+        # Encode data to bytes if needed
+        try:
+            data = data.encode("ASCII")
+        except AttributeError:  # On Python 3: 'bytes' object has no attribute 'encode'
+            pass
+
+        self.sock.sendto(data, self.target)
         if command.command == 'AUTH':
             logger.debug("NetIO > sensitive data is not logged!")
 

ext/mako/__init__.py

@@ -1,8 +1,8 @@
 # mako/__init__.py
-# Copyright (C) 2006-2016 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 
-__version__ = '1.0.10'
+__version__ = '1.0.12'