From 5ebb72bf41667c1193afad1de70a6d5014c19e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
 <miloskomarcevic@aim.com>
Date: Mon, 21 Feb 2022 18:12:15 +0100
Subject: [PATCH] python-colour-science: update to 0.4.0

---
 mingw-w64-python-colour-science/PKGBUILD | 53 +++++++++++++-----------
 mingw-w64-python-imageio/PKGBUILD        | 30 +++++++-------
 2 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/mingw-w64-python-colour-science/PKGBUILD b/mingw-w64-python-colour-science/PKGBUILD
index d84360ac19..a3bbf7ef8b 100644
--- a/mingw-w64-python-colour-science/PKGBUILD
+++ b/mingw-w64-python-colour-science/PKGBUILD
@@ -2,49 +2,52 @@
 # Contributor: Miloš Komarčević <miloskomarcevic@aim.com>
 
 _realname=colour-science
-_pypkgname=colour
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=0.3.16
-pkgrel=2
+pkgver=0.4.0
+pkgrel=1
 pkgdesc="Python library for a multitude of colour science applications (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
-url="https://pypi.python.org/pypi/colour-science"
+url='https://www.${_realname}.org'
 license=('BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-python-imageio"
+         "${MINGW_PACKAGE_PREFIX}-python-numpy"
          "${MINGW_PACKAGE_PREFIX}-python-scipy"
-         "${MINGW_PACKAGE_PREFIX}-python-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
-conflicts=("${MINGW_PACKAGE_PREFIX}-python-${_pypkgname}")
-options=('staticlibs' 'strip' '!debug')
-source=("${_pypkgname}-${pkgver}.tar.gz"::"https://github.com/colour-science/colour/archive/v${pkgver}.tar.gz")
-sha256sums=('66926ede9bc8180ba86b83b487c6d0a58e87646b3a4e53bb549a4eae7372d11e')
+         "${MINGW_PACKAGE_PREFIX}-python-typing_extensions")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
+             "${MINGW_PACKAGE_PREFIX}-python-installer"
+             "${MINGW_PACKAGE_PREFIX}-python-poetry-core")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-matplotlib"
+            "${MINGW_PACKAGE_PREFIX}-python-networkx"
+            "${MINGW_PACKAGE_PREFIX}-python-pandas"
+            "${MINGW_PACKAGE_PREFIX}-python-tqdm"
+            "${MINGW_PACKAGE_PREFIX}-python-trimesh")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python-${_realname//-science/}")
+source=("${_realname//-science/}-${pkgver}.tar.gz"::"https://github.com/${_realname}/${_realname//-science/}/archive/v${pkgver}.tar.gz"
+        "0001-poetry-core-build.patch"::"https://github.com/${_realname}/${_realname//-science/}/commit/1b5bd5ead7065d003b7aaba9bc35d23b79d9ea5c.diff")
+sha256sums=('fdd4dc66306f2930c542102de35236e9080e1b0c5dfc525ebed25e5e3919dc5a'
+            'e82b1118536e0feef4e81532efe70c0200ada23e3874c84a9ffff57b3e51bf17')
 
 prepare() {
-  cd "${srcdir}"
+  cd "${srcdir}/${_realname//-science/}-${pkgver}"
 
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_pypkgname}-${pkgver}" "python-build-${CARCH}"
+  patch -Np1 -i "${srcdir}/0001-poetry-core-build.patch"
 }
 
 build() {
-  msg "Python build for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python setup.py build
-}
+  cd "${srcdir}"
+  cp -r "${_realname//-science/}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}"
 
-check() {
-  msg "Python test for ${CARCH}"
-  cd "${srcdir}/python-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python setup.py check --strict
+  ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
-  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"
 }
diff --git a/mingw-w64-python-imageio/PKGBUILD b/mingw-w64-python-imageio/PKGBUILD
index c2bc6a5af2..be1071bbcc 100644
--- a/mingw-w64-python-imageio/PKGBUILD
+++ b/mingw-w64-python-imageio/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=imageio
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=2.15.0
+pkgver=2.16.0
 pkgrel=1
 pkgdesc="Python library for reading and writing a wide range of image, video, scientific, and volumetric data formats (mingw-w64)"
 arch=('any')
@@ -16,42 +16,40 @@ depends=("${MINGW_PACKAGE_PREFIX}-python-numpy"
 optdepends=("${MINGW_PACKAGE_PREFIX}-freeimage"
             "${MINGW_PACKAGE_PREFIX}-python-tifffile")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
-options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('760f383717204234f4527c682d91dfee9f34262d75bb0bbbf9a06668ff23f3ba')
+sha256sums=('0894d5320affaa9f1636009f731fcd8fc5ee4146c7d6836340d5eff17a7470e2')
 
 prepare() {
-  cd "${srcdir}"
-
-  rm -rf python-build-${MSYSTEM} || true
-  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
+  cd "${srcdir}/${_realname}-${pkgver}"
 }
 
 build() {
-  msg "Python build for ${MSYSTEM}"  
-  cd "${srcdir}/python-build-${MSYSTEM}"
-  ${MINGW_PREFIX}/bin/python setup.py build
+  cd "${srcdir}"
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}"
+
+  "${MINGW_PREFIX}"/bin/python setup.py build
 }
 
 check() {
-  msg "Python test for ${MSYSTEM}"
   cd "${srcdir}/python-build-${MSYSTEM}"
-  ${MINGW_PREFIX}/bin/python setup.py check --strict
+
+  "${MINGW_PREFIX}"/bin/python setup.py check --strict
 }
 
 package() {
   cd "${srcdir}/python-build-${MSYSTEM}"
+
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
+  "${MINGW_PREFIX}"/bin/python setup.py install --prefix="${MINGW_PREFIX}" \
     --root="${pkgdir}" --optimize=1 --skip-build
 
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 
-  # remove shebang line
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*-script.py; do
-    sed -e '1 { s/^#!.*$// }' -i ${_f}
+    # Remove shebang line
+    sed -e '1 { s/^#!.*$// }' -i "${_f}"
   done
 
   # remove utilities for downloading binary dependencies
-  rm -rf $pkgdir/${MINGW_PREFIX}/bin
+  rm -rf "$pkgdir${MINGW_PREFIX}"/bin
 }