diff --git a/mingw-w64-python2-pytest/PKGBUILD b/mingw-w64-python2-pytest/PKGBUILD index ea6e27ec46..1d07c72547 100644 --- a/mingw-w64-python2-pytest/PKGBUILD +++ b/mingw-w64-python2-pytest/PKGBUILD @@ -4,7 +4,7 @@ _realname=pytest pkgbase=mingw-w64-python2-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}") pkgver=4.6.4 -pkgrel=1 +pkgrel=2 pkgdesc='simple powerful testing with Python (mingw-w64)' url='https://pytest.org/' license=('MIT') @@ -16,12 +16,13 @@ depends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-python2-more-itertools>=4.0.0" "${MINGW_PACKAGE_PREFIX}-python2-pluggy>=0.7" "${MINGW_PACKAGE_PREFIX}-python2-py>=1.5.0" - "${MINGW_PACKAGE_PREFIX}-python2-setuptools") -makedepends=("${MINGW_PACKAGE_PREFIX}-python2-funcsigs" - "${MINGW_PACKAGE_PREFIX}-python2-pathlib2>=2.2.0" - "${MINGW_PACKAGE_PREFIX}-python2-setuptools-scm" - "${MINGW_PACKAGE_PREFIX}-python2-colorama" - "${MINGW_PACKAGE_PREFIX}-python2-six") + "${MINGW_PACKAGE_PREFIX}-python2-setuptools" + "${MINGW_PACKAGE_PREFIX}-python2-six" + "${MINGW_PACKAGE_PREFIX}-python2-colorama" + "${MINGW_PACKAGE_PREFIX}-python2-wcwidth" + "${MINGW_PACKAGE_PREFIX}-python2-funcsigs" + "${MINGW_PACKAGE_PREFIX}-python2-pathlib2>=2.2.0") +makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools-scm") checkdepends=("${MINGW_PACKAGE_PREFIX}-python2-hypothesis" "${MINGW_PACKAGE_PREFIX}-python2-mock" "${MINGW_PACKAGE_PREFIX}-python2-nose" @@ -52,7 +53,7 @@ build() { } check() { - cd "${srcdir}/python${pver}-build-${CARCH}" + cd "${srcdir}/python2-build-${CARCH}" # Python2: 13 failed, 2239 passed, 118 skipped, 12 xfailed, 1 warnings PYTHONPATH="$(pwd)/build/lib" \ ${MINGW_PREFIX}/bin/python2 src/pytest.py || warning "Test failed" diff --git a/mingw-w64-python3-pytest/PKGBUILD b/mingw-w64-python3-pytest/PKGBUILD index 9a1d10124b..d1dc002352 100644 --- a/mingw-w64-python3-pytest/PKGBUILD +++ b/mingw-w64-python3-pytest/PKGBUILD @@ -4,7 +4,7 @@ _realname=pytest pkgbase=mingw-w64-python3-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=5.0.1 -pkgrel=1 +pkgrel=2 pkgdesc='simple powerful testing with Python (mingw-w64)' url='https://pytest.org/' license=('MIT') @@ -16,10 +16,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-python3" "${MINGW_PACKAGE_PREFIX}-python3-more-itertools>=4.0.0" "${MINGW_PACKAGE_PREFIX}-python3-pluggy>=0.7" "${MINGW_PACKAGE_PREFIX}-python3-py>=1.5.0" - "${MINGW_PACKAGE_PREFIX}-python3-setuptools") -makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm" - "${MINGW_PACKAGE_PREFIX}-python3-colorama" - "${MINGW_PACKAGE_PREFIX}-python3-six") + "${MINGW_PACKAGE_PREFIX}-python3-setuptools" + "${MINGW_PACKAGE_PREFIX}-python3-six" + "${MINGW_PACKAGE_PREFIX}-python3-colorama" + "${MINGW_PACKAGE_PREFIX}-python3-wcwidth") +makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm") checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-hypothesis" "${MINGW_PACKAGE_PREFIX}-python3-mock" "${MINGW_PACKAGE_PREFIX}-python3-nose" @@ -51,8 +52,8 @@ build() { check() { cd "${srcdir}/python3-build-${CARCH}" - # Python3: 154 failed, 2152 passed, 64 skipped, 12 xfailed, 1 warnings - PYTHONPATH="$(pwd)/build/lib" \ + # Python3: 1 failed, 2361 passed, 88 skipped, 12 xfailed, 1 warnings + MSYSTEM= PYTHONPATH="$(pwd)/build/lib" \ ${MINGW_PREFIX}/bin/python3 src/pytest.py || warning "Test failed" }