From 93cbc9569a1cafd3b0b5741342e5a8cd9616a4df Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Wed, 18 Dec 2019 10:26:47 +0300 Subject: [PATCH] python-fixtures: Drop python2 package --- mingw-w64-python-fixtures/PKGBUILD | 89 +++++++----------------------- 1 file changed, 21 insertions(+), 68 deletions(-) diff --git a/mingw-w64-python-fixtures/PKGBUILD b/mingw-w64-python-fixtures/PKGBUILD index 0fee7731ee..2a2bd5260a 100644 --- a/mingw-w64-python-fixtures/PKGBUILD +++ b/mingw-w64-python-fixtures/PKGBUILD @@ -2,28 +2,21 @@ _realname=fixtures pkgbase=mingw-w64-python-${_realname} -pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") +pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=3.0.0 -pkgrel=3 +pkgrel=4 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" - "${MINGW_PACKAGE_PREFIX}-python2-pbr" - "${MINGW_PACKAGE_PREFIX}-python3-setuptools" - "${MINGW_PACKAGE_PREFIX}-python2-setuptools" - "${MINGW_PACKAGE_PREFIX}-python3-six" - "${MINGW_PACKAGE_PREFIX}-python2-six") +depends=("${MINGW_PACKAGE_PREFIX}-python3" + "${MINGW_PACKAGE_PREFIX}-python3-pbr" + "${MINGW_PACKAGE_PREFIX}-python3-six") +makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools") checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-subunit" - "${MINGW_PACKAGE_PREFIX}-python2-subunit" - "${MINGW_PACKAGE_PREFIX}-python3-mock" - "${MINGW_PACKAGE_PREFIX}-python2-mock") + "${MINGW_PACKAGE_PREFIX}-python3-mock") options=('staticlibs' 'strip' '!debug') -source=("https://pypi.io/packages/source/f/fixtures/fixtures-$pkgver.tar.gz") +source=("https://pypi.io/packages/source/f/fixtures/fixtures-${pkgver}.tar.gz") sha512sums=('e52ba864c42d15a8baa60583761006b2dd78e3cd5f3f043f5702346aef428b933d62e8fa5889b7cb4196e4072acc5df3b7ffa39702a1b782887bdc109299b695') # Helper macros to help make tasks easier # @@ -47,69 +40,29 @@ del_file_exists() { prepare() { cd "${srcdir}" - for builddir in python{2,3}-build-${CARCH}; do - rm -rf ${builddir} | true - cp -r "${_realname}-${pkgver}" "${builddir}" - done + rm -rf python-build-${CARCH} | true + cp -r "${_realname}-${pkgver}" "python-build-${CARCH}" + # Set version for setuptools_scm - export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver + export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver} } -# Note that build() is sometimes skipped because it's done in -# the packages setup.py install for simplicity if you can do so. -# but sometimes, you want to do a check before install which would -# also trigger the build. build() { - for pver in {2,3}; do - msg "Python ${pver} build for ${CARCH}" - cd "${srcdir}/python${pver}-build-${CARCH}" - ${MINGW_PREFIX}/bin/python${pver} setup.py build - done + msg "Python build for ${CARCH}" + cd "${srcdir}/python-build-${CARCH}" + ${MINGW_PREFIX}/bin/python setup.py build } # This doesn't seem to worky #check() { -# for pver in {2,3}; do -# msg "Python ${pver} test for ${CARCH}" -# cd "${srcdir}/python${pver}-build-${CARCH}" -# ${MINGW_PREFIX}/bin/python${pver} -m testtools.run fixtures.test_suite -# done +# msg "Python test for ${CARCH}" +# cd "${srcdir}/python-build-${CARCH}" +# ${MINGW_PREFIX}/bin/python -m testtools.run fixtures.test_suite #} -package_python3-fixtures() { - depends=("${MINGW_PACKAGE_PREFIX}-python3" - "${MINGW_PACKAGE_PREFIX}-python3-pbr" - "${MINGW_PACKAGE_PREFIX}-python3-six") - - cd "${srcdir}/python3-build-${CARCH}" +package() { + cd "${srcdir}/python-build-${CARCH}" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ - ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \ + ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \ --root="${pkgdir}" --optimize=1 --skip-build } - -package_python2-fixtures() { - depends=("${MINGW_PACKAGE_PREFIX}-python2" - "${MINGW_PACKAGE_PREFIX}-python2-pbr" - "${MINGW_PACKAGE_PREFIX}-python2-six") - - cd "${srcdir}/python2-build-${CARCH}" - MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ - ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \ - --root="${pkgdir}" --optimize=1 --skip-build -} - -package_mingw-w64-i686-python2-fixtures() { - package_python2-fixtures -} - -package_mingw-w64-i686-python3-fixtures() { - package_python3-fixtures -} - -package_mingw-w64-x86_64-python2-fixtures() { - package_python2-fixtures -} - -package_mingw-w64-x86_64-python3-fixtures() { - package_python3-fixtures -}