Merge pull request #8367 from msabramo/make_pip_install_editable_work

Make `pip install -e` work
pull/8640/head
Michael DeHaan 10 years ago
commit 3035f2dcc8

@ -25,6 +25,14 @@ import sys
import os import os
import stat 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.playbook
import ansible.constants as C import ansible.constants as C
import ansible.utils.template import ansible.utils.template

@ -94,6 +94,14 @@ if getattr(sys, "real_prefix", None):
else: else:
DIST_MODULE_PATH = '/usr/share/ansible/' 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 # check all of these extensions when looking for yaml files for things like
# group variables -- really anything we can load # group variables -- really anything we can load
YAML_FILENAME_EXTENSIONS = [ "", ".yml", ".yaml", ".json" ] YAML_FILENAME_EXTENSIONS = [ "", ".yml", ".yaml", ".json" ]

Loading…
Cancel
Save