From fb1da6be36caf504f0c182f5174d2d6176a39591 Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Sun, 17 Jan 2016 19:31:49 +0800 Subject: [PATCH] [test_i18n] Handle normalized version by pip --- test/test_i18n.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/test/test_i18n.py b/test/test_i18n.py index bf257b2d1..8d00eb4e5 100644 --- a/test/test_i18n.py +++ b/test/test_i18n.py @@ -20,7 +20,10 @@ rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) sys.path.insert(0, rootDir) from youtube_dl.version import __version__ -from youtube_dl.compat import subprocess_check_output +from youtube_dl.compat import ( + subprocess_check_output, + compat_str, +) from youtube_dl.utils import ( decodeFilename, get_subprocess_encoding, @@ -44,6 +47,15 @@ def ydl_path(venv_root): return [sys.executable, os.path.join(venv_root, 'bin', 'youtube-dl')] +def normalized_version(ver): + try: + from pip._vendor import packaging + except ImportError: + return version + + return compat_str(packaging.version.Version(ver)) + + class I18NTestCase(object): @classmethod def setUpClass(cls): @@ -98,7 +110,7 @@ class TestPipInstall(I18NTestCase, unittest.TestCase): with chdir_to('test'): subprocess.check_call([ 'pip', 'install', '--quiet', - os.path.join('..', 'dist', 'youtube_dl-%s.tar.gz' % __version__)]) + os.path.join('..', 'dist', 'youtube_dl-%s.tar.gz' % normalized_version(__version__))]) @classmethod def uninstall(cls):