python3: Update to 3.6.1 (#2587)

* python3: Update to 3.6.1

The patches starting with 16 are new to fix the build.
Some no longer relevant patches were dropped, the rest is just refreshed.

* Bump pkgrel of all packages containing Python 3 bytecode/extensions.

The package list was generated using:
    pkgfile.exe -R mingw64 -r "cpython.*\\.(py[cod]|dll)"

* lensfun: Add cmake to makedepends

* numpy: Don't hardcode the Python version

* blender: rebuild for new Python

* boost: Don't hardcode Python versions; rebuild

* pillow: Don't hardcode Python version; rebuild

* python-dateutil: Don't hardcode Python versions

* sip: Don't hardcode Python versions

* pyqt4: Don't hardcode Python versions; rebuild

* pyqt5: Don't hardcode Python versions; rebuild

* opencv: Update Python3 version in patch

mingw-w64-blender/0001-mingw-buildsystem.patch

@@ -178,7 +178,7 @@
 +
 +if(WITH_PYTHON)
 +	# normally cached but not since we include them with blender
-+	set(PYTHON_VERSION 3.5) #  CACHE STRING)
++	set(PYTHON_VERSION 3.6) #  CACHE STRING)
 +	set(PYTHON_INCLUDE_DIR "${LIBDIR}/include/python${PYTHON_VERSION}m")  # CACHE PATH)
 +	set(PYTHON_LIBRARY "${LIBDIR}/lib/libpython${PYTHON_VERSION}m.dll.a")  # CACHE FILEPATH)
 +	# uncached vars

mingw-w64-blender/0001-mingw-cmake.patch

@@ -33,7 +33,7 @@ diff -Naur blender-2.77a-orig/CMakeLists.txt blender-2.77a/CMakeLists.txt
 -
 +		if(MINGW)
 +			# normally cached but not since we include them with blender
-+			set(PYTHON_VERSION 3.5) #  CACHE STRING)
++			set(PYTHON_VERSION 3.6) #  CACHE STRING)
 +			set(PYTHON_INCLUDE_DIR "${LIBDIR}/include/python${PYTHON_VERSION}m")  # CACHE PATH)
 +			set(PYTHON_LIBRARY "${LIBDIR}/lib/libpython${PYTHON_VERSION}m.dll.a")  # CACHE FILEPATH)
 +			# uncached vars

mingw-w64-blender/PKGBUILD

@@ -6,7 +6,7 @@
 # set "PKG_CONFIG_PATH=%MINGW_PREFIX%/lib/pkgconfig"
 # set "PATH=%MINGW_PREFIX%/bin;%PATH%"
 # 2. Specify the following as the CMake arguments:
-# -DMINGW_LIBS=%MINGW_PREFIX% -DCMAKE_BUILD_TYPE=Debug -DWITH_SYSTEM_GLEW=ON -DWITH_SYSTEM_OPENJPEG=ON -DWITH_INSTALL_PORTABLE=OFF -DWITH_OPENCOLLADA=ON -DWITH_GAMEENGINE=ON -DWITH_RAYOPTIMIZATION=ON -DWITH_JACK=OFF -DWITH_PLAYER=ON -DWITH_CODEC_FFMPEG=ON -DWITH_CODEC_SNDFILE=ON -DWITH_CYCLES=ON -DWITH_CYCLES_CUDA_BINARIES=OFF -DWITH_CYCLES_OSL=ON -DWITH_FFTW3=ON -DWITH_MOD_OCEANSIM=ON -DPYTHON_VERSION=3.5 -DPYTHON_LIBPATH=%MINGW_PREFIX%/lib -DPYTHON_LIBRARY="python3.5m" -DPYTHON_INCLUDE_DIRS=/msys64/mingw64/include/python3.5m -DWITH_PYTHON_INSTALL=OFF -DWITH_PYTHON_INSTALL_NUMPY=OFF -DPYTHON_NUMPY_PATH=%MINGW_PREFIX%/lib/python3.5/site-packages -DCYCLES_OSL=%MINGW_PREFIX% -DWITH_IMAGE_REDCODE=ON -DWITH_OPENMP=ON -DWITH_LLVM=ON -DLLVM_STATIC=ON
+# -DMINGW_LIBS=%MINGW_PREFIX% -DCMAKE_BUILD_TYPE=Debug -DWITH_SYSTEM_GLEW=ON -DWITH_SYSTEM_OPENJPEG=ON -DWITH_INSTALL_PORTABLE=OFF -DWITH_OPENCOLLADA=ON -DWITH_GAMEENGINE=ON -DWITH_RAYOPTIMIZATION=ON -DWITH_JACK=OFF -DWITH_PLAYER=ON -DWITH_CODEC_FFMPEG=ON -DWITH_CODEC_SNDFILE=ON -DWITH_CYCLES=ON -DWITH_CYCLES_CUDA_BINARIES=OFF -DWITH_CYCLES_OSL=ON -DWITH_FFTW3=ON -DWITH_MOD_OCEANSIM=ON -DPYTHON_VERSION=3.6 -DPYTHON_LIBPATH=%MINGW_PREFIX%/lib -DPYTHON_LIBRARY="python3.6m" -DPYTHON_INCLUDE_DIRS=/msys64/mingw64/include/python3.6m -DWITH_PYTHON_INSTALL=OFF -DWITH_PYTHON_INSTALL_NUMPY=OFF -DPYTHON_NUMPY_PATH=%MINGW_PREFIX%/lib/python3.6/site-packages -DCYCLES_OSL=%MINGW_PREFIX% -DWITH_IMAGE_REDCODE=ON -DWITH_OPENMP=ON -DWITH_LLVM=ON -DLLVM_STATIC=ON
 
 _realname=blender
 pkgbase=mingw-w64-${_realname}
@@ -18,8 +18,7 @@ _minorchar=c
 } || {
   pkgver=${_basever}.${_minorchar}
 }
