Merge branch 'master' into merge-branch

Change-Id: Ib3c4b0030c94459a8c2eca836a16e42edf1accd4

diskimage_builder/elements/gentoo/finalise.d/99-cleanup

@@ -18,11 +18,6 @@ emerge --verbose=n --depclean
 emaint all -f
 eselect news read all
 
-# clean up files that may have been changed during build
-shopt -s extglob
-rm -Rf /tmp/!(ccache|in_target*|profiledir*)
-shopt -u extglob
-
 rm -Rf /root/.ccache/* /usr/src/* /var/cache/edb/dep/* /var/cache/genkernel/* /var/empty/* /var/run/* /var/state/* /var/tmp/*
 rm -Rf /etc/*- /etc/*.old /etc/ssh/ssh_host_* /root/.*history /root/.lesshst /root/.ssh/known_hosts /root/.viminfo /usr/share/genkernel /usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz
 if [[ "${GENTOO_PORTAGE_CLEANUP}" != "False" ]]; then

diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip

@@ -6,7 +6,7 @@ fi
 set -eu
 set -o pipefail
 
-if [[ $DISTRO_NAME =~ (centos|fedora) ]]; then
+if [[ $DISTRO_NAME =~ (opensuse}fedora|centos|centos7|rhel|rhel7) ]]; 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
@@ -16,7 +16,11 @@ if [[ $DISTRO_NAME =~ (centos|fedora) ]]; then
     # 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
+    if [[ $DISTRO_NAME = opensuse ]]; then
+        zypper -n install python-virtualenv python-pip python-setuptools
+    else
+        ${YUM:-yum} install -y python-virtualenv python-pip python-setuptools
+    fi
 
     # install pip; this overwrites packaged pip
     /usr/local/bin/dib-python /tmp/get-pip.py
@@ -38,17 +42,28 @@ if [[ $DISTRO_NAME =~ (centos|fedora) ]]; then
     # 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
+    if [[ $DISTRO_NAME = opensuse ]]; then
-    # over it if it updates.  Note that fedora-minimal, bootstrapped
+        for pkg in virtualenv pip setuptools; do
-    # via yum, can have an old yum.conf around, so look for dnf first.
+            cat - >> /etc/zypp/locks <<EOF
-    if [[ -f /etc/dnf/dnf.conf ]]; then
+type: package
-        conf=/etc/dnf/dnf.conf
+match_type: glob
-    elif [[ -f /etc/yum.conf ]]; then
+case_sensitive: on
-        conf=/etc/yum.conf
+solvable_name: python-$pkg
+EOF
+        done
     else
-        die "No conf to modify?"
+        # 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}
     fi
-    echo "exclude=python-virtualenv,python-pip,python-setuptools" >> ${conf}
 else
     /usr/local/bin/dib-python /tmp/get-pip.py
     pip install virtualenv

diskimage_builder/elements/zypper-minimal/root.d/08-zypper-chroot

@@ -37,7 +37,7 @@ function cleanup() {
 trap cleanup EXIT
 
 ZYPPER_TARGET_OPTS="--non-interactive --gpg-auto-import-keys --root $TARGET_ROOT"
-ZYPPER_INSTALL_OPTS="--no-confirm --no-recommends"
+ZYPPER_INSTALL_OPTS="--no-recommends"
 
 for repo in ${ZYPPER_REPOS}; do
     reponame=repo-${repo%%=>*}

requirements.txt

@@ -6,4 +6,3 @@ pbr>=1.8 # Apache-2.0
 PyYAML>=3.10.0 # MIT
 flake8<2.6.0,>=2.5.4 # MIT
 six>=1.9.0 # MIT
-oslosphinx>=4.7.0 # Apache-2.0

setup.cfg

@@ -37,7 +37,8 @@ mapping_file = babel.cfg
 output_file = diskimage_builder/locale/diskimage_builder.pot
 
 [pbr]
-warnerrors = True
+# TODO(jaegerandi): Set to True once pbr 1.11.0 is out.
+warnerrors = False
 
 [update_catalog]
 domain = diskimage_builder

test-requirements.txt

@@ -7,7 +7,7 @@ oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 
 # Doc requirements
-sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
+sphinx>=1.5.1 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
 
 # releasenotes