diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a609703b..96321a5b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,6 +40,13 @@ jobs: pytest tests --doctest-modules --junitxml=junit/test-results.xml displayName: 'pytest' + - script: | + rm -rf .git + python cleanup.py + python TorrentToMedia.py + python nzbToMedia.py + displayName: 'Test source install cleanup' + - task: PublishTestResults@2 inputs: testResultsFiles: '**/test-results.xml' diff --git a/core/__init__.py b/core/__init__.py index 3087ff55..56f08bce 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -746,7 +746,7 @@ def configure_transcoder(): }, 'mkv': { 'VEXTENSION': '.mkv', 'VCODEC': 'libx264', 'VPRESET': None, 'VFRAMERATE': None, 'VBITRATE': None, 'VCRF': None, 'VLEVEL': None, - 'VRESOLUTION': None, 'VCODEC_ALLOW': ['libx264', 'h264', 'h.264', 'AVC', 'avc', 'mpeg4', 'msmpeg4', 'MPEG-4', 'mpeg2video'], + 'VRESOLUTION': None, 'VCODEC_ALLOW': ['libx264', 'h264', 'h.264', 'h265', 'libx265', 'h.265', 'AVC', 'avc', 'mpeg4', 'msmpeg4', 'MPEG-4', 'mpeg2video'], 'ACODEC': 'dts', 'ACODEC_ALLOW': ['libfaac', 'dts', 'ac3', 'mp2', 'mp3'], 'ABITRATE': None, 'ACHANNELS': 8, 'ACODEC2': None, 'ACODEC2_ALLOW': [], 'ABITRATE2': None, 'ACHANNELS2': None, 'ACODEC3': 'ac3', 'ACODEC3_ALLOW': ['libfaac', 'dts', 'ac3', 'mp2', 'mp3'], 'ABITRATE3': None, 'ACHANNELS3': 8, diff --git a/setup.py b/setup.py index 803f430b..b2f78439 100644 --- a/setup.py +++ b/setup.py @@ -53,6 +53,9 @@ setup( author_email='fock_wulf@hotmail.com', url='https://github.com/clinton-hall/nzbToMedia', packages=['core'], + install_requires=[ + 'pywin32;platform_system=="Windows"', + ], classifiers=[ # complete classifier list: http://pypi.python.org/pypi?%3Aaction=list_classifiers 'Development Status :: 5 - Production/Stable',