From bf54d8edc82c6409acfbbde15aee3f5e83a202bf Mon Sep 17 00:00:00 2001 From: "J. Peter Mugaas" Date: Tue, 31 Jul 2018 06:11:55 -0400 Subject: [PATCH] Remove dpeendency upon tessttools to avoid a circular dependency. (#4131) --- mingw-w64-python-fixtures/PKGBUILD | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/mingw-w64-python-fixtures/PKGBUILD b/mingw-w64-python-fixtures/PKGBUILD index c08c0fffc9..721ae75756 100644 --- a/mingw-w64-python-fixtures/PKGBUILD +++ b/mingw-w64-python-fixtures/PKGBUILD @@ -4,11 +4,12 @@ _realname=fixtures pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Fixtures, reusable state for writing clean tests and more (mingw-w64)" arch=('any') url="https://launchpad.net/python-fixtures" license=('Apache') +# We must mingw-w64-python-testtools makedepends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-python3" "${MINGW_PACKAGE_PREFIX}-python3-pbr" @@ -16,9 +17,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-python3-setuptools" "${MINGW_PACKAGE_PREFIX}-python2-setuptools" "${MINGW_PACKAGE_PREFIX}-python3-six" - "${MINGW_PACKAGE_PREFIX}-python2-six" - "${MINGW_PACKAGE_PREFIX}-python3-testtools" - "${MINGW_PACKAGE_PREFIX}-python2-testtools") + "${MINGW_PACKAGE_PREFIX}-python2-six") checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-subunit" "${MINGW_PACKAGE_PREFIX}-python2-subunit" "${MINGW_PACKAGE_PREFIX}-python3-mock" @@ -80,8 +79,7 @@ build() { package_python3-fixtures() { depends=("${MINGW_PACKAGE_PREFIX}-python3" "${MINGW_PACKAGE_PREFIX}-python3-pbr" - "${MINGW_PACKAGE_PREFIX}-python3-six" - "${MINGW_PACKAGE_PREFIX}-python3-testtools") + "${MINGW_PACKAGE_PREFIX}-python3-six") cd "${srcdir}/python3-build-${CARCH}" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ @@ -92,8 +90,7 @@ package_python3-fixtures() { package_python2-fixtures() { depends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-python2-pbr" - "${MINGW_PACKAGE_PREFIX}-python2-six" - "${MINGW_PACKAGE_PREFIX}-python2-testtools") + "${MINGW_PACKAGE_PREFIX}-python2-six") cd "${srcdir}/python2-build-${CARCH}" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \