diff options
| -rwxr-xr-x | bin/ansible | 10 | ||||
| -rwxr-xr-x | bin/ansible-connection | 4 | ||||
| -rw-r--r-- | changelogs/fragments/drop-pkg_resources.yaml | 8 | ||||
| -rw-r--r-- | requirements.txt | 1 |
4 files changed, 9 insertions, 14 deletions
diff --git a/bin/ansible b/bin/ansible index cc4bfd7a69..cd83e9a413 100755 --- a/bin/ansible +++ b/bin/ansible @@ -22,15 +22,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type __requires__ = ['ansible'] -try: - import pkg_resources -except Exception: - # Use pkg_resources to find the correct versions of libraries and set - # sys.path appropriately when there are multiversion installs. But we - # have code that better expresses the errors in the places where the code - # is actually used (the deps are optional for many code paths) so we don't - # want to fail here. - pass + import os import shutil diff --git a/bin/ansible-connection b/bin/ansible-connection index ac378a4d87..a06adcfc3b 100755 --- a/bin/ansible-connection +++ b/bin/ansible-connection @@ -6,10 +6,6 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type __requires__ = ['ansible'] -try: - import pkg_resources -except Exception: - pass import fcntl import hashlib diff --git a/changelogs/fragments/drop-pkg_resources.yaml b/changelogs/fragments/drop-pkg_resources.yaml new file mode 100644 index 0000000000..dadb13594e --- /dev/null +++ b/changelogs/fragments/drop-pkg_resources.yaml @@ -0,0 +1,8 @@ +--- +minor_changes: + - Drop the use of pkg_resources. Importing pkg_resources was the costliest + part of startup time for Ansible. pkg_resources was used so that platforms + with old versions of PyCrypto and Jinja2 could use parallel installed, + updated versions. Since we no longer support Python-2.6 on the controller + side, we no longer have to support parallel installation to work around + those old stacks. diff --git a/requirements.txt b/requirements.txt index 09ba9fc6f0..ac904c49b8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,3 @@ jinja2 PyYAML paramiko cryptography -setuptools |