From 44b9f5e752b6f66a2450a5ec3c5c2625cefa6a14 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Wed, 30 Jul 2014 13:35:11 -0700 Subject: [PATCH] Make `pip install -e` work This allows `pip install -e` and `python setup.py develop` to work without having to do the stuff in http://docs.ansible.com/intro_installation.html#running-from-source so it's a tad nicer for Python programmers who are accustomed to installing packages as editable/in development mode. Fixes GH-8355 (https://github.com/ansible/ansible/issues/8355) --- bin/ansible-playbook | 8 ++++++++ lib/ansible/constants.py | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/bin/ansible-playbook b/bin/ansible-playbook index 3d05d8e29c..91fd279b62 100755 --- a/bin/ansible-playbook +++ b/bin/ansible-playbook @@ -25,6 +25,14 @@ import sys import os import stat +# Augment PYTHONPATH to find Python modules relative to this file path +# This is so that we can find the modules when running from a local checkout +# installed as editable with `pip install -e ...` or `python setup.py develop` +local_module_path = os.path.abspath( + os.path.join(os.path.dirname(__file__), '..', 'lib') +) +sys.path.append(local_module_path) + import ansible.playbook import ansible.constants as C import ansible.utils.template diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index fb3e2420e9..e1a631e323 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -94,6 +94,14 @@ if getattr(sys, "real_prefix", None): else: DIST_MODULE_PATH = '/usr/share/ansible/' +# Look for modules relative to this file path +# This is so that we can find the modules when running from a local checkout +# installed as editable with `pip install -e ...` or `python setup.py develop` +local_module_path = os.path.abspath( + os.path.join(os.path.dirname(__file__), '..', '..', 'library') +) +DIST_MODULE_PATH = os.pathsep.join([DIST_MODULE_PATH, local_module_path]) + # check all of these extensions when looking for yaml files for things like # group variables -- really anything we can load YAML_FILENAME_EXTENSIONS = [ "", ".yml", ".yaml", ".json" ]