diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-16 17:38:00 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-16 17:38:00 -0500 |
| commit | e16d64d53ce54c5c3f3115c9520957fb1724eb60 (patch) | |
| tree | bc4a4692f3ef8e28db56f89b0c71287acc029130 | |
| parent | 28554a17fe5c11952ef936b2785bc12cac3a4402 (diff) | |
| download | python-setuptools-bitbucket-e16d64d53ce54c5c3f3115c9520957fb1724eb60.tar.gz | |
Get VersionConflict from pkg_resources.19.4
| -rw-r--r-- | setuptools/tests/test_easy_install.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index 895ce7aa..99ac7317 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -396,7 +396,7 @@ class TestSetupRequires: # Don't even need to install the package, just # running the setup.py at all is sufficient run_setup(test_setup_py, ['--name']) - except VersionConflict: + except pkg_resources.VersionConflict: self.fail('Installing setup.py requirements ' 'caused a VersionConflict') |