diff --git a/mingw-w64-python-cvxopt/PKGBUILD b/mingw-w64-python-cvxopt/PKGBUILD index 80a6880cc6..7dfc12c3b1 100644 --- a/mingw-w64-python-cvxopt/PKGBUILD +++ b/mingw-w64-python-cvxopt/PKGBUILD @@ -6,29 +6,36 @@ 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.3.0 -pkgrel=5 +pkgver=1.3.1 +pkgrel=1 pkgdesc="Convex optimization based on the Python programming language (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://cvxopt.org/' license=('spdx:GPL-3.0-or-later') -validpgpkeys=('gpg_KEY') -makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-cc") +makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" + "${MINGW_PACKAGE_PREFIX}-python-installer" + "${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm" + "${MINGW_PACKAGE_PREFIX}-python-wheel" + "${MINGW_PACKAGE_PREFIX}-cc") depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-openblas" - $([[ ${MSYSTEM} == *32 ]] && echo "${MINGW_PACKAGE_PREFIX}-suitesparse5" || echo "${MINGW_PACKAGE_PREFIX}-suitesparse") + "${MINGW_PACKAGE_PREFIX}-suitesparse" "${MINGW_PACKAGE_PREFIX}-gsl" "${MINGW_PACKAGE_PREFIX}-fftw" "${MINGW_PACKAGE_PREFIX}-dsdp" "${MINGW_PACKAGE_PREFIX}-glpk") -source=("https://github.com/cvxopt/cvxopt/archive/${pkgver}.tar.gz") -sha256sums=('7aac94a116b7142a5f362e567c4b6c3b7c67b04b4a6a2a3c3b90b4c9f0ac74e1') +source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname/-/_}-${pkgver}.tar.gz") +sha256sums=('8d567981cbfa2a4ba1667b3e6f73cb941cf1c6992bf1438911035963294aa498') prepare() { cd "${srcdir}" - [[ -d "python-build-${MSYSTEM}" ]] && rm -rf "python-build-${MSYSTEM}" + rm -rf python-build-${MSYSTEM} | true cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" + + # Set version for setuptools_scm + export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver} } build() { @@ -50,20 +57,20 @@ build() { CVXOPT_DSDP_INC_DIR=${MINGW_PREFIX}/include/dsdp \ CVXOPT_SUITESPARSE_LIB_DIR=${MINGW_PREFIX}/lib \ CVXOPT_SUITESPARSE_INC_DIR=${MINGW_PREFIX}/include \ - ${MINGW_PREFIX}/bin/python3 setup.py build + ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation } check() { cd "${srcdir}/python-build-${MSYSTEM}" - ${MINGW_PREFIX}/bin/python setup.py check + ${MINGW_PREFIX}/bin/python -m pytest } 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} \ - --root="${pkgdir}" --optimize=1 --skip-build + 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}/COPYING" }