Merge branch 'nightly' into dev

This commit is contained in:
clinton-hall 2019-01-13 20:11:56 +13:00
commit 243cf52c47
5 changed files with 33 additions and 6 deletions

View file

@ -1,5 +1,5 @@
[bumpversion]
current_version = 12.0.5
current_version = 12.0.6
commit = True
tag = False

View file

@ -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))

View file

@ -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:

View file

@ -52,7 +52,7 @@ from core.utils import (
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 @@ SYS_ENCODING = None
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'

View file

@ -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="""