commit diskimage-builder for openSUSE:Factory

22 May 2019

Hello community,

here is the log from the commit of package diskimage-builder for openSUSE:Factory checked in at 2019-05-22 11:14:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/diskimage-builder (Old)
 and      /work/SRC/openSUSE:Factory/.diskimage-builder.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "diskimage-builder"

Wed May 22 11:14:31 2019 rev:24 rq:704183 version:2.22.0

Changes:
--------

--- /work/SRC/openSUSE:Factory/diskimage-builder/diskimage-builder.changes	2019-04-14 12:23:18.639824675 +0200
+++ /work/SRC/openSUSE:Factory/.diskimage-builder.new.5148/diskimage-builder.changes	2019-05-22 11:14:42.454548428 +0200
@@ -1,0 +2,15 @@
+Wed May 15 23:41:19 UTC 2019 - Jonathan Harker <jharker@suse.com>
+
+- Upgrade to 2.22.0
+  * Only enable dbus-daemon for fedora-29 and below
+  * Switch simple-init to support python3
+  * openssh-server: harden sshd config
+  * Support defining the free space in the image
+  * Allow specification of filesystem journal size
+  * Document the various global filesystem options
+  * Constraint networkx to <2.3 for Python 2
+  * Fix Fedora aarch64 image location
+  * debian-minimal buster support
+  * Also use selinuxenabled to check selinux status
+
+-------------------------------------------------------------------

Old:
----
  diskimage-builder-2.21.0.tar.gz

New:
----
  diskimage-builder-2.22.0.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ diskimage-builder.spec ++++++
--- /var/tmp/diff_new_pack.mXvCVO/_old	2019-05-22 11:14:44.430548064 +0200
+++ /var/tmp/diff_new_pack.mXvCVO/_new	2019-05-22 11:14:44.434548064 +0200
@@ -20,7 +20,7 @@
 # are only ever run inside the disk image build chroot).
 %global         __requires_exclude_from ^%{python3_sitelib}/diskimage_builder/elements/.*$
 Name:           diskimage-builder
-Version:        2.21.0
+Version:        2.22.0
 Release:        0
 Summary:        Image Building Tools for OpenStack
 License:        Apache-2.0

++++++ diskimage-builder-2.21.0.tar.gz -> diskimage-builder-2.22.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/AUTHORS new/diskimage-builder-2.22.0/AUTHORS
--- old/diskimage-builder-2.21.0/AUTHORS	2019-04-04 09:06:59.000000000 +0200
+++ new/diskimage-builder-2.22.0/AUTHORS	2019-05-07 11:00:12.000000000 +0200
@@ -70,6 +70,7 @@
 Erwan Velu <erwan@enovance.com>
 Ethan Gafford <egafford@redhat.com>
 Evgeny Antyshev <eantyshev@virtuozzo.com>
+Fatih Degirmenci <fdegir@gmail.com>
 Frederic Lepied <frederic.lepied@enovance.com>
 Gabriele Cerami <gcerami@redhat.com>
 Gary Duan <duanlg@live.cn>
@@ -171,6 +172,7 @@
 Om Kumar <om.kumar@hp.com>
 Ondřej Nový <ondrej.novy@firma.seznam.cz>
 Paul Belanger <pabelanger@redhat.com>
+Pedro Alvarez <pedro.alvarez@codethink.co.uk>
 Perry Myers <pmyers@redhat.com>
 Peter Stachowski <peter@tesora.com>
 Pierre Riteau <pierre@stackhpc.com>
@@ -200,9 +202,11 @@
 Sandhya Ganapathy <sandhya.ganapathy@hp.com>
 Sascha Peilicke <speilicke@suse.com>
 Saverio Proto <saverio.proto@switch.ch>
+Serena Ziviani <serena.ziviani@cern.ch>
 Shane Wang <shane.wang@intel.com>
 Shivanand Tendulker <stendulker@gmail.com>
 Simon Leinen <simon.leinen@gmail.com>
