Commit cf69a305 authored by Godefroid Chapelle's avatar Godefroid Chapelle

shut up easy_install deprecation

parent 2563a46e
...@@ -601,6 +601,12 @@ ignore_not_upgrading = ( ...@@ -601,6 +601,12 @@ ignore_not_upgrading = (
'Not upgrading because not running a local buildout command.\n' 'Not upgrading because not running a local buildout command.\n'
), '') ), '')
easy_install_deprecated = (
re.compile(
'WARNING: The easy_install command is deprecated and will be removed in a future version.\n'
), '')
def run_buildout(command): def run_buildout(command):
# Make sure we don't get .buildout # Make sure we don't get .buildout
os.environ['HOME'] = os.path.join(os.getcwd(), 'home') os.environ['HOME'] = os.path.join(os.getcwd(), 'home')
......
...@@ -3600,6 +3600,7 @@ def test_suite(): ...@@ -3600,6 +3600,7 @@ def test_suite():
zc.buildout.testing.normalize_script, zc.buildout.testing.normalize_script,
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
zc.buildout.testing.not_found, zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
zc.buildout.testing.adding_find_link, zc.buildout.testing.adding_find_link,
# (re.compile(r"Installing 'zc.buildout >=\S+"), ''), # (re.compile(r"Installing 'zc.buildout >=\S+"), ''),
(re.compile(r'__buildout_signature__ = recipes-\S+'), (re.compile(r'__buildout_signature__ = recipes-\S+'),
...@@ -3643,6 +3644,7 @@ def test_suite(): ...@@ -3643,6 +3644,7 @@ def test_suite():
zc.buildout.testing.normalize_script, zc.buildout.testing.normalize_script,
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
zc.buildout.testing.not_found, zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
zc.buildout.testing.adding_find_link, zc.buildout.testing.adding_find_link,
# (re.compile(r"Installing 'zc.buildout >=\S+"), ''), # (re.compile(r"Installing 'zc.buildout >=\S+"), ''),
# (re.compile(r"Getting distribution for 'zc.buildout >=\S+"), # (re.compile(r"Getting distribution for 'zc.buildout >=\S+"),
...@@ -3680,6 +3682,7 @@ def test_suite(): ...@@ -3680,6 +3682,7 @@ def test_suite():
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_exception_type_for_python_2_and_3, zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
zc.buildout.testing.not_found, zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
zc.buildout.testing.adding_find_link, zc.buildout.testing.adding_find_link,
(re.compile('zc.buildout.buildout.MissingOption'), (re.compile('zc.buildout.buildout.MissingOption'),
'MissingOption'), 'MissingOption'),
...@@ -3703,6 +3706,7 @@ def test_suite(): ...@@ -3703,6 +3706,7 @@ def test_suite():
zc.buildout.testing.normalize_script, zc.buildout.testing.normalize_script,
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
zc.buildout.testing.not_found, zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
zc.buildout.testing.adding_find_link, zc.buildout.testing.adding_find_link,
normalize_bang, normalize_bang,
normalize_S, normalize_S,
...@@ -3733,6 +3737,7 @@ def test_suite(): ...@@ -3733,6 +3737,7 @@ def test_suite():
zc.buildout.testing.normalize_open_in_generated_script, zc.buildout.testing.normalize_open_in_generated_script,
zc.buildout.testing.adding_find_link, zc.buildout.testing.adding_find_link,
zc.buildout.testing.not_found, zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
normalize_bang, normalize_bang,
normalize_S, normalize_S,
(re.compile(r'[-d] setuptools-\S+[.]egg'), 'setuptools.egg'), (re.compile(r'[-d] setuptools-\S+[.]egg'), 'setuptools.egg'),
...@@ -3756,6 +3761,7 @@ def test_suite(): ...@@ -3756,6 +3761,7 @@ def test_suite():
checker=renormalizing.RENormalizing([ checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_exception_type_for_python_2_and_3, zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
zc.buildout.testing.not_found, zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
zc.buildout.testing.adding_find_link, zc.buildout.testing.adding_find_link,
(re.compile(' at -?0x[^>]+'), '<MEM ADDRESS>'), (re.compile(' at -?0x[^>]+'), '<MEM ADDRESS>'),
(re.compile('http://localhost:[0-9]{4,5}/'), (re.compile('http://localhost:[0-9]{4,5}/'),
...@@ -3776,6 +3782,7 @@ def test_suite(): ...@@ -3776,6 +3782,7 @@ def test_suite():
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
zc.buildout.testing.normalize___pycache__, zc.buildout.testing.normalize___pycache__,
zc.buildout.testing.not_found, zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
zc.buildout.testing.normalize_exception_type_for_python_2_and_3, zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
zc.buildout.testing.adding_find_link, zc.buildout.testing.adding_find_link,
normalize_bang, normalize_bang,
...@@ -3824,6 +3831,7 @@ def test_suite(): ...@@ -3824,6 +3831,7 @@ def test_suite():
zc.buildout.testing.normalize_script, zc.buildout.testing.normalize_script,
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
zc.buildout.testing.not_found, zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
zc.buildout.testing.adding_find_link, zc.buildout.testing.adding_find_link,
(re.compile(r'__buildout_signature__ = recipes-\S+'), (re.compile(r'__buildout_signature__ = recipes-\S+'),
'__buildout_signature__ = recipes-SSSSSSSSSSS'), '__buildout_signature__ = recipes-SSSSSSSSSSS'),
...@@ -3904,6 +3912,7 @@ def test_suite(): ...@@ -3904,6 +3912,7 @@ def test_suite():
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_script, zc.buildout.testing.normalize_script,
zc.buildout.testing.not_found, zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
normalize_bang, normalize_bang,
zc.buildout.testing.adding_find_link, zc.buildout.testing.adding_find_link,
(re.compile('Downloading.*setuptools.*egg\n'), ''), (re.compile('Downloading.*setuptools.*egg\n'), ''),
......
...@@ -50,6 +50,7 @@ def test_suite(): ...@@ -50,6 +50,7 @@ def test_suite():
zc.buildout.tests.normalize_bang, zc.buildout.tests.normalize_bang,
zc.buildout.tests.normalize_S, zc.buildout.tests.normalize_S,
zc.buildout.testing.not_found, zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
(re.compile(r'[d-] zc.buildout(-\S+)?[.]egg(-link)?'), (re.compile(r'[d-] zc.buildout(-\S+)?[.]egg(-link)?'),
'zc.buildout.egg'), 'zc.buildout.egg'),
(re.compile(r'[d-] setuptools-[^-]+-'), 'setuptools-X-'), (re.compile(r'[d-] setuptools-[^-]+-'), 'setuptools-X-'),
...@@ -65,6 +66,7 @@ def test_suite(): ...@@ -65,6 +66,7 @@ def test_suite():
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.testing.not_found, zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
(re.compile('__buildout_signature__ = ' (re.compile('__buildout_signature__ = '
r'sample-\S+\s+' r'sample-\S+\s+'
r'zc.recipe.egg-\S+\s+' r'zc.recipe.egg-\S+\s+'
...@@ -86,6 +88,7 @@ def test_suite(): ...@@ -86,6 +88,7 @@ def test_suite():
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.testing.not_found, zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
(re.compile("(d ((ext)?demo(needed)?|other)" (re.compile("(d ((ext)?demo(needed)?|other)"
r"-\d[.]\d-py)\d[.]\d(-\S+)?[.]egg"), r"-\d[.]\d-py)\d[.]\d(-\S+)?[.]egg"),
'\\1V.V.egg'), '\\1V.V.egg'),
...@@ -117,6 +120,7 @@ def test_suite(): ...@@ -117,6 +120,7 @@ def test_suite():
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.testing.not_found, zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
]) ])
), ),
)) ))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment