python-hacking: Drop Python 2 package

mati865 · Dec 1, 2019 · 07737f8 · 07737f8
1 parent 87ef5a3
commit 07737f8
Showing 1 changed file with 15 additions and 75 deletions.
diff --git a/mingw-w64-python-hacking/PKGBUILD b/mingw-w64-python-hacking/PKGBUILD
@@ -2,109 +2,49 @@
 
 _realname=hacking
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"  "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="OpenStack Hacking Guideline Enforcement (mingw-w64)"
 arch=('any')
 url='https://docs.openstack.org/developer/hacking'
 license=('Apache')
-makedepends=("${MINGW_PACKAGE_PREFIX}-python2"
-             "${MINGW_PACKAGE_PREFIX}-python3"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python2-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python3")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python3-pbr"
+             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/openstack-dev/hacking/archive/${pkgver}.tar.gz")
 sha512sums=('25e8fc8585b0de2c9f746a31539d2ee0b6b18685f17cac149bf8cf372d9c31d1f10ac93087d6bcc69b4d1a15b4b3c99cecbe15fe95e903c3de72aba21af32827')
 
-# Helper macros to help make tasks easier #
-apply_patch_with_msg() {
-  for _patch in "$@"
-  do
-    msg2 "Applying $_patch"
-    patch -Nbp1 -i "${srcdir}/$_patch"
-  done
-}
-
-del_file_exists() {
-  for _fname in "$@"
-  do
-    if [ -f $_fname ]; then
-      rm -rf $_fname
-    fi
-  done
-}
-# =========================================== #
-
 prepare() {
-  cd "${srcdir}"
+  cd "${srcdir}/${_realname}-${pkgver}"
 
-  sed -e 's/flake8<2.7.0,/flake8/' -e 's/==/>=/' -i hacking-$pkgver/requirements.txt  
+  sed -e 's/flake8<2.7.0,/flake8/' -e 's/==/>=/' -i requirements.txt
 
-  for builddir in python{2,3}-build-${CARCH}; do
-    rm -rf ${builddir} | true
-    cp -r "${_realname}-${pkgver}" "${builddir}"
-  done
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
   # set version for python-pbr
   export PBR_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  
+  cd "${srcdir}/${_realname}-${pkgver}"
+
+  ${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 testr || warning "Tests failed"
-  done
+  cd "${srcdir}/${_realname}-${pkgver}"
+
+  ${MINGW_PREFIX}/bin/python3 setup.py test || warning "Tests failed"
 }
 
-package_python3-hacking() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python3")
+package() {
+  cd "${srcdir}/${_realname}-${pkgver}"
 
-  cd "${srcdir}/python3-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
 }
-
-package_python2-hacking() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python2")
-
-  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-hacking() {
-  package_python2-hacking
-}
-
-package_mingw-w64-i686-python3-hacking() {
-  package_python3-hacking
-}
-
-package_mingw-w64-x86_64-python2-hacking() {
-  package_python2-hacking
-}
-
-package_mingw-w64-x86_64-python3-hacking() {
-  package_python3-hacking
-}