From ff48bd108e440f6cffde99bf4d6c0c5d6394bd3e Mon Sep 17 00:00:00 2001
From: Mehdi Chinoune <mehdi.chinoune@hotmail.com>
Date: Thu, 16 Feb 2023 18:23:17 +0000
Subject: [PATCH] python-conan: update to 1.59.0

---
 ...ened-node-semver-version-requirement.patch |  2 +-
 mingw-w64-python-conan/PKGBUILD               | 60 +++++++++----------
 2 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/mingw-w64-python-conan/0001-Loosened-node-semver-version-requirement.patch b/mingw-w64-python-conan/0001-Loosened-node-semver-version-requirement.patch
index d5b5df184e..15fb3c78ab 100644
--- a/mingw-w64-python-conan/0001-Loosened-node-semver-version-requirement.patch
+++ b/mingw-w64-python-conan/0001-Loosened-node-semver-version-requirement.patch
@@ -17,7 +17,7 @@ index e433e5cf0..066eec440 100644
  six>=1.10.0,<=1.16.0
 -node-semver==0.6.1
 +node-semver>=0.6.1
- distro>=1.0.2, <=1.7.0; sys_platform == 'linux' or sys_platform == 'linux2'
+ distro>=1.0.2, <=1.8.0; sys_platform == 'linux' or sys_platform == 'linux2'
  pygments>=2.0, <3.0
  tqdm>=4.28.1, <5
 -- 
diff --git a/mingw-w64-python-conan/PKGBUILD b/mingw-w64-python-conan/PKGBUILD
index a924fe6501..b5ef1f375c 100755
--- a/mingw-w64-python-conan/PKGBUILD
+++ b/mingw-w64-python-conan/PKGBUILD
@@ -6,7 +6,7 @@ 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=1.58.0
+pkgver=1.59.0
 pkgrel=1
 pkgdesc="A distributed, open source, C/C++ package manager (mingw-w64)"
 arch=('any')
@@ -14,52 +14,46 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 license=('spdx:MIT')
 url="https://conan.io"
 depends=("${MINGW_PACKAGE_PREFIX}-python"
-         "${MINGW_PACKAGE_PREFIX}-python-pyjwt>=1.4.0"
-         "${MINGW_PACKAGE_PREFIX}-python-requests>=2.25"
-         "${MINGW_PACKAGE_PREFIX}-python-urllib3>=1.26.6"
-         "${MINGW_PACKAGE_PREFIX}-python-colorama>=0.3.3"
-         "${MINGW_PACKAGE_PREFIX}-python-yaml>=3.11"
-         "${MINGW_PACKAGE_PREFIX}-python-patch-ng>=1.17.4"
-         "${MINGW_PACKAGE_PREFIX}-python-fasteners>=0.14.1"
-         "${MINGW_PACKAGE_PREFIX}-python-six>=1.10.0"
-         "${MINGW_PACKAGE_PREFIX}-python-node-semver>=0.6.1"
-         "${MINGW_PACKAGE_PREFIX}-python-distro>=1.0.2"
-         "${MINGW_PACKAGE_PREFIX}-python-pygments>=2.0"
-         "${MINGW_PACKAGE_PREFIX}-python-tqdm>=4.28.1"
-         "${MINGW_PACKAGE_PREFIX}-python-jinja>=3.0"
-         "${MINGW_PACKAGE_PREFIX}-python-dateutil>=2.7.0"
-         "${MINGW_PACKAGE_PREFIX}-python-bottle>=0.12.8"
-         "${MINGW_PACKAGE_PREFIX}-python-pluginbase>=0.5")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/conan-io/conan/archive/${pkgver}.tar.gz"
+         "${MINGW_PACKAGE_PREFIX}-python-requests"
+         "${MINGW_PACKAGE_PREFIX}-python-urllib3"
+         "${MINGW_PACKAGE_PREFIX}-python-colorama"
+         "${MINGW_PACKAGE_PREFIX}-python-yaml"
+         "${MINGW_PACKAGE_PREFIX}-python-patch-ng"
+         "${MINGW_PACKAGE_PREFIX}-python-fasteners"
+         "${MINGW_PACKAGE_PREFIX}-python-six"
+         "${MINGW_PACKAGE_PREFIX}-python-node-semver"
+         "${MINGW_PACKAGE_PREFIX}-python-pygments"
+         "${MINGW_PACKAGE_PREFIX}-python-tqdm"
+         "${MINGW_PACKAGE_PREFIX}-python-jinja"
+         "${MINGW_PACKAGE_PREFIX}-python-dateutil"
+         "${MINGW_PACKAGE_PREFIX}-python-bottle"
+         "${MINGW_PACKAGE_PREFIX}-python-pluginbase"
+         "${MINGW_PACKAGE_PREFIX}-python-pyjwt")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
+             "${MINGW_PACKAGE_PREFIX}-python-installer"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-wheel")
+source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz"
         "0001-Loosened-node-semver-version-requirement.patch")
-sha256sums=('f00f2a8bf727350e21d6d3fce559367538dd87b573296d075ae8fa81bbee6670'
-            'e45a784ccc7ed9fbc1f203b0cba1f3580e06120b2a2b6c45b9ad17dedb297a8c')
+sha256sums=('161c8f2d3193c209a1e9525fe7d6c600688da529a9864e6ef557133e93131952'
+            'bbfa828dbff47240be08d9444e5ed9909e1b7dfa989238604c7469b67fd6ac2b')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
-  # Apply patches
   patch -Nbp1 -i "${srcdir}/0001-Loosened-node-semver-version-requirement.patch"
 }
 
 build() {
-  msg "Python build for ${MSYSTEM}"
   cd "${srcdir}/${_realname}-${pkgver}"
-  ${MINGW_PREFIX}/bin/python setup.py build
+  ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation
 }
 
 package() {
   cd "${srcdir}/${_realname}-${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
-
-  # Remove build machine shebangs
-  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
-    sed -i 's/\#\!.*//' $_f
-  done
+  MSYS2_ARG_CONV_EXCL="--prefix=" \
+    ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \
+    --destdir="${pkgdir}" dist/*.whl
 
   install -Dm644 LICENSE.md "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
-  install -Dm644 contributors.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/contributors.txt"
 }