+Sorin Sbarnea <ssbarnea@redhat.com>
 Spencer Krum <nibz@spencerkrum.com>
 Stanislav Makar <stas.makar@gmail.com>
 Stephen Mulcahy <stephen.mulcahy@hp.com>
@@ -247,6 +251,7 @@
 Zhao Lei <zhaolei@cn.fujitsu.com>
 Zhiguo Deng <bjzgdeng@linux.vnet.ibm.com>
 aweiteka <aweiteka@redhat.com>
+caoyuan <cao.yuan@99cloud.net>
 chengebj5238 <chengebj@inspur.com>
 chenxiangui <chenxiangui@inspur.com>
 chenxing <chen.xing@99cloud.net>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/ChangeLog new/diskimage-builder-2.22.0/ChangeLog
--- old/diskimage-builder-2.21.0/ChangeLog	2019-04-04 09:06:59.000000000 +0200
+++ new/diskimage-builder-2.22.0/ChangeLog	2019-05-07 11:00:12.000000000 +0200
@@ -1,6 +1,20 @@
 CHANGES
 =======
 
+2.22.0
+------
+
+* Only enable dbus-daemon for fedora-29 and below
+* Switch simple-init to support python3
+* Fix broken requirements url
+* Replace git.openstack.org URLs with opendev.org URLs
+* Update to https:// version of \*openstack.org urls
+* OpenDev Migration Patch
+* Constraint networkx to <2.3 for Python 2
+* Fix Fedora aarch64 image location
+* debian-minimal buster support
+* Also use selinuxenabled to check selinux status
+
 2.21.0
 ------
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/PKG-INFO new/diskimage-builder-2.22.0/PKG-INFO
--- old/diskimage-builder-2.21.0/PKG-INFO	2019-04-04 09:07:00.000000000 +0200
+++ new/diskimage-builder-2.22.0/PKG-INFO	2019-05-07 11:00:13.000000000 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: diskimage-builder
-Version: 2.21.0
+Version: 2.22.0
 Summary: Golden Disk Image builder.
 Home-page: https://docs.openstack.org/diskimage-builder/latest/
 Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash new/diskimage-builder-2.22.0/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash
--- old/diskimage-builder-2.21.0/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash	2019-04-04 09:05:37.000000000 +0200
+++ new/diskimage-builder-2.22.0/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash	2019-05-07 10:59:26.000000000 +0200
@@ -16,7 +16,9 @@
 security:deb http://security.debian.org/ ${DIB_RELEASE}/updates ${DIB_DEBIAN_COMPONENTS_WS}
 "
 
-if [ "${DIB_RELEASE}" = "testing" -o "${DIB_RELEASE}" = "unstable" ]; then
+# NOTE(ianw): 2019-04 -- remove buster from here when released and it
+# has security/backports.
+if [ "${DIB_RELEASE}" = "testing" -o "${DIB_RELEASE}" = "unstable" -o "${DIB_RELEASE}" = "buster" ]; then
     DIB_APT_SOURCES_CONF_DEFAULT="default:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE} ${DIB_DEBIAN_COMPONENTS_WS}"
 fi
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/diskimage_builder/elements/debootstrap/root.d/08-debootstrap new/diskimage-builder-2.22.0/diskimage_builder/elements/debootstrap/root.d/08-debootstrap
--- old/diskimage-builder-2.21.0/diskimage_builder/elements/debootstrap/root.d/08-debootstrap	2019-04-04 09:05:37.000000000 +0200
+++ new/diskimage-builder-2.22.0/diskimage_builder/elements/debootstrap/root.d/08-debootstrap	2019-05-07 10:59:26.000000000 +0200
@@ -36,6 +36,13 @@
 
 DEBOOTSTRAP_QEMU=""
 
