From e0292a1f1327a4521ae5b6830bf01ff3a6a9cf81 Mon Sep 17 00:00:00 2001 From: Lucas de Ataides Date: Tue, 27 Jun 2023 15:59:37 -0300 Subject: [PATCH] Upversion python-heatclient to 3.2.0-2 As part of the STX-Openstack upversion to ANTELOPE, the python- heatclient is being upversioned to version 3.2.0-2, which is the latest supported on ANTELOPE [1]. All patches were updated in order to make the package buildable in the new version. This change also adds the sha256sum field to the downloader path, as it is being recommended to use it in the place of the md5sum. [1] https://releases.openstack.org/antelope/#antelope-python-heatclient Test Plan: PASS: Build the python-heatclient package Story: 2010715 Task: 48132 Change-Id: I974875e6fa37a54ad5a0398a0323ed414fea908a Signed-off-by: Lucas de Ataides --- .../debian/deb_patches/0001-Add-wheel-support.patch | 10 +++++----- ...kclient.patch => 0002-Remove-openstackclient.patch} | 8 ++++---- .../python-heatclient/debian/deb_patches/series | 2 +- .../openstack/python-heatclient/debian/meta_data.yaml | 9 +++++---- 4 files changed, 15 insertions(+), 14 deletions(-) rename upstream/openstack/python-heatclient/debian/deb_patches/{remove-openstackclient.patch => 0002-Remove-openstackclient.patch} (81%) diff --git a/upstream/openstack/python-heatclient/debian/deb_patches/0001-Add-wheel-support.patch b/upstream/openstack/python-heatclient/debian/deb_patches/0001-Add-wheel-support.patch index 96c844a5..be896eee 100644 --- a/upstream/openstack/python-heatclient/debian/deb_patches/0001-Add-wheel-support.patch +++ b/upstream/openstack/python-heatclient/debian/deb_patches/0001-Add-wheel-support.patch @@ -1,4 +1,4 @@ -From 9ea6b1a4d02e631efccdde8ed240dc79849159af Mon Sep 17 00:00:00 2001 +From 15f2ba6622dca7503ff0723d7e2b49897a079ea4 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Wed, 27 Oct 2021 12:29:52 +0000 Subject: [PATCH] Add wheel support @@ -12,10 +12,10 @@ Signed-off-by: Charles Short 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control -index f287c45..0598164 100644 +index 711e1d1..5994402 100644 --- a/debian/control +++ b/debian/control -@@ -75,3 +75,20 @@ Description: client library and CLI for OpenStack Heat - Python 3.x +@@ -73,3 +73,20 @@ Description: client library and CLI for OpenStack Heat - Python 3.x the OpenStack Heat API. . This package provides the Python 3.x module. @@ -35,7 +35,7 @@ index f287c45..0598164 100644 + heatclient module), and a command-line script (heat). Each implements 100% of + the OpenStack Heat API. + . -+ This package contains the Python wheel. ++ This package contains the Python wheel. diff --git a/debian/rules b/debian/rules index 70f505c..110310e 100755 --- a/debian/rules @@ -50,5 +50,5 @@ index 70f505c..110310e 100755 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages pkgos-dh_auto_test --no-py2 -- -2.30.2 +2.25.1 diff --git a/upstream/openstack/python-heatclient/debian/deb_patches/remove-openstackclient.patch b/upstream/openstack/python-heatclient/debian/deb_patches/0002-Remove-openstackclient.patch similarity index 81% rename from upstream/openstack/python-heatclient/debian/deb_patches/remove-openstackclient.patch rename to upstream/openstack/python-heatclient/debian/deb_patches/0002-Remove-openstackclient.patch index 39b1de7a..eb0c3cca 100644 --- a/upstream/openstack/python-heatclient/debian/deb_patches/remove-openstackclient.patch +++ b/upstream/openstack/python-heatclient/debian/deb_patches/0002-Remove-openstackclient.patch @@ -1,7 +1,7 @@ -From d02fa3227bbf56e4f30d2cf3a21dd5a1d915d96a Mon Sep 17 00:00:00 2001 +From dc1f8711b84ec57b7ef19e4529ddff94a111cf1e Mon Sep 17 00:00:00 2001 From: Charles Short Date: Mon, 29 Nov 2021 20:51:40 +0000 -Subject: [PATCH] Remove openstackcilent +Subject: [PATCH] Remove openstackclient Remove build-Depends-Indep for python-openstackclient as it is not being used and it is causing problems with the build-pkgs @@ -13,7 +13,7 @@ Signed-off-by: Charles Short 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control -index f287c45..5aeee36 100644 +index 5994402..f35e853 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,6 @@ Build-Depends-Indep: @@ -25,5 +25,5 @@ index f287c45..5aeee36 100644 python3-osc-lib, python3-oslo.i18n, -- -2.30.2 +2.25.1 diff --git a/upstream/openstack/python-heatclient/debian/deb_patches/series b/upstream/openstack/python-heatclient/debian/deb_patches/series index a754a1a2..2561909e 100644 --- a/upstream/openstack/python-heatclient/debian/deb_patches/series +++ b/upstream/openstack/python-heatclient/debian/deb_patches/series @@ -1,2 +1,2 @@ 0001-Add-wheel-support.patch -remove-openstackclient.patch +0002-Remove-openstackclient.patch diff --git a/upstream/openstack/python-heatclient/debian/meta_data.yaml b/upstream/openstack/python-heatclient/debian/meta_data.yaml index eb31ac67..1c1281a9 100644 --- a/upstream/openstack/python-heatclient/debian/meta_data.yaml +++ b/upstream/openstack/python-heatclient/debian/meta_data.yaml @@ -1,10 +1,11 @@ --- debname: python-heatclient -debver: 2.2.1-2 +debver: 3.2.0-2 dl_path: - name: python-heatclient-debian-2.2.1-2.tar.gz - url: https://salsa.debian.org/openstack-team/clients/python-heatclient/-/archive/debian/2.2.1-2/python-heatclient-debian-2.2.1-2.tar.gz - md5sum: 56685ca6ab5c8b055410d8c871a8801d + name: python-heatclient-debian-3.2.0-2.tar.gz + url: https://salsa.debian.org/openstack-team/clients/python-heatclient/-/archive/debian/3.2.0-2/python-heatclient-debian-3.2.0-2.tar.gz + md5sum: 857e06948b59dee6436bd789dbbba9ce + sha256sum: 5c355e161873c8030f781ce521745e12b4d939fb26a11b4eb0d9029e8aef8daf revision: dist: $STX_DIST GITREVCOUNT: