From 95dc30afaf181bbd8e412a6c8b583bdaf1c3c3ab Mon Sep 17 00:00:00 2001
From: Mehdi Chinoune <mehdi.chinoune@hotmail.com>
Date: Wed, 6 Sep 2023 06:10:46 +0000
Subject: [PATCH] python-oslo-log: update to 5.3.0

---
 mingw-w64-python-oslo-log/PKGBUILD | 44 ++++++++++++++++--------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/mingw-w64-python-oslo-log/PKGBUILD b/mingw-w64-python-oslo-log/PKGBUILD
index 346e29a456..7d505e7e78 100644
--- a/mingw-w64-python-oslo-log/PKGBUILD
+++ b/mingw-w64-python-oslo-log/PKGBUILD
@@ -1,17 +1,18 @@
 # Maintainer: J. Peter Mugaas <jpmugaas@suddenlink.net>
 
+_pyname=oslo.log
 _realname=oslo-log
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=5.2.0
-pkgrel=2
+pkgver=5.3.0
+pkgrel=1
 pkgdesc="Oslo Logging Library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
-url='https://pypi.python.org/pypi/oslo.log'
+url='https://docs.openstack.org/oslo.log/latest/'
 license=('spdx:Apache-2.0')
 depends=("${MINGW_PACKAGE_PREFIX}-python-pbr"
          "${MINGW_PACKAGE_PREFIX}-python-oslo-config"
@@ -21,42 +22,43 @@ depends=("${MINGW_PACKAGE_PREFIX}-python-pbr"
          "${MINGW_PACKAGE_PREFIX}-python-oslo-serialization"
          "${MINGW_PACKAGE_PREFIX}-python-debtcollector"
          "${MINGW_PACKAGE_PREFIX}-python-dateutil")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
+             "${MINGW_PACKAGE_PREFIX}-python-installer"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-wheel")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-oslotest")
-options=('staticlibs' 'strip' '!debug')
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/openstack/oslo.log/archive/${pkgver}.tar.gz")
-sha512sums=('3ba691acc7af5da7b34235b3f1d49f3e15d3136be929f4097fee0ad5d278cdcd62d5a14b591f613f58b56f521e3088bddda7c0485dbdd92b7f01db13778c3019')
+options=(!strip)
+source=("https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
+sha256sums=('cc94aabdb50e1e2571c6cbc4b399694a0541576735908a984a0223a9e1fbdb3e')
 
 prepare() {
   cd "${srcdir}/oslo.log-${pkgver}"
 
   sed -i 's/unittest2/unittest/g' oslo_log/tests/unit/*.py
 
-  # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
+  # Set version for pbr
   export PBR_VERSION=${pkgver}
+
+  cd "${srcdir}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_pyname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/oslo.log-${pkgver}"
-  ${MINGW_PREFIX}/bin/python setup.py build
+  cd "${srcdir}/python-build-${MSYSTEM}"
+  ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation
 }
 
 check() {
-  cd "${srcdir}/oslo.log-${pkgver}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   PYTHON=${MINGW_PREFIX}/bin/python ${MINGW_PREFIX}/bin/stestr run || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/oslo.log-${pkgver}"
-
-  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
-    --root="${pkgdir}" --optimize=1 --skip-build
+  cd "${srcdir}/python-build-${MSYSTEM}"
+  MSYS2_ARG_CONV_EXCL="--prefix=" \
+    ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \
+    --destdir="${pkgdir}" dist/*.whl
 
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
-
-  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*-script.py; do
-    sed -e '1 { s/^#!.*$// }' -i ${_f}
-  done
 }