starlingx/openstack-armada-app
Code Issues Proposed changes

Upversion python-barbicanclient to v5.5.0-2

Browse Source 
As part of the STX-Openstack upversion to ANTELOPE, the python-
barbicanclient is being upversioned to version 5.5.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-barbicanclient

Test Plan:
PASS: Build the python-barbicanclient package

Story: 2010715
Task: 48129

Change-Id: I08d9d820ea4ab8d568fcd262a987bf8506c56840
Signed-off-by: Lucas de Ataides <lucas.deataidesbarreto@windriver.com>
This commit is contained in:
Lucas de Ataides 2023-06-27 16:09:18 -03:00
parent dd4f523403
commit e12da9db6d
5 changed files with 84 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
upstream/openstack/python-barbicanclient/debian/deb_patches/0001-Add-wheel-package.patch Normal file
View File

@ -0,0 +1,71 @@
From 36a10042663d219e57941c79904c973fc0cb6438 Mon Sep 17 00:00:00 2001
From: Lucas de Ataides <lucas.deataidesbarreto@windriver.com>
Date: Tue, 27 Jun 2023 09:22:03 -0300
Subject: [PATCH] Add wheel package
Add python3-barbicanclient-wheel.
This patch was ported from Charles Short <charles.short@windriver.com>
Signed-off-by: Lucas de Ataides <lucas.deataidesbarreto@windriver.com>
---
debian/changelog | 7 +++++++
debian/control | 13 +++++++++++++
debian/rules | 2 +-
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 7f3e7a9..20cc0ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,13 @@ python-barbicanclient (5.2.0-2) unstable; urgency=medium
* Uploading to unstable.
+python-barbicanclient (5.0.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/control, debian/rules: Add wheels support.
+
+ -- Chuck Short <charles.short@windriver.com> Sun, 03 Oct 2021 18:30:48 +0000
+
-- Thomas Goirand <zigo@debian.org> Wed, 29 Sep 2021 17:11:20 +0200
python-barbicanclient (5.2.0-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 3b0a473..3bb61d5 100644
--- a/debian/control
+++ b/debian/control
@@ -54,3 +54,16 @@ Description: OpenStack Key Management API client - Python 3.x
command-line script (barbican).
.
This package contains the Python 3.x module.
+
+Package: python3-barbicanclient-wheel
+Architecture: all
+Depends:
+ python3-wheels,
+ ${misc:Depends},
+ ${python3:Depends},
+Description: OpenStack Key Management API client - Python 3.x
+ This is a client for the Barbican Key Management API. This package includes a
+ Python library for accessing the API (the barbicanclient module), and a
+ command-line script (barbican).
+ .
+ This package contains the Python 3.x wheel.
diff --git a/debian/rules b/debian/rules
index f6b7783..978fde3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ override_dh_auto_build:
echo "Do nothing..."
override_dh_auto_install:
- pkgos-dh_auto_install --no-py2
+ pkgos-dh_auto_install --no-py2 --wheel
override_dh_auto_test:
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
--
2.25.1

12
upstream/openstack/python-barbicanclient/debian/deb_patches/remove-openstackclient.patch → upstream/openstack/python-barbicanclient/debian/deb_patches/0002-Remove-openstackclient.patch
View File

@ -1,4 +1,4 @@
From 599df369e9077f94a3dead25f0c3852222e13f0d Mon Sep 17 00:00:00 2001 From 00afa9f474cb665ad8399207731552914c6d78c2 Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com> From: Charles Short <charles.short@windriver.com>
Date: Mon, 29 Nov 2021 20:50:16 +0000 Date: Mon, 29 Nov 2021 20:50:16 +0000
Subject: [PATCH] Remove openstackclient Subject: [PATCH] Remove openstackclient
@ -13,17 +13,17 @@ Signed-off-by: Charles Short <charles.short@windriver.com>
1 file changed, 1 deletion(-) 1 file changed, 1 deletion(-)
diff --git a/debian/control b/debian/control diff --git a/debian/control b/debian/control
index 73963d9..467dee1 100644 index 3bb61d5..6e4d9f2 100644
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -19,7 +19,6 @@ Build-Depends-Indep: @@ -18,7 +18,6 @@ Build-Depends-Indep:
python3-fixtures,
python3-hacking, python3-hacking,
python3-keystoneauth1, python3-keystoneauth1 (>= 5.1.1),
python3-nose,
- python3-openstackclient, - python3-openstackclient,
python3-openstackdocstheme <!nodoc>, python3-openstackdocstheme <!nodoc>,
python3-oslo.config, python3-oslo.config,
python3-oslo.i18n, python3-oslo.i18n,
-- --
2.30.2 2.25.1

4
upstream/openstack/python-barbicanclient/debian/deb_patches/series
View File

@ -1,2 +1,2 @@
stx-add-wheel-support.patch 0001-Add-wheel-package.patch
remove-openstackclient.patch 0002-Remove-openstackclient.patch

46
upstream/openstack/python-barbicanclient/debian/deb_patches/stx-add-wheel-support.patch
View File

@ -1,46 +0,0 @@
diff -Nru python-barbicanclient-5.0.1/debian/changelog python-barbicanclient-5.0.1/debian/changelog
--- python-barbicanclient-5.0.1/debian/changelog 2020-10-16 08:42:06.000000000 +0000
+++ python-barbicanclient-5.0.1/debian/changelog 2021-10-03 18:30:48.000000000 +0000
@@ -1,3 +1,10 @@
+python-barbicanclient (5.0.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/control, debian/rules: Add wheels support.
+
+ -- Chuck Short <charles.short@windriver.com> Sun, 03 Oct 2021 18:30:48 +0000
+
python-barbicanclient (5.0.1-2) unstable; urgency=medium
* Uploading to unstable.
diff -Nru python-barbicanclient-5.0.1/debian/control python-barbicanclient-5.0.1/debian/control
--- python-barbicanclient-5.0.1/debian/control 2020-10-16 08:42:06.000000000 +0000
+++ python-barbicanclient-5.0.1/debian/control 2021-10-03 18:30:42.000000000 +0000
@@ -57,3 +57,16 @@
command-line script (barbican).
.
This package contains the Python 3.x module.
+
+Package: python3-barbicanclient-wheel
+Architecture: all
+Depends:
+ python3-wheels,
+ ${misc:Depends},
+ ${python3:Depends},
+Description: OpenStack Key Management API client - Python 3.x
+ This is a client for the Barbican Key Management API. This package includes a
+ Python library for accessing the API (the barbicanclient module), and a
+ command-line script (barbican).
+ .
+ This package contains the Python 3.x wheel.
diff -Nru python-barbicanclient-5.0.1/debian/rules python-barbicanclient-5.0.1/debian/rules
--- python-barbicanclient-5.0.1/debian/rules 2020-10-16 08:42:06.000000000 +0000
+++ python-barbicanclient-5.0.1/debian/rules 2021-10-03 18:29:57.000000000 +0000
@@ -12,7 +12,7 @@
echo "Do nothing..."
override_dh_auto_install:
- pkgos-dh_auto_install --no-py2
+ pkgos-dh_auto_install --no-py2 --wheel
override_dh_auto_test:
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))

9
upstream/openstack/python-barbicanclient/debian/meta_data.yaml
View File

@ -1,10 +1,11 @@
--- ---
debname: python-barbicanclient debname: python-barbicanclient
debver: 5.0.1-2 debver: 5.5.0-2
dl_path: dl_path:
name: python-barbicanclient-debian-5.0.1-2.tar.gz name: python-barbicanclient-debian-5.5.0-2.tar.gz
url: https://salsa.debian.org/openstack-team/clients/python-barbicanclient/-/archive/debian/5.0.1-2/python-barbicanclient-debian-5.0.1-2.tar.gz url: https://salsa.debian.org/openstack-team/clients/python-barbicanclient/-/archive/debian/5.5.0-2/python-barbicanclient-debian-5.5.0-2.tar.gz
md5sum: 80fe9db068b5ca8638f1ed63dbff7327 md5sum: d415f1dbff471156947483af70adc406
sha256sum: 03804c5307544b55597bb5522f562e9e2f82a21775268c4aaeb289b8028e261f
revision: revision:
dist: $STX_DIST dist: $STX_DIST
GITREVCOUNT: GITREVCOUNT: