Python (#1839)

* openjpeg 2.1.2 - rel. 2 - Disable JPIP because causing compilation failures -not sure why * Revert "openjpeg 2.1.2 - rel. 2 - Disable JPIP because causing compilation failures -not sure why" This reverts commit ea56c3cf07. * harfbuzz: Update to 1.3.2 * cppcheck: Update to 1.76 * libvirt: Update to 2.3.0 * libbluray: Update to 0.9.3 * libebml: Update to 1.3.4 * libmatroska: Update to 1.4.5 * libbluray: Place in proper folder * x264: Is git package. Update to r2721.72d53ab * l-smash: Rebuild * x265: Update to 2.1 * ffmpeg: Update to 3.1.4 * nspr: Update to 4.13 * Fix PKGBUILDs. Rebuild * gdl: Update to 3.22.0 * Python updates and additions PKGBUILD-templates - Update for new SF, add build, and make dirs for each py version and arch. python-distutils-extra - 2.39 - new package python-mock - 2.0 Update to altest version python-pbr: 1.10.0 - Update to latest version python-pgen2 - 0.1.0 - New package python-pip: rebuildm, fix issue with symlink, and rework slightly to match updated template python-pyparsing - 2.1.10 - Update to latest version python-pytest - 3.0.3 - Update to latest version python-setuptools - 28.6.0 - Update ot latest version python-cython - 0.24.1 - Update to latest version
2016-10-20 02:40:22 -04:00
parent 09fb769c25
commit e9395ba545
10 changed files with 258 additions and 58 deletions
--- a/mingw-w64-PKGBUILD-templates/PKGBUILD.setup-py-python-pkg
+++ b/mingw-w64-PKGBUILD-templates/PKGBUILD.setup-py-python-pkg
@@ -35,6 +35,18 @@ prepare() {
  done  
 }  
  
+# 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  
+}
+
 check() {  
  for pver in {2,3}; do  
    msg "Python ${pver} test for ${CARCH}"  
@@ -43,17 +55,21 @@ check() {
  done  
 }

-# Note that build() is sometimes skipped because it's done in 
-# the packages setup.py install for simplicity if you can do so.
 package_python3-somepackage() {
  depends=("${MINGW_PACKAGE_PREFIX}-python3")

  cd "${srcdir}/python3-build"
  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
-    --root="${pkgdir}" --optimize=1
+    --root="${pkgdir}" --optimize=1 --skip-build

  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+
+  local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
+  # fix python command in files
+  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
+    sed -e "s|${PREFIX_WIN}/bin/|/usr/bin/env |g" -i ${_f}
+  done
 }

 package_python2-somepackage() {
@@ -62,9 +78,15 @@ package_python2-somepackage() {
  cd "${srcdir}/python2-build"
  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
  ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \
-    --root="${pkgdir}" --optimize=1
+    --root="${pkgdir}" --optimize=1 --skip-build

  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/COPYING"
+
+  local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
+  # fix python command in files
+  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
+    sed -e "s|${PREFIX_WIN}/bin/|/usr/bin/env |g" -i ${_f}
+  done
 }

 package_mingw-w64-i686-python2-somepackage() {
--- a/mingw-w64-cython/PKGBUILD
+++ b/mingw-w64-cython/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=cython
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-cython" "${MINGW_PACKAGE_PREFIX}-cython2")
-pkgver=0.23.5
+pkgver=0.24.1
 pkgrel=1
 pkgdesc="C-Extensions for Python (mingw-w64)"
 arch=('any')
@@ -15,17 +15,22 @@ makedepends=(
            "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
            "${MINGW_PACKAGE_PREFIX}-gcc"
            )
-source=("http://cython.org/release/Cython-${pkgver}.tar.gz")
-sha256sums=('0ae5a5451a190e03ee36922c4189ca2c88d1df40a89b4f224bc842d388a0d1b6')
+_dtoken="97319581905de40f1be7015a0ea1bd336a756f6249914b148a17eefa75dc"
+source=("https://pypi.python.org/packages/c6/fe/${_dtoken}/Cython-${pkgver}.tar.gz")
+sha256sums=('84808fda00508757928e1feadcf41c9f78e9a9b7167b6649ab0933b76f75e7b9')

 prepare() {
-  cp -a ${_realname}-${pkgver} ${_realname}-py2-${pkgver}-${CARCH}
-  mv ${_realname}-${pkgver} ${_realname}-${pkgver}-${CARCH}
+  cd "$srcdir"/
+  for pver in {2,3}; do 
+    rm -rf python${pver}-build-${CARCH}| true
+    cp -r "${_realname}-${pkgver}" "python${pver}-build-${CARCH}"
+    sed -e "s|\/usr\/bin\/python|${MINGW_PREFIX}\/bin\/python${pver}|" -i python${pver}-build-${CARCH}/setup.py
+  done
 }

 package_cython() {
  depends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-  cd ${_realname}-${pkgver}-${CARCH}
+  cd "${srcdir}/python3-build-${CARCH}"
  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
  DISTUTILS_DEBUG=1 \
    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
@@ -38,7 +43,7 @@ package_cython() {

 package_cython2() {
  depends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools")
-  cd ${_realname}-py2-${pkgver}-${CARCH}
+  cd "${srcdir}/python2-build-${CARCH}"
  DISTUTILS_DEBUG=1 \
  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
    ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \
--- a/mingw-w64-python-distutils-extra/PKGBUILD
+++ b/mingw-w64-python-distutils-extra/PKGBUILD
@@ -0,0 +1,76 @@
+# Maintainer: Alexey Pavlov <alexpux@gmail.com>
+
+_realname=python-distutils-extra
+pkgname=("${MINGW_PACKAGE_PREFIX}-python3-distutils-extra" "${MINGW_PACKAGE_PREFIX}-python2-distutils-extra")
+pkgver=2.39
+pkgrel=1
+pkgdesc="Enhancements to the Python build system (mingw-w64)"
+arch=('any')
+license=('GPL')
+url="https://launchpad.net/python-distutils-extra"
+makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools" "${MINGW_PACKAGE_PREFIX}-python2-setuptools")
+source=("https://launchpad.net/${_realname}/trunk/$pkgver/+download/${_realname}-$pkgver.tar.gz"
+        "https://launchpad.net/${_realname}/trunk/$pkgver/+download/${_realname}-$pkgver.tar.gz.asc")
+validpgpkeys=("3DB46B55EFA59D40E6232148D14EF15DAFE11347") # Martin Pitt <martinpitt@gnome.org>
+md5sums=('16e06db0ef73a35b4bff4b9eed5699b5'
+         'SKIP')
+
+prepare() {
+  cd "$srcdir"/
+  for pver in {2,3}; do 
+    rm -rf python${pver}-build-${CARCH}| true
+    cp -r "${_realname}-${pkgver}" "python${pver}-build-${CARCH}"
+  done
+}
+
+build() {  
+  for pver in {2,3}; do  
+    msg "Python ${pver} build for ${CARCH}"  
+    cd "${srcdir}/python${pver}-build-${CARCH}"
+    MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+    ${MINGW_PREFIX}/bin/python${pver} setup.py build
+  done  
+}
+check() {  
+  for pver in {2,3}; do  
+    msg "Python ${pver} test for ${CARCH}"  
+    cd "${srcdir}/python${pver}-build-${CARCH}"
+    MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+    ${MINGW_PREFIX}/bin/python${pver} setup.py test
+  done  
+}
+
+package_python3-distutils-extra() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python3>=3.3" "intltool")
+
+  cd "${srcdir}/python3-build-${CARCH}"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python3 setup.py install --root="${pkgdir}" --skip-build
+}
+
+package_python2-distutils-extra() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python2>=2.7" "intltool")
+
+  cd "${srcdir}/python2-build-${CARCH}"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python2 setup.py install --root="${pkgdir}" --skip-build
+}
+
+
+# Wrappers
+package_mingw-w64-i686-python2-distutils-extra() {
+  package_python2-distutils-extra
+}
+
+package_mingw-w64-i686-python3-distutils-extra() {
+  package_python3-distutils-extra
+}
+
+package_mingw-w64-x86_64-python2-distutils-extra() {
+  package_python2-distutils-extra
+}
+
+package_mingw-w64-x86_64-python3-distutils-extra() {
+  package_python3-distutils-extra
+}
+
--- a/mingw-w64-python-mock/PKGBUILD
+++ b/mingw-w64-python-mock/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=mock
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=1.3.0
+pkgver=2.0.0
 pkgrel=1
 pkgdesc='Rolling backport of unittest.mock for all Pythons (mingw-w64)'
 arch=('any')
@@ -18,7 +18,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python3"
             "${MINGW_PACKAGE_PREFIX}-python3-pbr"
             "${MINGW_PACKAGE_PREFIX}-python2-pbr")
 source=("https://pypi.python.org/packages/source/m/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('1e247dbecc6ce057299eb7ee019ad68314bb93152e81d9a6110d35f4d5eca0f6')
+sha256sums=('b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba')
 noextract=(${_realname}-${pkgver}.tar.gz)

 prepare() {
--- a/mingw-w64-python-pbr/PKGBUILD
+++ b/mingw-w64-python-pbr/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=pbr
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=1.8.1
+pkgver=1.10.0
 pkgrel=1
 pkgdesc="Python Build Reasonableness (mingw-w64)"
 url="https://launchpad.net/pbr"
@@ -13,19 +13,22 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools"
             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
             "${MINGW_PACKAGE_PREFIX}-python2-six"
             "${MINGW_PACKAGE_PREFIX}-python3-six")
-source=("https://pypi.python.org/packages/source/p/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('e2127626a91e6c885db89668976db31020f0af2da728924b56480fc7ccf09649')
+_dtoken="63275fab26a0fd8cadafca71a3623e4d0f0ee8ed7124a5bb128853d178a7"
+source=("https://pypi.python.org/packages/c3/2c/${_dtoken}/${_realname}-${pkgver}.tar.gz")
+sha256sums=('186428c270309e6fdfe2d5ab0949ab21ae5f7dea831eab96701b86bd666af39c')

 prepare() {
  cd ${srcdir}
-  cp -r ${_realname}-${pkgver} build-python2
-  cp -r ${_realname}-${pkgver} build-python3
+  for pver in {2,3}; do 
+    rm -rf python${pver}-build-${CARCH}| true
+    cp -r "${_realname}-${pkgver}" "python${pver}-build-${CARCH}"
+  done
 }

 package_python3-pbr() {
  depends=("${MINGW_PACKAGE_PREFIX}-python3-six")

-  cd ${srcdir}/build-python3
+  cd ${srcdir}/python3-build-${CARCH}
  ${MINGW_PREFIX}/bin/python3 setup.py build
  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}"
@@ -42,7 +45,7 @@ package_python3-pbr() {
 package_python2-pbr() {
  depends=("${MINGW_PACKAGE_PREFIX}-python2-six")

-  cd ${srcdir}/build-python2
+  cd ${srcdir}/python2-build-${CARCH}
  ${MINGW_PREFIX}/bin/python2 setup.py build
  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
  ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}"
--- a/mingw-w64-python-pgen2/PKGBUILD
+++ b/mingw-w64-python-pgen2/PKGBUILD
@@ -0,0 +1,82 @@
+# Maintainer: J. Peter Mugaas <jpmugaas@suddenlink.net>
+#This value is here because some python package names have capital letters
+#while there is a strong preference for lowercase letters in ArchLinux and
+#MSYS packages.
+_pyname=pgen2
+_realname=pgen2
+pkgbase=mingw-w64-python-${_realname}
+pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"  "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Pure Python implementation of pgen, the Python parser generator (mingw-w64)"
+arch=('any')
+url='https://github.com/mythonlang/pgen2/'
+license=('MIT')
+makedepends=("${MINGW_PACKAGE_PREFIX}-python2"
+             "${MINGW_PACKAGE_PREFIX}-python3"
+             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python2-setuptools")
+options=('staticlibs' 'strip' '!debug')
+_dtoken="2f/95/c36839d594d4f58b17e01a8e6f661f96337b546b8e4fd281d166cb5dc22a"
+source=("https://pypi.python.org/packages/${_dtoken}/${_pyname}-${pkgver}.tar.gz")
+sha256sums=('a5057017c99eb45512f1cc772bae5953ed64104c1c705f0438aa00d06ee65804')
+
+prepare() {  
+  cd "$srcdir"/
+  for pver in {2,3}; do 
+    rm -rf python${pver}-build-${CARCH} | true
+    cp -r "${_pyname}-${pkgver}" "python${pver}-build-${CARCH}"
+  done  
+}
+  
+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  
+}
+  
+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 check -v -m
+  done  
+}
+
+# Note that build() is sometimes skipped because it's done in 
+# the packages setup.py install for simplicity if you can do so.
+package_python3-pgen2() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python3")
+
+  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
+}
+
+package_python2-pgen2() {
+  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
+}
+
+package_mingw-w64-i686-python2-pgen2() {
+  package_python2-pgen2
+}
+
+package_mingw-w64-i686-python3-pgen2() {
+  package_python3-pgen2
+}
+
+package_mingw-w64-x86_64-python2-pgen2() {
+  package_python2-pgen2
+}
+
+package_mingw-w64-x86_64-python3-pgen2() {
+  package_python3-pgen2
+}
--- a/mingw-w64-python-pip/PKGBUILD
+++ b/mingw-w64-python-pip/PKGBUILD
@@ -4,7 +4,7 @@ _realname=pip
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=8.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An easy_install replacement for installing pypi python packages (mingw-w64)"
 arch=('any')
 license=('MIT')
@@ -14,21 +14,28 @@ depends=("${MINGW_PACKAGE_PREFIX}-python2"
         "${MINGW_PACKAGE_PREFIX}-python3"
         "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/pypa/pip/archive/${pkgver}.tar.gz)
+noextract=(${_realname}-${pkgver}.tar.gz)
 sha256sums=('8dae1fb72e29c2b6ff6ed267861179216bf98d3bda6d30e527dbed0db5ac7e1d')

 prepare() {
-  cp -r ${_realname}-${pkgver} ${_realname}-python2
-  cp -r ${_realname}-${pkgver} ${_realname}-python3
+  cd "$srcdir"/
+
+# work around symlinks in pip package that can cause problems with some building
+# where dirs are not removed after being used.
+  rm -rf pip-8.1.2/tests/data/packages/symlinks/docs || true 2> /dev/nul
+  bsdtar zxf ${_realname}-${pkgver}.tar.gz || true
+  for pver in {2,3}; do 
+    rm -rf python${pver}-build-${CARCH}| true
+    cp -r "${_realname}-${pkgver}" "python${pver}-build-${CARCH}"
+  done
 }

 build() {
-  # Build python 3 module
-  cd "${srcdir}"/${_realname}-python3
-  ${MINGW_PREFIX}/bin/python3 setup.py build
-
-  # Build python 2 module
-  cd "${srcdir}"/${_realname}-python2
-  ${MINGW_PREFIX}/bin/python2 setup.py 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
 }

 package_python2-pip() {
@@ -36,7 +43,7 @@ package_python2-pip() {

  local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})

-  cd "${srcdir}/${_realname}-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

@@ -50,7 +57,7 @@ package_python3-pip() {

  local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})

-  cd "${srcdir}/${_realname}-python3"
+  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 -v

--- a/mingw-w64-python-pyparsing/PKGBUILD
+++ b/mingw-w64-python-pyparsing/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=pyparsing
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2.0.3
-pkgrel=2
+pkgver=2.1.10
+pkgrel=1
 pkgdesc='General parsing module for Python (mingw-w64)'
 arch=('any')
 url='http://pyparsing.wikispaces.com'
@@ -12,18 +12,20 @@ license=('MIT')
 makedepends=("${MINGW_PACKAGE_PREFIX}-python3"
             "${MINGW_PACKAGE_PREFIX}-python2")
 source=("https://downloads.sourceforge.net/pyparsing/pyparsing-${pkgver}.tar.gz")
-sha256sums=('06e729e1cbf5274703b1f47b6135ed8335999d547f9d8cf048b210fb8ebf844f')
+sha256sums=('811c3e7b0031021137fc83e051795025fcb98674d07eb8fe922ba4de53d39188')

 prepare() {
-  cd "${srcdir}"
-  cp -r pyparsing-${pkgver} python2-build
-  cp -r pyparsing-${pkgver} python3-build
+  cd "$srcdir"/
+  for pver in {2,3}; do 
+    rm -rf python${pver}-build-${CARCH} | true
+    cp -r "${_realname}-${pkgver}" "python${pver}-build-${CARCH}"
+  done  
 }

 package_python3-pyparsing() {
  depends=("${MINGW_PACKAGE_PREFIX}-python3")

-  cd ${srcdir}/python3-build
+  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
@@ -34,7 +36,7 @@ package_python3-pyparsing() {
 package_python2-pyparsing() {
  depends=("${MINGW_PACKAGE_PREFIX}-python2")

-  cd ${srcdir}/python2-build
+  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
--- a/mingw-w64-python-pytest/PKGBUILD
+++ b/mingw-w64-python-pytest/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=pytest
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2.9.1
+pkgver=3.0.3
 pkgrel=1
 pkgdesc='simple powerful testing with Python (mingw-w64)'
 url='http://pytest.org'
@@ -17,17 +17,20 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2"
             "${MINGW_PACKAGE_PREFIX}-python3-py"
             "${MINGW_PACKAGE_PREFIX}-python2-colorama"
             "${MINGW_PACKAGE_PREFIX}-python3-colorama")
-source=("https://pypi.python.org/packages/source/p/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('0d48d27a127644fbe7c8158157e08b35f8255045d4476df694b91eb3a8147e65')
+_dtoken="076c816e2402c4911ccee4b93ba0475145b7cffd0320ca8efa0add7c469c"
+source=("https://pypi.python.org/packages/a0/2f/${_dtoken}/${_realname}-${pkgver}.tar.gz")
+sha256sums=('f213500a356800a483e8a146ff971ae14a8df3f2c0ae4145181aad96996abee7')

 prepare() {
  cd ${srcdir}
-  cp -r ${_realname}-${pkgver} build-python2
-  cp -r ${_realname}-${pkgver} build-python3
+  for pver in {2,3}; do 
+    rm -rf python${pver}-build-${CARCH}| true
+    cp -r "${_realname}-${pkgver}" "python${pver}-build-${CARCH}"
+  done
 }

 package_python3-pytest() {
-  cd ${srcdir}/build-python3
+  cd ${srcdir}/python3-build-${CARCH}
  ${MINGW_PREFIX}/bin/python3 setup.py build
  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}"
@@ -42,7 +45,7 @@ package_python3-pytest() {
 }

 package_python2-pytest() {
-  cd ${srcdir}/build-python2
+  cd ${srcdir}/python2-build-${CARCH}
  ${MINGW_PREFIX}/bin/python2 setup.py build
  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
  ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}"
@@ -55,7 +58,7 @@ package_python2-pytest() {
    sed -e "s|${PREFIX_WIN}/bin/|/usr/bin/env |g" -i ${_f}
  done

-  for f in py.test; do
+  for f in {py.test,pytest}; do
    mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}.exe
    if [ -f "${pkgdir}${MINGW_PREFIX}"/bin/${f}.exe.manifest ]; then
      mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}.exe.manifest
--- a/mingw-w64-python-setuptools/PKGBUILD
+++ b/mingw-w64-python-setuptools/PKGBUILD
@@ -7,7 +7,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-setuptools" "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
 _py3_base=3.5
 _py2_base=2.7
-pkgver=27.3.0
+pkgver=28.6.0
 pkgrel=1
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages (mingw-w64)"
 arch=('any')
@@ -19,7 +19,7 @@ source=(${_realname}-${pkgver}.tar.gz::https://github.com/pypa/setuptools/archiv
        '0002-Allow-usr-bin-env-in-script.patch'
        '0003-MinGW-w64-Look-in-same-dir-as-script-for-exe.patch'
        '0004-dont-execute-msvc.patch')
-sha256sums=('c661d4061e2a6f71519237ba423ed461d210b8ca541e1bdd83048d38f97e5641'
+sha256sums=('72e0b0dc09e7968446920be7fb9609116c89d386d5d12640f36460c7d1f7cf17'
            'd3bc778723e63bbd6e43ab3536a015c547c8c20a95c6679a952284a7a4822996'
            '7bb5617c69566f5fbf1a3ee29a08179e1b41bdeabbc2998bf67615e9aa000424'
            '0e556505cb70ff3a5df856e352d5e2b3cf1582c25d02fc00a2d935a28576b28c'
@@ -43,26 +43,26 @@ prepare() {
  PATH=/mingw64/bin:$PATH gcc -DGUI=0           -O -s -o setuptools-${pkgver}/setuptools/cli-64.exe setuptools-${pkgver}/launcher.c
  PATH=/mingw64/bin:$PATH gcc -DGUI=1 -mwindows -O -s -o setuptools-${pkgver}/setuptools/gui-64.exe setuptools-${pkgver}/launcher.c

-  cp -r setuptools-${pkgver} setuptools-python2
-  cp -r setuptools-${pkgver} setuptools-python3
+  cp -r setuptools-${pkgver} setuptools-python2-${CARCH}
+  cp -r setuptools-${pkgver} setuptools-python3-${CARCH}

-  cd "${srcdir}"/setuptools-python2
+  cd "${srcdir}"/setuptools-python2-${CARCH}
  sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python2|" tests/manual_test.py
  sed -i -e "s|^#\!.*/usr/bin/env python|#!/usr/bin/env python2|" setuptools/command/easy_install.py

-  cd "${srcdir}"/setuptools-python3
+  cd "${srcdir}"/setuptools-python3-${CARCH}
  sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python3|" tests/manual_test.py
  sed -i -e "s|^#\!.*/usr/bin/env python|#!/usr/bin/env python3|" setuptools/command/easy_install.py
 }

 build() {
  # Build python 2 module
-  cd "${srcdir}"/setuptools-python2
+  cd "${srcdir}"/setuptools-python2-${CARCH}
  ${MINGW_PREFIX}/bin/python2 bootstrap.py
  ${MINGW_PREFIX}/bin/python2 setup.py build

  # Build python 3 module
-  cd "${srcdir}"/setuptools-python3
+  cd "${srcdir}"/setuptools-python3-${CARCH}
  ${MINGW_PREFIX}/bin/python3 bootstrap.py
  ${MINGW_PREFIX}/bin/python3 setup.py build
 }
@@ -72,7 +72,7 @@ package_python3-setuptools() {

  local _mingw_prefix=$(cygpath -wm ${MINGW_PREFIX})

-  cd "${srcdir}/setuptools-python3"
+  cd "${srcdir}/setuptools-python3-${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

@@ -91,7 +91,7 @@ package_python2-setuptools() {

  local _mingw_prefix=$(cygpath -wm ${MINGW_PREFIX})

-  cd "${srcdir}/setuptools-python2"
+  cd "${srcdir}/setuptools-python2-${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