-_pyver=3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A fully integrated 3D graphics creation suite (mingw-w64)"
 arch=('any')
 license=('GPL')
@@ -66,7 +65,7 @@ source=(https://download.blender.org/source/${_realname}-${_basever}${_minorchar
         0012-re-enable-SSE-on-mingw-w64-i686.patch
         0013-provide-sprintf-for-comutil.patch)
 sha256sums=('64a98ff30300f79385ddb9ad016aa790a92720ff2feb84ddb1d097e6531dd338'
-            '92947c73e0582a42f0249f8c6e5730884f45dad15aa7804e73ba814be0e663dc'
+            'd58720f4b04835ae4b98b5b196f8ce4e90bd00cb955facc756cb48bd1574f3fd'
             'a84d7854fc1a00f4f0cfa1866cedb145a3489c8771df68dbda61d49fb4f0a795'
             '9ac81ace5d40a860ea6aa72d3212cc1b9096c350835d0ef8c81b8010fbb02a4c'
             '0cd0fb76502e8325db0400ab1845f91fd0525ff76a22294c3e8031314fb4430f'
@@ -120,6 +119,8 @@ build() {
     _btype=Release
   fi
 
+  _pyver=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -G"MSYS Makefiles" \

mingw-w64-boost/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.64.0
 _boostver=${pkgver//./_}
-pkgrel=1
+pkgrel=2
 pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)"
 arch=('any')
 url="https://www.boost.org/"
@@ -124,8 +124,11 @@ build() {
 
   cd "${srcdir}/build-${MINGW_CHOST}"
 
-  echo "using python : 2.7 : ${PREFIX_DEPS}/bin/python2.exe : ${PREFIX_DEPS}/include/python2.7 ;" >> ./tools/build/src/user-config.jam
-  echo "using python : 3.5 : ${PREFIX_DEPS}/bin/python3.exe : ${PREFIX_DEPS}/include/python3.5m : ${PREFIX_DEPS}/lib/python3.5/config-3.5m ;" >> ./tools/build/src/user-config.jam
+  _py2ver=$(${MINGW_PREFIX}/bin/python2 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+  _py3ver=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+
+  echo "using python : ${_py2ver} : ${PREFIX_DEPS}/bin/python2.exe : ${PREFIX_DEPS}/include/python${_py2ver} ;" >> ./tools/build/src/user-config.jam
+  echo "using python : ${_py3ver} : ${PREFIX_DEPS}/bin/python3.exe : ${PREFIX_DEPS}/include/python${_py3ver}m : ${PREFIX_DEPS}/lib/python${_py3ver}/config-${_py3ver}m ;" >> ./tools/build/src/user-config.jam
   #echo "using gcc : : ${PREFIX_DEPS}/bin/g++.exe : <rc>${PREFIX_DEPS}/bin/windres.exe ;" >> ./tools/build/src/user-config.jam
 
   ./bootstrap.sh --with-icu=${MINGW_PREFIX} --with-python=${MINGW_PREFIX} --with-toolset=gcc

mingw-w64-cython/PKGBUILD

@@ -5,7 +5,7 @@ _realname=cython
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-cython" "${MINGW_PACKAGE_PREFIX}-cython2")
 pkgver=0.25.2
-pkgrel=1
+pkgrel=2
 pkgdesc="C-Extensions for Python (mingw-w64)"
 arch=('any')
 url="http://www.cython.org"

mingw-w64-gst-python/PKGBUILD

@@ -4,7 +4,7 @@ _realname=gst-python
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GStreamer GObject Introspection overrides for Python 3 (mingw-w64)"
 arch=('any')
 license=('LGPL')

mingw-w64-lensfun/PKGBUILD

@@ -4,14 +4,15 @@ _realname=lensfun
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database (mingw-w64)"
 arch=('any')
 url="https://lensfun.sourceforge.io"
 license=("LGPL3")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-python3")
+             "${MINGW_PACKAGE_PREFIX}-python3"
+             "${MINGW_PACKAGE_PREFIX}-cmake")
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
          "${MINGW_PACKAGE_PREFIX}-libpng"
          "${MINGW_PACKAGE_PREFIX}-libsystre"

mingw-w64-meson/PKGBUILD

@@ -4,7 +4,7 @@ _realname=meson
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.40.1
-pkgrel=1
+pkgrel=2
 pkgdesc="High-productivity build system (mingw-w64)"
 arch=('any')
 url="http://mesonbuild.com/"

mingw-w64-miniupnpc/PKGBUILD

@@ -4,7 +4,7 @@ _realname=miniupnpc
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices (mingw-w64)"
 arch=('any')
 url="http://miniupnp.free.fr"

mingw-w64-opencv/0005-opencv-support-python-3.5.patch

@@ -5,7 +5,7 @@
      PYTHON2_NUMPY_INCLUDE_DIRS PYTHON2_NUMPY_VERSION)
  
 -find_python(3.4 "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR
-+find_python(3.5 "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR
++find_python(3.6 "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR
      PYTHON3INTERP_FOUND PYTHON3_EXECUTABLE PYTHON3_VERSION_STRING
      PYTHON3_VERSION_MAJOR PYTHON3_VERSION_MINOR PYTHON3LIBS_FOUND
      PYTHON3LIBS_VERSION_STRING PYTHON3_LIBRARIES PYTHON3_LIBRARY

mingw-w64-opencv/PKGBUILD

@@ -4,7 +4,7 @@ _realname=opencv
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.2.0
-pkgrel=5
+pkgrel=7
 pkgdesc="Open Source Computer Vision Library (mingw-w64)"
 arch=('any')
 url="http://opencv.org/"
@@ -55,7 +55,7 @@ sha256sums=('b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35'
             'fd4e095c3c879413184fc6b91a7b0a77dbb128612341a8be2c99d804a203e362'
             '52ebc8875b9ef3ea70897f34509228daeff73d0cab0aa9eb8b931be6a7d32d7f'
             '47447c78acc810cd0604b641644f1c546c29e925b7b9671a4fa18468ff3ad330'
-            'e50f69c6c1fbce255b3e7ef4b489bf1a01ba28cf828a6adb80c73a7f9c08a666'
+            '837e637d1040b6bc3427d650e26cf1abb0178b322f2fbb43ccb2d5506f7b1c58'
             '7d2ff25f97c84b59793502786dd64e25c8ca991b0523ffea56b45ce031e80c3f'
             'ba227bb88c7e6948c54c5a3c8347daf5e2c930e99fb155047015bc5cfa2b33e5'
             '434b3bb1f6fd3af31952de5c4af95eb726f4e45b077e98195f8c204732bc9754')

mingw-w64-pycairo/PKGBUILD

@@ -4,7 +4,7 @@ _realname=pycairo
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-cairo" "${MINGW_PACKAGE_PREFIX}-python3-cairo")
 pkgver=1.13.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings for the cairo graphics library (mingw-w64)"
 url="https://pycairo.readthedocs.io"
 arch=('any')

mingw-w64-pygobject/PKGBUILD

@@ -4,7 +4,7 @@ _realname=pygobject
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-gobject" "${MINGW_PACKAGE_PREFIX}-python3-gobject" "${MINGW_PACKAGE_PREFIX}-pygobject-devel")
 pkgver=3.24.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Allows you to load glade interface files in a program at runtime (mingw-w64)"
 arch=(any)
 url="http://www.pygtk.org"

mingw-w64-pygobject2/PKGBUILD

@@ -4,7 +4,7 @@ _realname=pygobject
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-gobject2" "${MINGW_PACKAGE_PREFIX}-python3-gobject2" "${MINGW_PACKAGE_PREFIX}-pygobject2-devel")
 pkgver=2.28.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Allows you to load glade interface files in a program at runtime (mingw-w64)"
 arch=(any)
 url="http://www.pygtk.org"

mingw-w64-pyqt4/PKGBUILD

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-common"
          "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=4.11.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Qt4 bindings for Python (mingw-w64)"
 arch=('any')
 license=('GPL')
@@ -68,13 +68,15 @@ package_python3-pyqt4(){
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
+  local _py3basever=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+
   # Provided by pyqt-common
   rm "${pkgdir}${MINGW_PREFIX}"/bin/{pylupdate4,pyrcc4}.exe
   rm -rf "${pkgdir}${MINGW_PREFIX}"/qsci
   rm -rf "${pkgdir}${MINGW_PREFIX}"/share/qt4/qsci
 
   # Remove Python 2 uic port
-  rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python3.5/site-packages/PyQt4/uic/port_v2
+  rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python${_py3basever}/site-packages/PyQt4/uic/port_v2
 }
 
 package_python2-pyqt4(){
@@ -85,6 +87,8 @@ package_python2-pyqt4(){
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
+  local _py2basever=$(${MINGW_PREFIX}/bin/python2 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+
   # Fix conflicts
   mv "${pkgdir}${MINGW_PREFIX}"/bin/{,python2-}pyuic4.bat
   rm "${pkgdir}${MINGW_PREFIX}"/bin/{pylupdate4,pyrcc4}.exe
@@ -92,7 +96,7 @@ package_python2-pyqt4(){
   rm -rf "${pkgdir}${MINGW_PREFIX}"/share/qt4/qsci
 
   # Remove Python 3 uic port
-  rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python2.7/site-packages/PyQt4/uic/port_v3
+  rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python${_py2basever}/site-packages/PyQt4/uic/port_v3
 }
 
 # Wrappers

mingw-w64-pyqt5/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-common" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=5.8
 #_pre_ver=5.8.dev1702091323
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt5 bindings for Python (mingw-w64)"
 arch=('any')
 license=('GPL')
@@ -71,10 +71,12 @@ package_python3-pyqt5(){
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
+  local _py3basever=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+
   # Provided by pyqt-common
   #rm "${pkgdir}${MINGW_PREFIX}"/bin/{pylupdate5,pyrcc5}.exe
   rm "${pkgdir}${MINGW_PREFIX}"/share/qt5/qsci/api/python/PyQt5.api
-  rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python3.5/site-packages/PyQt5/uic/port_v2
+  rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python${_py3basever}/site-packages/PyQt5/uic/port_v2
 }
 
 package_python2-pyqt5(){
@@ -87,6 +89,8 @@ package_python2-pyqt5(){
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
+  local _py2basever=$(${MINGW_PREFIX}/bin/python2 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+
   # Fix conflicts with python-pyqt5
   mv "${pkgdir}${MINGW_PREFIX}"/bin/{,python2-}pyuic5.bat
   mv "${pkgdir}${MINGW_PREFIX}"/bin/{,python2-}pylupdate5.bat
@@ -96,7 +100,7 @@ package_python2-pyqt5(){
   rm "${pkgdir}${MINGW_PREFIX}"/share/qt5/plugins/designer/pyqt5.dll
   rm "${pkgdir}${MINGW_PREFIX}"/share/qt5/plugins/PyQt5/pyqt5qmlplugin.dll
   rm "${pkgdir}${MINGW_PREFIX}"/share/qt5/qsci/api/python/PyQt5.api
-  rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python2.7/site-packages/PyQt5/uic/port_v3
+  rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python${_py2basever}/site-packages/PyQt5/uic/port_v3
 }
 
 # Wrappers

mingw-w64-pyside-qt4/PKGBUILD

@@ -5,7 +5,7 @@ _realname=pyside
 pkgbase=mingw-w64-${_realname}-qt4
 pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-common-qt4 ${MINGW_PACKAGE_PREFIX}-python{2,3}-${_realname}-qt4)
 pkgver=1.2.2
-pkgrel=3
+pkgrel=4
 arch=('any')
 url="https://pyside.github.io/docs/pyside/"
 license=("LGPL")

mingw-w64-pyside-tools-qt4/PKGBUILD

@@ -5,7 +5,7 @@ _realname=pyside-tools
 pkgbase=mingw-w64-${_realname}-qt4
 pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-common-qt4 ${MINGW_PACKAGE_PREFIX}-python{2,3}-${_realname}-qt4)
 pkgver=1.2.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Python bindings for Qt4 (mingw-w64)"
 arch=('any')
 url="https://pyside.github.io/docs/pyside/"

mingw-w64-python-appdirs/PKGBUILD

@@ -3,7 +3,7 @@ _realname=appdirs
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"  "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc='A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir". (mingw-w64)'
 arch=('any')
 url="https://github.com/ActiveState/appdirs"

mingw-w64-python-babel/PKGBUILD

@@ -5,7 +5,7 @@ _realname=babel
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection of tools for internationalizing Python applications"
 url="http://babel.pocoo.org/"
 license=("BSD")

mingw-w64-python-beaker/PKGBUILD

@@ -5,7 +5,7 @@ _realname=beaker
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications (mingw-w64)"
 arch=('any')
 license=('custom')

mingw-w64-python-beautifulsoup4/PKGBUILD

@@ -3,7 +3,7 @@ _realname=beautifulsoup4
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python3-beautifulsoup4" "${MINGW_PACKAGE_PREFIX}-python2-beautifulsoup4")
 pkgver=4.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A Python HTML/XML parser designed for quick turnaround projects like screen-scraping (mingw-w64)"
 arch=('any')
 url="http://www.crummy.com/software/BeautifulSoup/index.html"

mingw-w64-python-bsddb3/PKGBUILD

@@ -4,7 +4,7 @@ _realname=bsddb3
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=6.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Python bindings for Oracle Berkeley DB (mingw-w64)"
 arch=('any')
 license=('BSD')

mingw-w64-python-characteristic/PKGBUILD

@@ -4,7 +4,7 @@ _realname=characteristic
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=14.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Python attributes without boilerplate (mingw-w64)'
 url='https://characteristic.readthedocs.org/'
 license=('MIT')

mingw-w64-python-chardet/PKGBUILD

@@ -3,7 +3,7 @@ _realname=chardet
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python3-chardet" "${MINGW_PACKAGE_PREFIX}-python2-chardet")
 pkgver=2.3.0
-pkgrel=1
+pkgrel=2
 arch=('any')
 url="https://github.com/chardet/chardet"
 license=('LGPL')

mingw-w64-python-colorama/PKGBUILD

@@ -5,7 +5,7 @@ _realname=colorama
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.3.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Python API for cross-platform colored terminal text (mingw-w64)"
 arch=('any')
 license=('BSD')

mingw-w64-python-coverage/PKGBUILD

@@ -4,7 +4,7 @@ _realname=coverage
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=4.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Code coverage measurement for Python (mingw-w64)'
 url='https://coverage.readthedocs.org/'
 license=('Apache 2.0')

mingw-w64-python-csssselect/PKGBUILD

@@ -4,7 +4,7 @@ _realname=cssselect
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.9.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications (mingw-w64)"
 arch=('any')
 license=('BSD')

mingw-w64-python-cvxopt/PKGBUILD

@@ -6,7 +6,7 @@ pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.1.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Convex optimization based on the Python programming language (mingw-w64)"
 arch=('any')
 url='http://cvxopt.org'

mingw-w64-python-cx_Freeze/PKGBUILD

@@ -6,7 +6,7 @@ pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-cx_Freeze"
          "${MINGW_PACKAGE_PREFIX}-python3-cx_Freeze")
 pkgver=4.3.3
-pkgrel=7
+pkgrel=8
 pkgdesc="Python package for freezing scripts into executables (mingw-w64)"
 arch=('any')
 license=('PSF')

mingw-w64-python-cycler/PKGBUILD

@@ -7,7 +7,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 )
 pkgver=0.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Composable style cycles"
 arch=('any')
 license=('BSD')

mingw-w64-python-dateutil/PKGBUILD

@@ -5,7 +5,7 @@ _pyname=python-dateutil
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname")
 pkgver=2.6.0
-pkgrel=1
+pkgrel=3
 pkgdesc="Provides powerful extensions to the standard datetime module (mingw-w64)"
 arch=('any')
 license=('custom:PYTHON')
@@ -54,11 +54,13 @@ package_python3-dateutil() {
   ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
     --root=${pkgdir} --optimize=1 --skip-build
 
+  local _py3basever=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+
   install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
-  chmod -R a+r $pkgdir/${MINGW_PREFIX}/lib/python3.5/
+  chmod -R a+r $pkgdir/${MINGW_PREFIX}/lib/python${_py3basever}/
 
   # Remove data files
-  #rm ${pkgdir}${MINGW_PREFIX}/lib/python3.5/site-packages/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz
+  #rm ${pkgdir}${MINGW_PREFIX}/lib/python${_py3basever}/site-packages/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz
 }
 
 package_python2-dateutil() {
@@ -70,11 +72,13 @@ package_python2-dateutil() {
   ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \
     --root=${pkgdir} --optimize=1 --skip-build
 
+  local _py2basever=$(${MINGW_PREFIX}/bin/python2 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+
   install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
-  chmod -R a+r ${pkgdir}/${MINGW_PREFIX}/lib/python2.7/
+  chmod -R a+r ${pkgdir}/${MINGW_PREFIX}/lib/python${_py2basever}/
 
   # Remove data files
-  #rm ${pkgdir}${MINGW_PREFIX}/lib/python2.7/site-packages/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz
+  #rm ${pkgdir}${MINGW_PREFIX}/lib/python${_py2basever}/site-packages/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz
 }
 
 package_mingw-w64-i686-python2-dateutil() {

mingw-w64-python-decorator/PKGBUILD

@@ -7,7 +7,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 )
 pkgver=4.0.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Better living through Python with decorators (mingw-w64)"
 arch=('any')
 license=('BSD')

mingw-w64-python-distutils-extra/PKGBUILD

@@ -4,7 +4,7 @@ _realname=python-distutils-extra
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python3-distutils-extra" "${MINGW_PACKAGE_PREFIX}-python2-distutils-extra")
 pkgver=2.39
-pkgrel=2
+pkgrel=3
 pkgdesc="Enhancements to the Python build system (mingw-w64)"
 arch=('any')
 license=('GPL')

mingw-w64-python-docutils/PKGBUILD

@@ -5,7 +5,7 @@ _realname=docutils
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.12
-pkgrel=5
+pkgrel=6
 pkgdesc="Set of tools for processing plaintext docs into formats such as HTML, XML, or LaTeX (mingw-w64)"
 arch=('any')
 license=('custom')

mingw-w64-python-et-xmlfile/PKGBUILD

@@ -7,7 +7,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 )
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A low memory library for creating large XML files (mingw-w64)"
 url="https://et-xmlfile.readthedocs.org/"
 arch=('any')

mingw-w64-python-funcsigs/PKGBUILD

@@ -4,7 +4,7 @@ _realname=funcsigs
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+'
 arch=('any')
 url='https://github.com/testing-cabal/funcsigs'

mingw-w64-python-h5py/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname"
          "${MINGW_PACKAGE_PREFIX}-python3-$_realname")
 pkgver=2.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="General-purpose Python bindings for the HDF5 library (mingw-w64)"
 arch=('any')
 url="http://www.h5py.org"

mingw-w64-python-html5lib/PKGBUILD

@@ -4,7 +4,7 @@ _realname=html5lib
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.999999999
-pkgrel=1
+pkgrel=2
 arch=('any')
 pkgdesc="A Python HTML parser/tokenizer based on the WHATWG HTML5 spec (mingw-w64)"
 url="https://github.com/html5lib"

mingw-w64-python-httplib2/PKGBUILD

@@ -5,7 +5,7 @@ _realname=httplib2
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.9.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Comprehensive HTTP client library, supporting many features (mingw-w64)"
 arch=('any')
 license=('MIT')

mingw-w64-python-icu/PKGBUILD

@@ -4,7 +4,7 @@ _realname=PyICU
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-icu" "${MINGW_PACKAGE_PREFIX}-python3-icu")
 pkgver=1.9.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Python extension wrapping the ICU C++ API (mingw-w64)"
 arch=('any')
 license=('BSD')

mingw-w64-python-idna/PKGBUILD

@@ -4,7 +4,7 @@ _realname=idna
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Internationalized Domain Names in Applications (mingw-w64)'
 url='https://github.com/kjd/idna'
 license=('BSD-like')

mingw-w64-python-imagesize/PKGBUILD

@@ -4,7 +4,7 @@ _realname=imagesize
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Getting image size from png/jpeg/jpeg2000/gif file (mingw-w64)"
 url='https://github.com/shibukawa/imagesize_py'
 license=('MIT')

mingw-w64-python-ipython_genutils/PKGBUILD

@@ -7,7 +7,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 )
 pkgver=0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="IPython vestigial utilities (mingw-w64)"
 url="https://github.com/ipython/ipython_genutils"
 arch=('any')

mingw-w64-python-jdcal/PKGBUILD

@@ -7,7 +7,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 )
 pkgver=1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Julian dates, from proleptic Gregorian and Julian calendars (mingw-w64)"
 url="https://github.com/phn/jdcal"
 arch=('any')

mingw-w64-python-jinja/PKGBUILD

@@ -4,7 +4,7 @@ _realname=jinja
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple pythonic template language written in Python (mingw-w64)"
 arch=('any')
 license=('BSD')

mingw-w64-python-lhafile/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-lhafile"
          "${MINGW_PACKAGE_PREFIX}-python3-lhafile")
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="LHA module for Python (mingw-w64)"
 arch=('any')
 license=('BSD')

mingw-w64-python-lxml/PKGBUILD

@@ -7,7 +7,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python-${_realname}-docs")
 pkgver=3.7.3
-pkgrel=1
+pkgrel=2
 arch=('any')
 license=('BSD' 'custom')
 url="http://lxml.de/"

mingw-w64-python-mako/PKGBUILD

@@ -5,7 +5,7 @@ _realname=mako
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A super-fast templating language that borrows the best ideas from the existing templating languages (mingw-w64)"
 arch=('any')
 license=('custom')

mingw-w64-python-markupsafe/PKGBUILD

@@ -4,7 +4,7 @@ _realname=markupsafe
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python (mingw-w64)"
 arch=('any')
 license=('custom')

mingw-w64-python-matplotlib/PKGBUILD

@@ -7,7 +7,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
   )
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A python plotting library, making publication quality plots (mingw-w64)"
 arch=('any')
 url='http://matplotlib.org'

mingw-w64-python-mistune/PKGBUILD

@@ -4,7 +4,7 @@ _realname=mistune
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The fastest markdown parser in pure Python with renderer feature (mingw-w64)"
 arch=('any')
 url="https://github.com/lepture/mistune"

mingw-w64-python-mock/PKGBUILD

@@ -4,7 +4,7 @@ _realname=mock
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Rolling backport of unittest.mock for all Pythons (mingw-w64)'
 arch=('any')
 url='https://github.com/testing-cabal/mock'

mingw-w64-python-networkx/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
 pkgver=1.11
-pkgrel=1
+pkgrel=2
 pkgdesc="High-productivity software for complex networks (mingw-w64)"
 arch=('any')
 license=('BSD')

mingw-w64-python-nose/PKGBUILD

@@ -5,7 +5,7 @@ _realname=nose
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.3.7
-pkgrel=4
+pkgrel=5
 pkgdesc="A discovery-based unittest extension (mingw-w64)"
 arch=('any')
 license=('LGPL-2.1')

mingw-w64-python-nuitka/PKGBUILD

@@ -4,7 +4,7 @@ _realname=nuitka
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.5.14.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Python to native compiler (mingw-w64)"
 arch=('any')
 license=('APACHE')

mingw-w64-python-numexpr/PKGBUILD

@@ -4,7 +4,7 @@ _realname=numexpr
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname")
 pkgver=2.4.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas. (mingw-w64)"
 arch=('any')
 url="https://github.com/pydata/numexpr"

mingw-w64-python-numpy/PKGBUILD

@@ -6,7 +6,7 @@ _realname=numpy
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.11.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Scientific tools for Python (mingw-w64)"
 arch=('any')
 license=('BSD')
@@ -77,7 +77,7 @@ package_python2-numpy() {
   depends=("${MINGW_PACKAGE_PREFIX}-openblas" "${MINGW_PACKAGE_PREFIX}-python2")
   optdepends=("${MINGW_PACKAGE_PREFIX}-python2-nose: testsuite")
 
-  _pyver=2.7
+  _pyver=$(${MINGW_PREFIX}/bin/python2 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
 
   export ATLAS=None
   export LDFLAGS="$LDFLAGS -shared"
@@ -103,7 +103,7 @@ package_python3-numpy() {
   depends=("${MINGW_PACKAGE_PREFIX}-openblas" "${MINGW_PACKAGE_PREFIX}-python3")
   optdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose: testsuite")
 
-  _pyver=3.5
+  _pyver=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
   _pyinc=${_pyver}m
 
   export ATLAS=None

mingw-w64-python-openmdao/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
 pkgver=1.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An open-source MDAO framework written in Python. (mingw-w64)"
 arch=('any')
 license=('apache')

mingw-w64-python-openpyxl/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
 pkgver=2.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A python library to read/write Excel 2007 xlsx/xlsm file (mingw-w64)"
 url="http://openpyxl.readthedocs.org/"
 arch=('any')

mingw-w64-python-packaging/PKGBUILD

@@ -4,7 +4,7 @@ _realname=packaging
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"  "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=16.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Core utilities for Python packages (mingw-w64)"
 arch=('any')
 url="https://github.com/pypa/packaging"

mingw-w64-python-pandas/PKGBUILD

@@ -4,7 +4,7 @@ _realname=pandas
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.19.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross-section and time series data analysis toolkit (mingw-w64)"
 arch=('any')
 url="http://pandas.pydata.org/"

mingw-w64-python-path/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python3-path"
          "${MINGW_PACKAGE_PREFIX}-python2-path")
 pkgver=10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="File system based database that uses python pickles (mingw-w64)"
 url="https://github.com/jaraco/path.py"
 arch=('any')

mingw-w64-python-patsy/PKGBUILD

@@ -4,7 +4,7 @@ _realname=patsy
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A Python package for describing statistical models and for building design matrices (mingw-w64)"
 arch=('any')
 url="https://github.com/pydata/patsy"

mingw-w64-python-pbr/PKGBUILD

@@ -4,7 +4,7 @@ _realname=pbr
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Python Build Reasonableness (mingw-w64)"
 url="https://launchpad.net/pbr"
 license=("Apache License, Version 2.0")

mingw-w64-python-pdfrw/PKGBUILD

@@ -5,7 +5,7 @@ _realname=pdfrw
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Convert restructured text to PDF via reportlab (mingw-w64)"
 arch=('any')
 url='https://github.com/pmaupin/${_realname}'

mingw-w64-python-pgen2/PKGBUILD

@@ -7,7 +7,7 @@ _realname=pgen2
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"  "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Pure Python implementation of pgen, the Python parser generator (mingw-w64)"
 arch=('any')
 url='https://github.com/mythonlang/pgen2/'

mingw-w64-python-pickleshare/PKGBUILD

@@ -7,7 +7,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 )
 pkgver=0.7.4
-pkgrel=1
+pkgrel=2
 pkgdesc="File system based database that uses python pickles (mingw-w64)"
 url="https://github.com/pickleshare/pickleshare"
 arch=('any')

mingw-w64-python-pillow/PKGBUILD

@@ -4,9 +4,7 @@ _realname=Pillow
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-pillow" "${MINGW_PACKAGE_PREFIX}-python3-pillow")
 pkgver=4.0.0
-_py2basever=2.7
-_py3basever=3.5m
-pkgrel=1
+pkgrel=3
 arch=('any')
 license=('custom')
 url="https://github.com/python-pillow/Pillow/"
@@ -43,14 +41,15 @@ package_python3-pillow() {
   optdepends=("${MINGW_PACKAGE_PREFIX}-tk: for the ImageTK module")
 
   local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
+  local _py3basever=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
   
   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=0
 
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
-  install -dm755 "${pkgdir}${MINGW_PREFIX}/include/python${_py3basever}/"
-  install -m644 -t "${pkgdir}${MINGW_PREFIX}/include/python${_py3basever}/" libImaging/*.h
+  install -dm755 "${pkgdir}${MINGW_PREFIX}/include/python${_py3basever}m/"
+  install -m644 -t "${pkgdir}${MINGW_PREFIX}/include/python${_py3basever}m/" libImaging/*.h
 
   # clean up bins
   cd "${pkgdir}${MINGW_PREFIX}/bin"
@@ -69,6 +68,7 @@ package_python2-pillow() {
   optdepends=("${MINGW_PACKAGE_PREFIX}-tk: for the ImageTK module")
   
   local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
+  local _py2basever=$(${MINGW_PREFIX}/bin/python2 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
 
   cd "${srcdir}/python2-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \

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=9.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An easy_install replacement for installing pypi python packages (mingw-w64)"
 arch=('any')
 license=('MIT')

mingw-w64-python-pptx/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
 pkgver=0.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Create Open XML PowerPoint documents in Python (mingw-w64)"
 url="https://github.com/scanny/python-pptx"
 arch=('any')

mingw-w64-python-pretend/PKGBUILD

@@ -4,7 +4,7 @@ _realname=pretend
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"  "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for stubbing in Python (mingw-w64)"
 arch=('any')
 license=('BSD')

mingw-w64-python-prompt_toolkit/PKGBUILD

@@ -7,7 +7,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 )
 pkgver=1.0.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for building powerful interactive command lines in Python"
 url="https://github.com/jonathanslenders/python-prompt-toolkit"
 arch=('any')

mingw-w64-python-psutil/PKGBUILD

@@ -6,7 +6,7 @@ pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=4.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform process and system utilities module for Python (mingw-w64)"
 arch=('any')
 url="https://github.com/giampaolo/"

mingw-w64-python-py/PKGBUILD

@@ -5,7 +5,7 @@ _realname=py
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.4.33
-pkgrel=1
+pkgrel=2
 pkgdesc='library with cross-python path, ini-parsing, io, code, log facilities (mingw-w64)'
 arch=('any')
 url='https://pylib.readthedocs.org/'

mingw-w64-python-pyasn1-modules/PKGBUILD

@@ -4,7 +4,7 @@ _realname=pyasn1-modules
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc='A collection of ASN.1-based protocols modules (mingw-w64)'
 url='https://sourceforge.net/projects/pyasn1/'
 license=('BSD')

mingw-w64-python-pyasn1/PKGBUILD

@@ -4,7 +4,7 @@ _realname=pyasn1
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.1.9
-pkgrel=1
+pkgrel=2
 pkgdesc='ASN.1 types and codecs (mingw-w64)'
 url='https://sourceforge.net/projects/pyasn1/'
 license=('BSD')

mingw-w64-python-pycparser/PKGBUILD

@@ -4,7 +4,7 @@ _realname=pycparser
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.14
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete parser of the C language, written in pure Python (mingw-w64)'
 arch=('any')
 url='https://github.com/eliben/pycparser'

mingw-w64-python-pygments/PKGBUILD

@@ -6,7 +6,7 @@ _realname=pygments
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Python syntax highlighter (mingw-w64)"
 arch=('any')
 license=('BSD')

mingw-w64-python-pyparsing/PKGBUILD

@@ -4,7 +4,7 @@ _realname=pyparsing
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='General parsing module for Python (mingw-w64)'
 arch=('any')
 url='http://pyparsing.wikispaces.com'

mingw-w64-python-pytest/PKGBUILD

@@ -4,7 +4,7 @@ _realname=pytest
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=3.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc='simple powerful testing with Python (mingw-w64)'
 url='http://pytest.org'
 license=('MIT')

mingw-w64-python-pytz/PKGBUILD

@@ -4,7 +4,7 @@ _realname=pytz
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2016.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross platform time zone library for Python (mingw-w64)"
 arch=('any')
 url="https://pypi.python.org/pypi/pytz"

mingw-w64-python-pyzmq/PKGBUILD

@@ -3,7 +3,7 @@
 pkgbase=mingw-w64-python-pyzmq
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-pyzmq" "${MINGW_PACKAGE_PREFIX}-python3-pyzmq")
 pkgver=15.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings for zeromq, written in Cython (mingw-w64)"
 arch=('any')
 url="http://www.zeromq.org/bindings:python"

mingw-w64-python-reportlab/PKGBUILD

@@ -5,7 +5,7 @@ _realname=reportlab
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=3.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A proven industry-strength PDF generating solution (mingw-w64)"
 arch=('any')
 license=('custom')

mingw-w64-python-requests/PKGBUILD

@@ -4,7 +4,7 @@ _realname=requests
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.13.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Requests is the only Non-GMO HTTP library for Python, safe for human consumption. (mingw-w64)"
 arch=('any')
 license=('Apache')

mingw-w64-python-rst2pdf/PKGBUILD

@@ -3,7 +3,7 @@ _realname=rst2pdf
 pkgbase=mingw-w64-python2-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"  "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.93
-pkgrel=2
+pkgrel=3
 pkgdesc="Create PDFs from simple text markup, no LaTeX required (mingw-w64)"
 arch=('any')
 url='https://github.com/ralsina/rst2pdf'

mingw-w64-python-scipy/PKGBUILD

@@ -4,7 +4,7 @@ _realname=scipy
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.18.1
-pkgrel=1
+pkgrel=2
 pkgdesc="SciPy is open-source software for mathematics, science, and engineering. (mingw-w64)"
 arch=('any')
 url="http://www.scipy.org/"

mingw-w64-python-setuptools/PKGBUILD

@@ -8,7 +8,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python2-setuptools" "${MINGW_PACKAGE_PREFIX}-p
 _py3_base=3.5
 _py2_base=2.7
 pkgver=31.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages (mingw-w64)"
 arch=('any')
 license=('PSF')

mingw-w64-python-simplegeneric/PKGBUILD

@@ -7,7 +7,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-python2-simplegeneric"
 )
 pkgver=0.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="File system based database that uses python pickles (mingw-w64)"
 url="https://github.com/jaraco/simplegeneric.py"
 arch=('any')

mingw-w64-python-six/PKGBUILD

@@ -4,7 +4,7 @@ _realname=six
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname")
 pkgver=1.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Python 2 and 3 compatibility utilities (mingw-w64)"
 arch=('any')
 url="https://pypi.python.org/pypi/six/"

mingw-w64-python-snowballstemmer/PKGBUILD

@@ -4,7 +4,7 @@ _realname=snowballstemmer
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Snowball stemming library collection for Python (mingw-w64)"
 arch=('any')
 license=('BSD')

mingw-w64-python-sphinx-alabaster-theme/PKGBUILD

@@ -5,7 +5,7 @@ _pyname=alabaster
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.7.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Modified Kr Sphinx doc theme (mingw-w64)"
 arch=('any')
 license=('BSD')

mingw-w64-python-sphinx/PKGBUILD

@@ -6,7 +6,7 @@ _realname=sphinx
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Python documentation generator (mingw-w64)"
 arch=('any')
 license=('BSD')

mingw-w64-python-sphinx_rtd_theme/PKGBUILD

@@ -4,7 +4,7 @@ _realname=sphinx_rtd_theme
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.1.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Python Sphinx Read The Docs Theme (mingw-w64)"
 arch=('any')
 license=('MIT')

mingw-w64-python-sqlitedict/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Persistent dict, backed by sqlite3 and pickle, multithread-safe (mingw-w64)"
 arch=('any')
 license=('BSD')

mingw-w64-python-statsmodels/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname"
          "${MINGW_PACKAGE_PREFIX}-python3-$_realname")
 pkgver=0.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Statistical computations and models for use with SciPy (mingw-w64)"
 arch=('any')
 url="https://statsmodels.sourceforge.io/"

mingw-w64-python-traitlets/PKGBUILD

@@ -7,7 +7,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 )
 pkgver=4.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A lightweight Traits like module (mingw-w64)"
 url="https://github.com/ipython/traitlets"
 arch=('any')

mingw-w64-python-wcwidth/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
 pkgver=0.1.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Measures number of Terminal column cells of wide-character codes (mingw-w64)"
 url="https://github.com/jquast/wcwidth"
 arch=('any')

mingw-w64-python-webencodings/PKGBUILD

@@ -4,7 +4,7 @@ _realname=webencodings
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"  "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.5.1
-pkgrel=1
+pkgrel=2
 arch=('any')
 pkgdesc="This is a Python implementation of the WHATWG Encoding standard. (mingw-w64)"
 url="https://github.com/gsnedders/python-webencodings"

mingw-w64-python-win_unicode_console/PKGBUILD

@@ -7,7 +7,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 )
 pkgver=0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Measures number of Terminal column cells of wide-character codes"
 url="https://github.com/Drekin/win-unicode-console"
 arch=('any')