+_debootstrap_version=$(debootstrap --version)
+# could be like "debootstrap 1.0.114~bpo16.04+1"
+_debootstrap_version=${_debootstrap_version:16:3}
+if [[ "${DIB_RELEASE}" == "buster" && "${_debootstrap_version}" -lt 105 ]]; then
+    die "Unable to build buster with this debootstrap; see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901977"
+fi
+
 if [ -n "$DIB_OFFLINE" -o -n "${DIB_DEBIAN_USE_DEBOOTSTRAP_CACHE:-}" ] && [ -f $DEBOOTSTRAP_TARBALL ] ; then
     echo $DEBOOTSTRAP_TARBALL found in cache. Using.
     sudo tar -C $TARGET_ROOT --numeric-owner -xzf $DEBOOTSTRAP_TARBALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image new/diskimage-builder-2.22.0/diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image
--- old/diskimage-builder-2.21.0/diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image	2019-04-04 09:05:37.000000000 +0200
+++ new/diskimage-builder-2.22.0/diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image	2019-05-07 10:59:26.000000000 +0200
@@ -25,14 +25,14 @@
 else
     # note default DIB_RELEASE set in environment setup
     case ${ARCH} in
-    x86_64)
+    x86_64|aarch64)
         if [[ ${DIB_RELEASE} -ge 28 ]]; then
             DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-https://download.fedoraproject.org/pub/fedora/linux/releases/${DIB_RELEASE}/Cloud/${ARCH}/images}
         else
             DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-https://download.fedoraproject.org/pub/fedora/linux/releases/${DIB_RELEASE}/CloudImages/${ARCH}/images}
         fi
         ;;
-    aarch64|ppc64|ppc64le)
+    ppc64|ppc64le)
         if [[ ${DIB_RELEASE} -ge 28 ]]; then
             DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-https://dl.fedoraproject.org/pub/fedora-secondary/releases/${DIB_RELEASE}/Cloud/${ARCH}/images}
         else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/diskimage_builder/elements/ironic-agent/README.rst new/diskimage-builder-2.22.0/diskimage_builder/elements/ironic-agent/README.rst
--- old/diskimage-builder-2.21.0/diskimage_builder/elements/ironic-agent/README.rst	2019-04-04 09:05:37.000000000 +0200
+++ new/diskimage-builder-2.22.0/diskimage_builder/elements/ironic-agent/README.rst	2019-05-07 10:59:26.000000000 +0200
@@ -2,7 +2,7 @@
 ironic-agent
 ============
 Builds a ramdisk with ironic-python-agent.  More information can be found at:
-    https://git.openstack.org/cgit/openstack/ironic-python-agent/
+    https://opendev.org/openstack/ironic-python-agent/
 
 Beyond installing the ironic-python-agent, this element does the following:
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/diskimage_builder/elements/pypi/README.rst new/diskimage-builder-2.22.0/diskimage_builder/elements/pypi/README.rst
--- old/diskimage-builder-2.21.0/diskimage_builder/elements/pypi/README.rst	2019-04-04 09:05:37.000000000 +0200
+++ new/diskimage-builder-2.22.0/diskimage_builder/elements/pypi/README.rst	2019-05-07 10:59:26.000000000 +0200
@@ -35,7 +35,7 @@
 export DIB\_PYPI\_MIRROR\_URL\_2=file:///tmp/pypi
 export DIB\_PIP\_RETRIES=0
 
