Merge branch 'nightly' into dev

clinton-hall · Jan 13, 2019 · 243cf52 · 243cf52
2 parents 247da9c + b5b4808
commit 243cf52
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 6 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 12.0.5
+current_version = 12.0.6
 commit = True
 tag = False
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-nzbToMedia v12.0.5
+nzbToMedia v12.0.6
 ==================
 
 Provides an [efficient](https://github.com/clinton-hall/nzbToMedia/wiki/Efficient-on-demand-post-processing) way to handle postprocessing for [CouchPotatoServer](https://couchpota.to/ "CouchPotatoServer") and [SickBeard](http://sickbeard.com/ "SickBeard") (and its [forks](https://github.com/clinton-hall/nzbToMedia/wiki/Failed-Download-Handling-%28FDH%29#sick-beard-and-its-forks))

diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,33 @@
 Change_LOG / History
 
+V12.0.6
+
+Hotfix for Manual Torrent run results.
+
+V12.0.5
+
+Proper fix for source cleaner
+
+V12.0.4
+
+Hotfix missed commit for source cleaner
+
+V12.0.3
+
+Hotfix cleaning for source installs
+
+V12.0.2
+
+Fix missed ProcessResult
+
+V12.0.1
+
+Added Python 3 support
+Updated all dependencies
+Major code refactoring
+Various bug fixes
+Hotfix NZBGet not working without comment
+
 V12.0.0
 
 NOTE:

diff --git a/core/__init__.py b/core/__init__.py
@@ -52,7 +52,7 @@
     resume_torrent, remove_dir, remove_read_only, sanitize_name, update_download_info_status,
 )
 
-__version__ = '12.0.5'
+__version__ = '12.0.6'
 
 # Client Agents
 NZB_CLIENTS = ['sabnzbd', 'nzbget', 'manual']
@@ -101,7 +101,7 @@
 FAILED = False
 
 AUTO_UPDATE = None
-NZBTOMEDIA_VERSION = None
+NZBTOMEDIA_VERSION = __version__
 NEWEST_VERSION = None
 NEWEST_VERSION_STRING = None
 VERSION_NOTIFY = None
@@ -328,7 +328,6 @@ def initialize(section=None):
     main_db.upgrade_database(main_db.DBConnection(), databases.InitialSchema)
 
     # Set Version and GIT variables
-    NZBTOMEDIA_VERSION = '11.06'
     VERSION_NOTIFY = int(CFG['General']['version_notify'])
     AUTO_UPDATE = int(CFG['General']['auto_update'])
     GIT_REPO = 'nzbToMedia'

diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@ def read(*names, **kwargs):
 
 setup(
     name='nzbToMedia',
-    version='12.0.5',
+    version='12.0.6',
     license='GPLv3',
     description='Efficient on demand post processing',
     long_description="""