97c01e48ed
Currently we have all our elements and library files in a top-level directory and install them into <root>/share/diskimage-builder/[elements|lib] (where root is either / or the root of a virtualenv). The problem with this is that editable/development installs (pip -e) do *not* install data_files. Thus we have no canonical location to look for elements -- leading to the various odd things we do such as a whole bunch of guessing at the top of disk-image-create and having a special test-loader in tests/test_elements.py so we can run python unit tests on those elements that have it. data_files is really the wrong thing to use for what are essentially assets of the program. data_files install works well for things like config-files, init.d files or dropping documentation files. By moving the elements under the diskimage_builder package, we always know where they are relative to where we import from. In fact, pkg_resources has an api for this which we wrap in the new diskimage_builder/paths.py helper [1]. We use this helper to find the correct path in the couple of places we need to find the base-elements dir, and for the paths to import the library shell functions. Elements such as svc-map and pkg-map include python unit-tests, which we do not need tests/test_elements.py to special-case load any more. They just get found automatically by the normal subunit loader. I have a follow-on change (I69ca3d26fede0506a6353c077c69f735c8d84d28) to move disk-image-create to a regular python entry-point. Unfortunately, this has to move to work with setuptools. You'd think a symlink under diskimage_builder/[elements|lib] would work, but it doesn't. [1] this API handles stuff like getting files out of .zip archive modules, which we don't do. Essentially for us it's returning __file__. Change-Id: I5e3e3c97f385b1a4ff2031a161a55b231895df5b
56 lines
2.2 KiB
Bash
Executable File
56 lines
2.2 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
if [[ $DISTRO_NAME =~ (centos|fedora) ]]; then
|
|
# GENERAL WARNING : mixing packaged python libraries with
|
|
# pip-installed versions always creates issues. Upstream
|
|
# openstack-infra uses this a lot (especially devstack) but be
|
|
# warned: here be dragons :)
|
|
|
|
# Firstly we want to install the system packages. Otherwise later
|
|
# on somebody does a "yum install python-virtualenv" and goes and
|
|
# overwrites the pip installed version with the packaged version,
|
|
# leading to all sorts of weird version issues.
|
|
${YUM:-yum} install -y python-virtualenv python-pip python-setuptools
|
|
|
|
# install pip; this overwrites packaged pip
|
|
python /tmp/get-pip.py
|
|
|
|
# pip and setuptools are closely related; we want to ensure the
|
|
# latest for sanity. Because distro packages don't include enough
|
|
# info in the egg for pip to be certain it has fully uninstalled
|
|
# the old package, for safety we clear it out by hand (this seems
|
|
# to have been a problem with very old to new updates,
|
|
# e.g. centos6 to current-era, but less so for smaller jumps).
|
|
# There is a bit of chicken-and-egg problem with pip in that it
|
|
# requires setuptools for some operations, such as wheel creation.
|
|
# But just installing setuptools shouldn't require setuptools
|
|
# itself, so we are safe for this small section.
|
|
rm -rf /usr/lib/python2.7/site-packages/setuptools*
|
|
pip install -U setuptools
|
|
|
|
# now install latest virtualenv. it vendors stuff it needs so
|
|
# doesn't have issues with other system packages.
|
|
pip install -U virtualenv
|
|
|
|
# Add this to exclude so that we don't install a later package
|
|
# over it if it updates. Note that fedora-minimal, bootstrapped
|
|
# via yum, can have an old yum.conf around, so look for dnf first.
|
|
if [[ -f /etc/dnf/dnf.conf ]]; then
|
|
conf=/etc/dnf/dnf.conf
|
|
elif [[ -f /etc/yum.conf ]]; then
|
|
conf=/etc/yum.conf
|
|
else
|
|
die "No conf to modify?"
|
|
fi
|
|
echo "exclude=python-virtualenv,python-pip,python-setuptools" >> ${conf}
|
|
else
|
|
python /tmp/get-pip.py
|
|
pip install virtualenv
|
|
fi
|