diffstat of debian/ for zvmcloudconnector_1.4.0-3 zvmcloudconnector_1.4.1-0ubuntu1 changelog | 34 ++++++++++------ control | 65 +++++++++++++++++--------------- copyright | 1 gbp.conf | 7 +++ python3-zvmcloudconnector.postrm | 13 ------ python3-zvmcloudconnector.prerm | 13 ------ rules | 28 ++++++++----- watch | 4 - zvmcloudconnector-api.prerm | 12 ++--- zvmcloudconnector-api.sdkserver.init.in | 2 zvmcloudconnector-common.postinst | 32 ++++++--------- 11 files changed, 104 insertions(+), 107 deletions(-) diff -Nru zvmcloudconnector-1.4.0/debian/changelog zvmcloudconnector-1.4.1/debian/changelog --- zvmcloudconnector-1.4.0/debian/changelog 2019-04-03 15:22:04.000000000 +0000 +++ zvmcloudconnector-1.4.1/debian/changelog 2019-03-20 12:06:27.000000000 +0000 @@ -1,24 +1,32 @@ -zvmcloudconnector (1.4.0-3) experimental; urgency=medium +zvmcloudconnector (1.4.1-0ubuntu1) disco; urgency=medium - * Correctly remove $(CURDIR)/debian/python3-zvmcloudconnector/lib, as the - .service file is in zvmcloudconnector-api (Closes: #926307). + * New upstream release for OpenStack Stein. - -- Thomas Goirand Wed, 03 Apr 2019 17:22:04 +0200 + -- Corey Bryant Wed, 20 Mar 2019 08:06:27 -0400 -zvmcloudconnector (1.4.0-2) experimental; urgency=medium +zvmcloudconnector (1.3.0-0ubuntu1) disco; urgency=medium - * Do not maintain alternatives. + * New upstream release for OpenStack Stein. + * d/control: Align (Build-)Depends with upstream. + * d/control,rules,python*,d/tests/*: Drop Python 2 support. - -- Thomas Goirand Thu, 28 Mar 2019 21:40:47 +0100 + -- Corey Bryant Tue, 20 Nov 2018 09:44:59 -0500 -zvmcloudconnector (1.4.0-1) experimental; urgency=medium +zvmcloudconnector (1.2.3-0ubuntu3) cosmic; urgency=medium - * New upstream release. + * d/python3-zvmcloudconnector.postinst: Update alternatives priorities to + give py3 priority if both py2/py3 packages are installed (LP: #1787640). - -- Thomas Goirand Wed, 27 Mar 2019 15:22:45 +0100 + -- Corey Bryant Thu, 30 Aug 2018 07:47:56 -0400 -zvmcloudconnector (1.2.3-1) unstable; urgency=medium +zvmcloudconnector (1.2.3-0ubuntu2) cosmic; urgency=medium - * Initial release. (Closes: #907016) + * d/rules: Run unit tests during build. - -- Thomas Goirand Thu, 23 Aug 2018 09:14:08 +0200 + -- Corey Bryant Fri, 17 Aug 2018 11:38:32 -0400 + +zvmcloudconnector (1.2.3-0ubuntu1) cosmic; urgency=low + + * Initial release. + + -- Corey Bryant Wed, 08 Aug 2018 15:00:08 -0400 diff -Nru zvmcloudconnector-1.4.0/debian/control zvmcloudconnector-1.4.1/debian/control --- zvmcloudconnector-1.4.0/debian/control 2019-04-03 15:22:04.000000000 +0000 +++ zvmcloudconnector-1.4.1/debian/control 2019-03-20 12:06:27.000000000 +0000 @@ -1,48 +1,43 @@ Source: zvmcloudconnector Section: python Priority: optional -Maintainer: Debian OpenStack -Uploaders: - Thomas Goirand , +Maintainer: Corey Bryant Build-Depends: debhelper (>= 10), dh-python, - openstack-pkg-tools, + openstack-pkg-tools (>= 85ubuntu3~), python-all, python-setuptools, python3-all, python3-setuptools, + python3-sphinx (>= 1.6.2), Build-Depends-Indep: - python3-jsonschema, - python3-jwt, - python3-mock, - python3-netaddr, - python3-requests, - python3-routes, - python3-six, + python3-jsonschema (>= 2.3.0), + python3-jwt (>= 1.0.1), + python3-mock (>= 2.0.0), + python3-netaddr (>= 0.7.5), + python3-requests (>= 2.6.0), + python3-routes (>= 2.2), + python3-six (>= 1.9.0), + python3-subunit (>= 1.0.0), python3-unittest2, - python3-webob, + python3-webob (>= 1:1.2.3), + python3-yaml (>= 3.10), subunit, testrepository, Standards-Version: 4.1.4 -Vcs-Browser: https://salsa.debian.org/openstack-team/libs/zvmcloudconnector -Vcs-Git: https://salsa.debian.org/openstack-team/libs/zvmcloudconnector.git +Vcs-Browser: https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/zvmcloudconnector +Vcs-Git: https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/zvmcloudconnector Homepage: https://github.com/mfcloud/python-zvm-sdk +Testsuite: autopkgtest-pkg-python -Package: python3-zvmcloudconnector +Package: zvmcloudconnector-api Architecture: all +Section: python Depends: - python3-jsonschema, - python3-jwt, - python3-netaddr, - python3-requests, - python3-routes, - python3-six, - python3-webob, - zvmcloudconnector-common (= ${source:Version}), + python3-zvmcloudconnector (= ${source:Version}), ${misc:Depends}, - ${python3:Depends}, -Description: z/VM Development SDK for managing z/VM - Python 3 +Description: z/VM Development SDK for managing z/VM - z/VM SDK API Server z/VM cloud connector is a development SDK for managing z/VM. It provides a set of APIs to operate z/VM including guest, image, network, volume etc. . @@ -50,14 +45,23 @@ connector (zVMCloudConnector) is for nova z/VM driver and other z/VM related openstack drivers such as neutron, ceilometer. . - This package contains the Python 3 module. + This package contains the z/VM SDK API Server. -Package: zvmcloudconnector-api +Package: python3-zvmcloudconnector Architecture: all Depends: - python3-zvmcloudconnector (= ${source:Version}), + zvmcloudconnector-common (= ${source:Version}), + python3-jsonschema (>= 2.3.0), + python3-jwt (>= 1.0.1), + python3-netaddr (>= 0.7.5), + python3-requests (>= 2.6.0), + python3-routes (>= 2.2), + python3-six (>= 1.9.0), + python3-webob (>= 1:1.2.3), + python3-yaml (>= 3.10), ${misc:Depends}, -Description: z/VM Development SDK for managing z/VM - z/VM SDK API Server + ${python3:Depends}, +Description: z/VM Development SDK for managing z/VM - Python 3 z/VM cloud connector is a development SDK for managing z/VM. It provides a set of APIs to operate z/VM including guest, image, network, volume etc. . @@ -65,10 +69,11 @@ connector (zVMCloudConnector) is for nova z/VM driver and other z/VM related openstack drivers such as neutron, ceilometer. . - This package contains the z/VM SDK API Server. + This package contains the Python 3 module. Package: zvmcloudconnector-common Architecture: all +Section: python Depends: adduser, ${misc:Depends}, diff -Nru zvmcloudconnector-1.4.0/debian/copyright zvmcloudconnector-1.4.1/debian/copyright --- zvmcloudconnector-1.4.0/debian/copyright 2019-04-03 15:22:04.000000000 +0000 +++ zvmcloudconnector-1.4.1/debian/copyright 2019-03-20 12:06:27.000000000 +0000 @@ -11,7 +11,6 @@ Files: debian/* Copyright: (c) 2018, Canonical Ltd. - (c) 2018, Thomas Goirand License: Apache-2 License: Apache-2 diff -Nru zvmcloudconnector-1.4.0/debian/gbp.conf zvmcloudconnector-1.4.1/debian/gbp.conf --- zvmcloudconnector-1.4.0/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ zvmcloudconnector-1.4.1/debian/gbp.conf 2019-03-20 12:06:27.000000000 +0000 @@ -0,0 +1,7 @@ +[DEFAULT] +debian-branch = master +upstream-tag = %(version)s +pristine-tar = True + +[buildpackage] +export-dir = ../build-area diff -Nru zvmcloudconnector-1.4.0/debian/python3-zvmcloudconnector.postrm zvmcloudconnector-1.4.1/debian/python3-zvmcloudconnector.postrm --- zvmcloudconnector-1.4.0/debian/python3-zvmcloudconnector.postrm 2019-04-03 15:22:04.000000000 +0000 +++ zvmcloudconnector-1.4.1/debian/python3-zvmcloudconnector.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then - update-alternatives --remove gen-token /usr/bin/python3-gen-token - update-alternatives --remove sdkserver /usr/bin/python3-sdkserver - update-alternatives --remove zvmsdk-wsgi /usr/bin/python3-zvmsdk-wsgi -fi - -#DEBHELPER# - -exit 0 diff -Nru zvmcloudconnector-1.4.0/debian/python3-zvmcloudconnector.prerm zvmcloudconnector-1.4.1/debian/python3-zvmcloudconnector.prerm --- zvmcloudconnector-1.4.0/debian/python3-zvmcloudconnector.prerm 2019-04-03 15:22:04.000000000 +0000 +++ zvmcloudconnector-1.4.1/debian/python3-zvmcloudconnector.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" ] ; then - update-alternatives --remove gen-token /usr/bin/python3-gen-token - update-alternatives --remove sdkserver /usr/bin/python3-sdkserver - update-alternatives --remove zvmsdk-wsgi /usr/bin/python3-zvmsdk-wsgi -fi - -#DEBHELPER# - -exit 0 diff -Nru zvmcloudconnector-1.4.0/debian/rules zvmcloudconnector-1.4.1/debian/rules --- zvmcloudconnector-1.4.0/debian/rules 2019-04-03 15:22:04.000000000 +0000 +++ zvmcloudconnector-1.4.1/debian/rules 2019-03-20 12:06:27.000000000 +0000 @@ -1,6 +1,7 @@ #!/usr/bin/make -f -UPSTREAM_GIT := https://github.com/mfcloud/python-zvm-sdk/ +PYTHON3S:=$(shell py3versions -vr) + include /usr/share/openstack-pkg-tools/pkgos.make %: @@ -10,11 +11,9 @@ pkgos-dh_auto_install --no-py2 rm -rf $(CURDIR)/debian/python3-zvmcloudconnector/etc rm -rf $(CURDIR)/debian/python3-zvmcloudconnector/usr/lib/systemd - rm -rf $(CURDIR)/debian/python3-zvmcloudconnector/lib rm -rf $(CURDIR)/debian/python3-zvmcloudconnector/var mv $(CURDIR)/doc/source/zvmsdk.conf.sample $(CURDIR)/debian/zvmcloudconnector-common/etc/zvmsdk/zvmsdk.conf - dh_install - dh_missing --fail-missing + dh_install --fail-missing override_dh_python3: dh_python3 --shebang=/usr/bin/python3 @@ -36,10 +35,19 @@ override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) - # NOTE(coreycb): Currently there are only unit tests for the smutLayer - # https://bugs.launchpad.net/bugs/1787611 - @echo "===> Disabled tests" -# set -e ; for pyvers in $(PYTHON3S); do \ -# PYTHONPATH=. PYTHON=python$$pyvers python$$pyvers -m unittest discover -v ; \ -# done + @echo "===> Running tests" + set -e ; for pyvers in $(PYTHON3S); do \ + PYTHONPATH=. PYTHON=python$$pyvers python$$pyvers -m unittest discover -v -s $(CURDIR)/zvmsdk/tests/unit; \ + PYTHONPATH=. PYTHON=python$$pyvers python$$pyvers -m unittest discover -v -s $(CURDIR)/smutLayer/tests/unit; \ + done endif + +# Commands not to run +override_dh_installcatalogs: +override_dh_installemacsen override_dh_installifupdown: +override_dh_installinfo override_dh_installmenu override_dh_installmime: +override_dh_installmodules override_dh_installlogcheck: +override_dh_installpam override_dh_installppp override_dh_installudev: +override_dh_installwm: +override_dh_installxfonts override_dh_gconf override_dh_icons: +override_dh_perl override_dh_usrlocal: diff -Nru zvmcloudconnector-1.4.0/debian/watch zvmcloudconnector-1.4.1/debian/watch --- zvmcloudconnector-1.4.0/debian/watch 2019-04-03 15:22:04.000000000 +0000 +++ zvmcloudconnector-1.4.1/debian/watch 2019-03-20 12:06:27.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -opts="uversionmangle=s/\.(b|rc)/~$1/" \ -https://github.com/zVMCloudConnector/zVMCloudConnector/tags .*/(\d[\d\.]+)\.tar\.gz +opts=uversionmangle=s/(rc|a|b|c)/~$1/ \ +https://pypi.debian.net/zVMCloudConnector/zVMCloudConnector-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff -Nru zvmcloudconnector-1.4.0/debian/zvmcloudconnector-api.prerm zvmcloudconnector-1.4.1/debian/zvmcloudconnector-api.prerm --- zvmcloudconnector-1.4.0/debian/zvmcloudconnector-api.prerm 2019-04-03 15:22:04.000000000 +0000 +++ zvmcloudconnector-1.4.1/debian/zvmcloudconnector-api.prerm 2019-03-20 12:06:27.000000000 +0000 @@ -3,13 +3,11 @@ set -e case $1 in -remove|purge) - if [ -x /etc/init.d/sdkserver ]; then - invoke-rc.d sdkserver stop || true - fi -;; + remove|purge) + if [ -x /etc/init.d/sdkserver ]; then + invoke-rc.d sdkserver stop || true + fi + ;; esac #DEBHELPER# - -exit 0 diff -Nru zvmcloudconnector-1.4.0/debian/zvmcloudconnector-api.sdkserver.init.in zvmcloudconnector-1.4.1/debian/zvmcloudconnector-api.sdkserver.init.in --- zvmcloudconnector-1.4.0/debian/zvmcloudconnector-api.sdkserver.init.in 2019-04-03 15:22:04.000000000 +0000 +++ zvmcloudconnector-1.4.1/debian/zvmcloudconnector-api.sdkserver.init.in 2019-03-20 12:06:27.000000000 +0000 @@ -12,6 +12,8 @@ ### END INIT INFO # Author: Corey Bryant + +PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="zVM SDK API Server" PROJECT_NAME=sdkserver NAME=${PROJECT_NAME} diff -Nru zvmcloudconnector-1.4.0/debian/zvmcloudconnector-common.postinst zvmcloudconnector-1.4.1/debian/zvmcloudconnector-common.postinst --- zvmcloudconnector-1.4.0/debian/zvmcloudconnector-common.postinst 2019-04-03 15:22:04.000000000 +0000 +++ zvmcloudconnector-1.4.1/debian/zvmcloudconnector-common.postinst 2019-03-20 12:06:27.000000000 +0000 @@ -1,22 +1,18 @@ -#!/bin/sh +#!/bin/sh -e -set -e +if [ "$1" = "configure" ]; then + if ! getent group zvmsdk > /dev/null 2>&1; then + addgroup --system zvmsdk >/dev/null + fi + + if ! getent passwd zvmsdk > /dev/null 2>&1; then + adduser --system --home /var/lib/zvmsdk --ingroup zvmsdk --no-create-home --shell /bin/false zvmsdk + fi + + chown -R root:zvmsdk /etc/zvmsdk + chown -R zvmsdk:zvmsdk /var/lib/zvmsdk + chown -R zvmsdk:adm /var/log/zvmsdk + chmod 0750 /var/lib/zvmsdk /var/log/zvmsdk /etc/zvmsdk -if [ "$1" = "configure" ] ; then - if ! getent group zvmsdk > /dev/null 2>&1; then - addgroup --system zvmsdk >/dev/null - fi - - if ! getent passwd zvmsdk > /dev/null 2>&1; then - adduser --system --home /var/lib/zvmsdk --ingroup zvmsdk --no-create-home --shell /bin/false zvmsdk - fi - - chown -R root:zvmsdk /etc/zvmsdk - chown -R zvmsdk:zvmsdk /var/lib/zvmsdk - chown -R zvmsdk:adm /var/log/zvmsdk - chmod 0750 /var/lib/zvmsdk /var/log/zvmsdk /etc/zvmsdk fi - #DEBHELPER# - -exit 0