-[devpi-server](https://git.openstack.org/cgit/openstack-infra/pypi-mirro://pypi.python.org/...)
+[devpi-server](https://pypi.python.org/pypi/devpi-server)
 can be useful in making a partial PyPI mirror suitable for building images. For
 instance:
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/diskimage_builder/elements/rpm-distro/cleanup.d/99-selinux-fixfiles-restore new/diskimage-builder-2.22.0/diskimage_builder/elements/rpm-distro/cleanup.d/99-selinux-fixfiles-restore
--- old/diskimage-builder-2.21.0/diskimage_builder/elements/rpm-distro/cleanup.d/99-selinux-fixfiles-restore	2019-04-04 09:05:37.000000000 +0200
+++ new/diskimage-builder-2.22.0/diskimage_builder/elements/rpm-distro/cleanup.d/99-selinux-fixfiles-restore	2019-05-07 10:59:26.000000000 +0200
@@ -45,7 +45,7 @@
 # for whatever policy is in the host kernel.  We will run under
 # "runcon" to specifically allow this
 _runcon=""
-if [[ -d /sys/fs/selinux ]]; then
+if [[ -d /sys/fs/selinux ]] && selinuxenabled; then
     sudo semanage permissive -a setfiles_mac_t
     _runcon="runcon -t setfiles_mac_t -- "
 fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/diskimage_builder/elements/simple-init/install.d/simple-init-repo-install/40-glean new/diskimage-builder-2.22.0/diskimage_builder/elements/simple-init/install.d/simple-init-repo-install/40-glean
--- old/diskimage-builder-2.21.0/diskimage_builder/elements/simple-init/install.d/simple-init-repo-install/40-glean	2019-04-04 09:05:37.000000000 +0200
+++ new/diskimage-builder-2.22.0/diskimage_builder/elements/simple-init/install.d/simple-init-repo-install/40-glean	2019-05-07 10:59:26.000000000 +0200
@@ -21,4 +21,8 @@
 set -eu
 set -o pipefail
 
-pip install /tmp/glean.git
+if [ "$DIB_PYTHON_VERSION" == "3" ]; then
+    pip3 install /tmp/glean.git
+else
+    pip install /tmp/glean.git
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/diskimage_builder/elements/simple-init/install.d/simple-init-source-install/40-glean new/diskimage-builder-2.22.0/diskimage_builder/elements/simple-init/install.d/simple-init-source-install/40-glean
--- old/diskimage-builder-2.21.0/diskimage_builder/elements/simple-init/install.d/simple-init-source-install/40-glean	2019-04-04 09:05:37.000000000 +0200
+++ new/diskimage-builder-2.22.0/diskimage_builder/elements/simple-init/install.d/simple-init-source-install/40-glean	2019-05-07 10:59:26.000000000 +0200
@@ -21,4 +21,8 @@
 set -eu
 set -o pipefail
 
-pip install glean
+if [ "$DIB_PYTHON_VERSION" == "3" ]; then
+    pip3 install glean
+else
+    pip install glean
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/diskimage_builder/elements/yum-minimal/install.d/11-ensure-dbus-broker new/diskimage-builder-2.22.0/diskimage_builder/elements/yum-minimal/install.d/11-ensure-dbus-broker
--- old/diskimage-builder-2.21.0/diskimage_builder/elements/yum-minimal/install.d/11-ensure-dbus-broker	2019-04-04 09:05:37.000000000 +0200
+++ new/diskimage-builder-2.22.0/diskimage_builder/elements/yum-minimal/install.d/11-ensure-dbus-broker	1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2019 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-
-if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
-    set -x
-fi
-set -eu
-set -o pipefail
-
-# Ensure that dbus-broker is enabled; it seems that because of the
-# transition between dbus-daemon and dbus-broker (see
-# https://pagure.io/fesco/issue/1853) the .spec files could possibly
-# not enable this (likely related to ordering or something we do in
-# the non-standardish chroot building) and a 2019 system with no dbus
-# is very unhappy (networkmanager fails, etc).
-if [[ ${DISTRO_NAME} == 'fedora' && ${DIB_RELEASE} -ge 29 ]]; then
-    systemctl --no-reload enable dbus-broker.service
-fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/diskimage_builder/elements/yum-minimal/install.d/11-ensure-dbus-daemon new/diskimage-builder-2.22.0/diskimage_builder/elements/yum-minimal/install.d/11-ensure-dbus-daemon
--- old/diskimage-builder-2.21.0/diskimage_builder/elements/yum-minimal/install.d/11-ensure-dbus-daemon	1970-01-01 01:00:00.000000000 +0100
+++ new/diskimage-builder-2.22.0/diskimage_builder/elements/yum-minimal/install.d/11-ensure-dbus-daemon	2019-05-07 10:59:29.000000000 +0200
@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# Copyright 2019 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+
+if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
+    set -x
+fi
+set -eu
+set -o pipefail
+
+# Ensure that dbus-daemon is enabled; fedora 30 and above has switched to
+# dbus-broker.
+if [[ ${DISTRO_NAME} == 'fedora' && ${DIB_RELEASE} -le 29 ]]; then
+    systemctl --no-reload enable dbus-daemon.service
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot new/diskimage-builder-2.22.0/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot
--- old/diskimage-builder-2.21.0/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot	2019-04-04 09:05:37.000000000 +0200
+++ new/diskimage-builder-2.22.0/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot	2019-05-07 10:59:29.000000000 +0200
@@ -278,14 +278,6 @@
 #  https://bugzilla.redhat.com/show_bug.cgi?id=1398505
 _base_packages+="systemd-udev "
 
-# F29 moved to dbus-broker as the default, but dbus-daemon is
-# still available.  Explicitly pull it in; note we have an
-# install.d script to enable the service explicitly it as this
-# seems required.
-if [[ ${DISTRO_NAME} = fedora && ${DIB_RELEASE} -ge 29 ]]; then
-    _base_packages+="dbus-broker"
-fi
-
 # bootstrap the environment within the chroot; bring in new
 # metadata with an update and install some base packages we need.
 sudo -E chroot $TARGET_ROOT ${YUM} -y update
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/diskimage_builder.egg-info/PKG-INFO new/diskimage-builder-2.22.0/diskimage_builder.egg-info/PKG-INFO
--- old/diskimage-builder-2.21.0/diskimage_builder.egg-info/PKG-INFO	2019-04-04 09:06:59.000000000 +0200
+++ new/diskimage-builder-2.22.0/diskimage_builder.egg-info/PKG-INFO	2019-05-07 11:00:12.000000000 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: diskimage-builder
-Version: 2.21.0
+Version: 2.22.0
 Summary: Golden Disk Image builder.
 Home-page: https://docs.openstack.org/diskimage-builder/latest/
 Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/diskimage_builder.egg-info/SOURCES.txt new/diskimage-builder-2.22.0/diskimage_builder.egg-info/SOURCES.txt
--- old/diskimage-builder-2.21.0/diskimage_builder.egg-info/SOURCES.txt	2019-04-04 09:07:00.000000000 +0200
+++ new/diskimage-builder-2.22.0/diskimage_builder.egg-info/SOURCES.txt	2019-05-07 11:00:13.000000000 +0200
@@ -731,7 +731,7 @@
 diskimage_builder/elements/yum-minimal/pkg-map
 diskimage_builder/elements/yum-minimal/cleanup.d/95-remove-yum-mirror
 diskimage_builder/elements/yum-minimal/install.d/10-base-networking
-diskimage_builder/elements/yum-minimal/install.d/11-ensure-dbus-broker
+diskimage_builder/elements/yum-minimal/install.d/11-ensure-dbus-daemon
 diskimage_builder/elements/yum-minimal/pre-install.d/03-yum-cleanup
 diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot
 diskimage_builder/elements/yum/bin/install-packages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/diskimage_builder.egg-info/pbr.json new/diskimage-builder-2.22.0/diskimage_builder.egg-info/pbr.json
--- old/diskimage-builder-2.21.0/diskimage_builder.egg-info/pbr.json	2019-04-04 09:06:59.000000000 +0200
+++ new/diskimage-builder-2.22.0/diskimage_builder.egg-info/pbr.json	2019-05-07 11:00:12.000000000 +0200
@@ -1 +1 @@
-{"git_version": "36b4bc87", "is_release": true}
\ No newline at end of file
+{"git_version": "8c8b856c", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/diskimage_builder.egg-info/requires.txt new/diskimage-builder-2.22.0/diskimage_builder.egg-info/requires.txt
--- old/diskimage-builder-2.21.0/diskimage_builder.egg-info/requires.txt	2019-04-04 09:06:59.000000000 +0200
+++ new/diskimage-builder-2.22.0/diskimage_builder.egg-info/requires.txt	2019-05-07 11:00:12.000000000 +0200
@@ -1,7 +1,12 @@
 Babel!=2.4.0,>=2.3.4
-networkx>=1.10
 pbr!=2.1.0,>=2.0.0
 PyYAML>=3.12
 flake8<2.6.0,>=2.5.4
 six>=1.10.0
 stevedore>=1.20.0
+
+[:(python_version<'3.0')]
+networkx<2.3,>=1.10
+
+[:(python_version>='3.4')]
+networkx>=1.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/doc/source/index.rst new/diskimage-builder-2.22.0/doc/source/index.rst
--- old/diskimage-builder-2.21.0/doc/source/index.rst	2019-04-04 09:05:37.000000000 +0200
+++ new/diskimage-builder-2.22.0/doc/source/index.rst	2019-05-07 10:59:26.000000000 +0200
@@ -13,21 +13,21 @@
 
 ``diskimage-builder`` is used extensively by the `TripleO project
 <https://wiki.openstack.org/wiki/TripleO>`__ and within `OpenStack
-Infrastructure <http://docs.openstack.org/infra/system-config/>`__.
+Infrastructure <https://docs.openstack.org/infra/system-config/>`__.
 
 Code
 ----
 
 Release notes for the latest and previous versions are available at:
 
-* `http://docs.openstack.org/releasenotes/diskimage-builder/
-  <http://docs.openstack.org/releasenotes/diskimage-builder/>`__
+* `https://docs.openstack.org/releasenotes/diskimage-builder/
+  <https://docs.openstack.org/releasenotes/diskimage-builder/>`__
 
 
 The code is available at:
 
-* `https://git.openstack.org/cgit/openstack/diskimage-builder/
-  <https://git.openstack.org/cgit/openstack/diskimage-builder/>`__
+* `https://opendev.org/openstack/diskimage-builder/
+  <https://opendev.org/openstack/diskimage-builder/>`__
 
 
 Issues
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/requirements.txt new/diskimage-builder-2.22.0/requirements.txt
--- old/diskimage-builder-2.21.0/requirements.txt	2019-04-04 09:05:37.000000000 +0200
+++ new/diskimage-builder-2.22.0/requirements.txt	2019-05-07 10:59:26.000000000 +0200
@@ -2,7 +2,9 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 Babel!=2.4.0,>=2.3.4 # BSD
-networkx>=1.10 # BSD
+# NOTE(fdegir): NetworkX 2.3 dropped support for Python 2
+networkx>=1.10,<2.3;python_version<'3.0' # BSD
+networkx>=1.10;python_version>='3.4' # BSD
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 PyYAML>=3.12 # MIT
 flake8<2.6.0,>=2.5.4 # MIT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/roles/dib-functests/tasks/main.yaml new/diskimage-builder-2.22.0/roles/dib-functests/tasks/main.yaml
--- old/diskimage-builder-2.21.0/roles/dib-functests/tasks/main.yaml	2019-04-04 09:05:37.000000000 +0200
+++ new/diskimage-builder-2.22.0/roles/dib-functests/tasks/main.yaml	2019-05-07 10:59:26.000000000 +0200
@@ -13,7 +13,7 @@
 
 - name: Define upper_constraints
   set_fact:
-    upper_constraints: "{{ ansible_user_dir }}/{{ zuul.projects['git.openstack.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
+    upper_constraints: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
 
 - name: Take ourselves out of uppper constraints
   lineinfile:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.21.0/tox.ini new/diskimage-builder-2.22.0/tox.ini
--- old/diskimage-builder-2.21.0/tox.ini	2019-04-04 09:05:37.000000000 +0200
+++ new/diskimage-builder-2.22.0/tox.ini	2019-05-07 10:59:26.000000000 +0200
@@ -7,7 +7,7 @@
 usedevelop = True
 install_command = pip install {opts} {packages}
 deps=
-      -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+      -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
       -r{toxinidir}/requirements.txt
       -r{toxinidir}/test-requirements.txt
 commands=

    

root

tags

participants (1)