From 5694d968d71e8322b9bfc91fb8d433161d191fd9 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Tue, 17 Dec 2019 13:36:29 +0300 Subject: [PATCH] python-py: Drop python2 package --- mingw-w64-python-py/PKGBUILD | 88 +++++++++--------------------------- 1 file changed, 22 insertions(+), 66 deletions(-) diff --git a/mingw-w64-python-py/PKGBUILD b/mingw-w64-python-py/PKGBUILD index 220032c43c..9ba1680144 100644 --- a/mingw-w64-python-py/PKGBUILD +++ b/mingw-w64-python-py/PKGBUILD @@ -2,25 +2,19 @@ _realname=py pkgbase=mingw-w64-python-${_realname} -pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") +pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.8.0 -pkgrel=2 +pkgrel=3 pkgdesc='library with cross-python path, ini-parsing, io, code, log facilities (mingw-w64)' arch=('any') url='https://pylib.readthedocs.io/' license=('MIT') -makedepends=("${MINGW_PACKAGE_PREFIX}-python2" - "${MINGW_PACKAGE_PREFIX}-python3" - "${MINGW_PACKAGE_PREFIX}-python2-setuptools" - "${MINGW_PACKAGE_PREFIX}-python3-setuptools" - "${MINGW_PACKAGE_PREFIX}-python2-setuptools-scm" - "${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm" - "${MINGW_PACKAGE_PREFIX}-python2-iniconfig" - "${MINGW_PACKAGE_PREFIX}-python3-iniconfig" - "${MINGW_PACKAGE_PREFIX}-python2-apipkg" - "${MINGW_PACKAGE_PREFIX}-python3-apipkg") -checkdepends=("${MINGW_PACKAGE_PREFIX}-python2-pytest" - "${MINGW_PACKAGE_PREFIX}-python3-pytest") +depends=("${MINGW_PACKAGE_PREFIX}-python3" + "${MINGW_PACKAGE_PREFIX}-python3-iniconfig" + "${MINGW_PACKAGE_PREFIX}-python3-apipkg") +makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools" + "${MINGW_PACKAGE_PREFIX}-python3-setuptools-scm") +checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest") options=('staticlibs' 'strip' '!debug') source=("${_realname}-${pkgver}.tar.gz::https://github.com/pytest-dev/py/archive/${pkgver}.tar.gz") sha256sums=('8c23b979a9823077d15d59f2d60bbc586abdecb1a4af6426fa42ccdb831dc213') @@ -30,38 +24,29 @@ prepare() { #work around tar issue with symlinks #tar xf ${_realname}-${pkgver}.tar.gz || true cp ${_realname}-${pkgver}/LICENSE ${_realname}-${pkgver}/py/LICENSE - rm -r py-$pkgver/py/_vendored_packages - rm -rf $builddir | true - for builddir in python{2,3}-build-${CARCH}; do - rm -rf ${builddir} | true - cp -r "${_realname}-${pkgver}" "${builddir}" - done + rm -r py-${pkgver}/py/_vendored_packages + + rm -rf python3-build-${CARCH} | true + cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}" + export LC_CTYPE=en_US.UTF-8 export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver} } -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 +build() { + msg "Python 3 build for ${CARCH}" + cd "${srcdir}/python3-build-${CARCH}" + ${MINGW_PREFIX}/bin/python3 setup.py build } -check() { - for pver in {2,3}; do - msg "Python ${pver} test for ${CARCH}" - cd "${srcdir}/python${pver}-build-${CARCH}" - ${MINGW_PREFIX}/bin/python${pver} setup.py pytest || warning "Tests failed" - done +check() { + msg "Python 3 test for ${CARCH}" + cd "${srcdir}/python3-build-${CARCH}" + ${MINGW_PREFIX}/bin/python3 setup.py pytest || warning "Tests failed" } -package_python3-py() { - depends=("${MINGW_PACKAGE_PREFIX}-python3" - "${MINGW_PACKAGE_PREFIX}-python3-iniconfig" - "${MINGW_PACKAGE_PREFIX}-python3-apipkg") - +package() { cd "${srcdir}/python3-build-${CARCH}" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \ @@ -69,32 +54,3 @@ package_python3-py() { install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE" } - -package_python2-py() { - depends=("${MINGW_PACKAGE_PREFIX}-python2" - "${MINGW_PACKAGE_PREFIX}-python2-iniconfig" - "${MINGW_PACKAGE_PREFIX}-python2-apipkg") - - 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 - - install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE" -} - -package_mingw-w64-i686-python2-py() { - package_python2-py -} - -package_mingw-w64-i686-python3-py() { - package_python3-py -} - -package_mingw-w64-x86_64-python2-py() { - package_python2-py -} - -package_mingw-w64-x86_64-python3-py() { - package_python3-py -}