Update poetry to 2.2.0 + related updates (#25526)

* python-dulwich: Update to 0.24.1 * python-findpython: Update to 0.7.0 * python-poetry-core: Update to 2.2.0 * python-poetry: Update to 2.2.0
2025-09-14 17:10:54 +02:00 · 2025-09-14 17:10:54 +02:00 · 94cbed11ea
commit 94cbed11ea
parent 99c259c092
5 changed files with 29 additions and 45 deletions
--- a/mingw-w64-python-dulwich/PKGBUILD
+++ b/mingw-w64-python-dulwich/PKGBUILD
@ -3,7 +3,7 @@
 _realname=dulwich
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=0.22.8
+pkgver=0.24.1
 pkgrel=1
 pkgdesc="Python Git Library (mingw-w64)"
 arch=('any')
@ -25,26 +25,26 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
             "${MINGW_PACKAGE_PREFIX}-cc")
 options=('!strip')
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('701547310415de300269331abe29cb5717aa1ea377af826bf513d0adfb1c209b')
+sha256sums=('e19fd864f10f02bb834bb86167d92dcca1c228451b04458761fc13dabd447758')

 build() {
  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}"
-  ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation
+  python -m build --wheel --skip-dependency-check --no-isolation
 }

 check() {
-  cd "${srcdir}/python-build-${MSYSTEM}"
+  cd "python-build-${MSYSTEM}"

-  "${MINGW_PREFIX}"/bin/python -m pytest
+  python -m pytest
 }

 _opt="$(shopt -p extglob)"
 shopt -s extglob
 package() {
-  cd "${srcdir}/python-build-${MSYSTEM}"
+  cd "python-build-${MSYSTEM}"

  MSYS2_ARG_CONV_EXCL="--prefix=" \
-    ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \
+    python -m installer --prefix=${MINGW_PREFIX} \
    --destdir="${pkgdir}" dist/*.whl

  local _opt="$(shopt -p extglob)"
--- a/mingw-w64-python-findpython/PKGBUILD
+++ b/mingw-w64-python-findpython/PKGBUILD
@ -3,36 +3,38 @@
 _realname=findpython
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc='A utility to find python versions on your system (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/frostming/findpython'
+msys2_repository_url="https://github.com/frostming/findpython"
 msys2_references=(
  'purl: pkg:pypi/findpython'
 )
 license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
-         "${MINGW_PACKAGE_PREFIX}-python-packaging")
+         "${MINGW_PACKAGE_PREFIX}-python-packaging"
+         "${MINGW_PACKAGE_PREFIX}-python-platformdirs")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
             "${MINGW_PACKAGE_PREFIX}-python-installer"
             "${MINGW_PACKAGE_PREFIX}-python-pdm-backend")
 options=('!strip')
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('5863ea55556d8aadc693481a14ac4f3624952719efc1c5591abb0b4a9e965c94')
+sha256sums=('8b31647c76352779a3c1a0806699b68e6a7bdc0b5c2ddd9af2a07a0d40c673dc')

 build() {
  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}"

-  ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation
+  python -m build --wheel --skip-dependency-check --no-isolation
 }

 package() {
-  cd "${srcdir}/python-build-${MSYSTEM}"
+  cd "python-build-${MSYSTEM}"

  MSYS2_ARG_CONV_EXCL="--prefix=" \
-    ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \
+    python -m installer --prefix=${MINGW_PREFIX} \
    --destdir="${pkgdir}" dist/*.whl

  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
--- a/mingw-w64-python-poetry-core/PKGBUILD
+++ b/mingw-w64-python-poetry-core/PKGBUILD
@ -3,12 +3,13 @@
 _realname=poetry-core
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=2.1.3
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="Poetry PEP 517 Build Backend (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/python-poetry/poetry-core"
+msys2_repository_url="https://github.com/python-poetry/poetry-core"
 msys2_references=(
  'purl: pkg:pypi/poetry-core'
 )
@ -19,25 +20,25 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-mock"
              "${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname/-/_}-${pkgver}.tar.gz")
-sha256sums=('0522a015477ed622c89aad56a477a57813cace0c8e7ff2a2906b7ef4a2e296a4')
+sha256sums=('b4033b71b99717a942030e074fec7e3082e5fde7a8ed10f02cd2413bdf940b1f')

 build() {
  cp -r "${_realname/-/_}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}"

-  ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation
+  python -m build --wheel --skip-dependency-check --no-isolation
 }

 check() {
-  cd "${srcdir}/python-build-${MSYSTEM}"
+  cd "python-build-${MSYSTEM}"

-  ${MINGW_PREFIX}/bin/python -m pytest || echo "test failed"
+  python -m pytest || echo "test failed"
 }

 package() {
-  cd "${srcdir}/python-build-${MSYSTEM}"
+  cd "python-build-${MSYSTEM}"

  MSYS2_ARG_CONV_EXCL="--prefix=" \
-    ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \
+    python -m installer --prefix=${MINGW_PREFIX} \
    --destdir="${pkgdir}" dist/*.whl

  install -D -m644 LICENSE "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-${_realname}/LICENSE
--- a/mingw-w64-python-poetry/0001-allow-virtualenv.patch
+++ b/mingw-w64-python-poetry/0001-allow-virtualenv.patch
@ -1,14 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 29f57e17ae9..1f135913510 100644
--- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -27,8 +27,7 @@ dependencies = [
-     "tomlkit (>=0.11.4,<1.0.0)",
-     # trove-classifiers uses calver, so version is unclamped
-     "trove-classifiers (>=2022.5.19)",
-    # upper pin as quickfix for https://github.com/python-poetry/poetry/issues/10490
-    "virtualenv (>=20.26.6,<20.33.0)",
-+    "virtualenv (>=20.26.6)",
-     "xattr (>=1.0.0,<2.0.0) ; sys_platform == 'darwin'",
-     "findpython (>=0.6.2,<0.7.0)",
-     "pbs-installer[download,install] (>=2025.1.6,<2026.0.0)",
--- a/mingw-w64-python-poetry/PKGBUILD
+++ b/mingw-w64-python-poetry/PKGBUILD
@ -3,7 +3,7 @@
 _realname=poetry
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=2.1.4
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="Python dependency management and packaging made easy (mingw-w64)"
 arch=('any')
@ -43,29 +43,24 @@ optdepends=(
  "${MINGW_PACKAGE_PREFIX}-python-poetry-plugin-shell: provides the shell command"
 )
 options=('!strip')
-source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz"
-        "0001-allow-virtualenv.patch")
-sha256sums=('bed4af5fc87fb145258ac5b1dae77de2cd7082ec494e3b2f66bca0f477cbfc5c'
-            '9becb9064e6e6667f8efeac2868f8895cb880220731a989544b21a8a7ad2d2e6')
+source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
+sha256sums=('c6bc7e9d2d5aad4f6818cc5eef1f85fcfb7ee49a1aab3b4ff66d0c6874e74769')

 prepare() {
  cd "${_realname}-${pkgver}"
  sed -e 's/\^/>=/g' -e 's/~=/>=/g' -i pyproject.toml
-
-  # https://github.com/python-poetry/poetry/pull/10506
-  patch -p1 -i "${srcdir}/0001-allow-virtualenv.patch"
 }

 build() {
  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}"
-  ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation
+  python -m build --wheel --skip-dependency-check --no-isolation
 }

 package() {
-  cd "${srcdir}/python-build-${MSYSTEM}"
+  cd "python-build-${MSYSTEM}"

  MSYS2_ARG_CONV_EXCL="--prefix=" \
-    ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \
+    python -m installer --prefix=${MINGW_PREFIX} \
    --destdir="${pkgdir}" dist/*.whl

  install -D -m644 LICENSE "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-${_realname}/LICENSE