From d91becad5174dbf7b8787ab270e7405f497f8b22 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 9 Oct 2015 12:34:07 +0300 Subject: [PATCH] Rebuild/update packages for Python 3.5.0 support --- mingw-w64-cython/PKGBUILD | 5 +- mingw-w64-gedit/PKGBUILD | 2 +- mingw-w64-libgit2-glib/PKGBUILD | 2 +- mingw-w64-opencolorio-git/PKGBUILD | 5 +- mingw-w64-pygobject/PKGBUILD | 2 +- mingw-w64-pyqt4/PKGBUILD | 8 +- mingw-w64-pyqt5/PKGBUILD | 17 ++-- mingw-w64-python-babel/PKGBUILD | 14 +-- mingw-w64-python-babel/babel-fix.patch | 98 ------------------- mingw-w64-python-beaker/PKGBUILD | 3 +- mingw-w64-python-bsddb3/PKGBUILD | 3 +- mingw-w64-python-colorama/PKGBUILD | 3 +- mingw-w64-python-csssselect/PKGBUILD | 3 +- mingw-w64-python-cx_Freeze/PKGBUILD | 3 +- mingw-w64-python-dateutil/PKGBUILD | 7 +- mingw-w64-python-docutils/PKGBUILD | 6 +- mingw-w64-python-httplib2/PKGBUILD | 11 ++- mingw-w64-python-icu/PKGBUILD | 5 +- mingw-w64-python-ipython/PKGBUILD | 14 +-- mingw-w64-python-jinja/PKGBUILD | 6 +- mingw-w64-python-lhafile/PKGBUILD | 7 +- mingw-w64-python-lxml/PKGBUILD | 19 ++-- .../use-distutils-get_platform.patch | 12 +-- mingw-w64-python-mako/PKGBUILD | 7 +- mingw-w64-python-markupsafe/PKGBUILD | 3 +- mingw-w64-python-matplotlib/PKGBUILD | 9 +- mingw-w64-python-matplotlib/setupext.py.patch | 15 ++- mingw-w64-python-nose/PKGBUILD | 3 +- mingw-w64-python-nuitka/PKGBUILD | 3 +- mingw-w64-python-numexpr/PKGBUILD | 7 +- mingw-w64-python-pandas/PKGBUILD | 3 +- mingw-w64-python-patsy/PKGBUILD | 7 +- mingw-w64-python-pip/PKGBUILD | 11 +-- mingw-w64-python-pygments/PKGBUILD | 4 +- mingw-w64-python-pyparsing/PKGBUILD | 9 +- mingw-w64-python-pytz/PKGBUILD | 15 +-- mingw-w64-python-reportlab/PKGBUILD | 4 +- mingw-w64-python-scipy/PKGBUILD | 3 +- mingw-w64-python-six/PKGBUILD | 11 +-- mingw-w64-python-snowballstemmer/PKGBUILD | 3 +- .../PKGBUILD | 5 +- mingw-w64-python-sphinx/PKGBUILD | 3 +- mingw-w64-python-sphinx_rtd_theme/PKGBUILD | 5 +- mingw-w64-python-statsmodels/PKGBUILD | 33 +++---- mingw-w64-python3-cairo/PKGBUILD | 3 +- mingw-w64-sip/PKGBUILD | 6 +- 46 files changed, 176 insertions(+), 251 deletions(-) delete mode 100644 mingw-w64-python-babel/babel-fix.patch diff --git a/mingw-w64-cython/PKGBUILD b/mingw-w64-cython/PKGBUILD index aa1fa9da40..33d8037f5e 100644 --- a/mingw-w64-cython/PKGBUILD +++ b/mingw-w64-cython/PKGBUILD @@ -2,8 +2,9 @@ # Contributor: Ray Donnelly _realname=cython +pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-cython" "${MINGW_PACKAGE_PREFIX}-cython2") -pkgver=0.23.beta1 +pkgver=0.23 pkgrel=1 pkgdesc="C-Extensions for Python (mingw-w64)" arch=('any') @@ -15,7 +16,7 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-gcc" ) source=("http://cython.org/release/Cython-${pkgver}.tar.gz") -md5sums=('da4d499c596b9192dab755e4c508a2c9') +md5sums=('63d472d0a9b3b39b9651f7bf568bb4a5') prepare() { cp -a ${_realname}-${pkgver} ${_realname}-py2-${pkgver}-${CARCH} diff --git a/mingw-w64-gedit/PKGBUILD b/mingw-w64-gedit/PKGBUILD index 889577eb99..41d4f9a17b 100644 --- a/mingw-w64-gedit/PKGBUILD +++ b/mingw-w64-gedit/PKGBUILD @@ -4,7 +4,7 @@ _realname=gedit pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=3.18.0 -pkgrel=1 +pkgrel=2 arch=('any') pkgdesc="A text editor for GNOME (mingw-w64)" depends=("${MINGW_PACKAGE_PREFIX}-adwaita-icon-theme" diff --git a/mingw-w64-libgit2-glib/PKGBUILD b/mingw-w64-libgit2-glib/PKGBUILD index 54c79a9595..34d88740ad 100644 --- a/mingw-w64-libgit2-glib/PKGBUILD +++ b/mingw-w64-libgit2-glib/PKGBUILD @@ -4,7 +4,7 @@ _realname=libgit2-glib pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.23.6 -pkgrel=1 +pkgrel=2 arch=('any') pkgdesc="A glib wrapper library around the libgit2 git access library (mingw-w64)" depends=("${MINGW_PACKAGE_PREFIX}-libgit2>=0.23" diff --git a/mingw-w64-opencolorio-git/PKGBUILD b/mingw-w64-opencolorio-git/PKGBUILD index 5efc612128..90cd0d6538 100644 --- a/mingw-w64-opencolorio-git/PKGBUILD +++ b/mingw-w64-opencolorio-git/PKGBUILD @@ -1,9 +1,10 @@ # Maintainer: Alexey Pavlov _realname=opencolorio +pkgbase=mingw-w64-${_realname}-git pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" pkgver=701.a557a85 -pkgrel=2 +pkgrel=3 pkgdesc="A color management framework for visual effects and animation (mingw-w64)" arch=('any') url="http://opencolorio.org" @@ -13,7 +14,7 @@ conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") depends=("${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-glew" "${MINGW_PACKAGE_PREFIX}-lcms2" - "${MINGW_PACKAGE_PREFIX}-python2" + "${MINGW_PACKAGE_PREFIX}-python3" "${MINGW_PACKAGE_PREFIX}-tinyxml") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-yaml-cpp" diff --git a/mingw-w64-pygobject/PKGBUILD b/mingw-w64-pygobject/PKGBUILD index 7cb147b0fb..af202d0619 100644 --- a/mingw-w64-pygobject/PKGBUILD +++ b/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.18.0 -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" diff --git a/mingw-w64-pyqt4/PKGBUILD b/mingw-w64-pyqt4/PKGBUILD index 66f85b5a39..10d7d3962f 100644 --- a/mingw-w64-pyqt4/PKGBUILD +++ b/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=1 +pkgrel=2 pkgdesc="Qt4 bindings for Python (mingw-w64)" arch=('any') license=('GPL') @@ -21,7 +21,7 @@ md5sums=('cc3f9a88900c95b599afa69d869d8095' '2eeedc9c1ac90ad97654de98658637a7') prepare() { - cd "${srcdir}"/PyQt-win-gpl-$pkgver + cd "${srcdir}"/PyQt-win-gpl-${pkgver} # Apply patches patch -p0 -i "${srcdir}"/001-mingw-python.patch @@ -71,9 +71,10 @@ package_python3-pyqt4(){ # 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.4/site-packages/PyQt4/uic/port_v2 + rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python3.5/site-packages/PyQt4/uic/port_v2 } package_python2-pyqt4(){ @@ -88,6 +89,7 @@ package_python2-pyqt4(){ mv "${pkgdir}${MINGW_PREFIX}"/bin/{,python2-}pyuic4.bat rm "${pkgdir}${MINGW_PREFIX}"/bin/{pylupdate4,pyrcc4}.exe rm -rf "${pkgdir}${MINGW_PREFIX}"/qsci + 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 diff --git a/mingw-w64-pyqt5/PKGBUILD b/mingw-w64-pyqt5/PKGBUILD index ec1559f0f1..f64c9a8f3f 100644 --- a/mingw-w64-pyqt5/PKGBUILD +++ b/mingw-w64-pyqt5/PKGBUILD @@ -1,21 +1,22 @@ # Maintainer: Saul Ibarra Corretge _realname=pyqt5 +pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-common" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=5.4.2 +pkgver=5.5 pkgrel=1 pkgdesc="Qt5 bindings for Python (mingw-w64)" arch=('any') license=('GPL') url="http://www.riverbankcomputing.co.uk/software/pyqt" makedepends=("${MINGW_PACKAGE_PREFIX}-python2-sip" - "${MINGW_PACKAGE_PREFIX}-python3-sip" - "${MINGW_PACKAGE_PREFIX}-qt5") + "${MINGW_PACKAGE_PREFIX}-python3-sip" + "${MINGW_PACKAGE_PREFIX}-qt5") options=('strip' 'staticlibs') source=("http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt-gpl-${pkgver}.tar.gz" #"http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver%.*}/PyQt-gpl-${pkgver%.*}.tar.gz" 001-mingw-python.patch) -md5sums=('33936458544b69251a8f4a2308d469d3' +md5sums=('60c0137b26c9ecbc3db0addb9638dc01' '3b11ff26e229e256ee13f484422047d9') prepare() { @@ -27,9 +28,9 @@ prepare() { build() { for builddir in python{2,3}-${MINGW_CHOST}; do - [[ -d $builddir ]] && rm -rf $builddir - cp -r PyQt-gpl-${pkgver} $builddir - pushd $builddir + [[ -d $builddir ]] && rm -rf ${builddir} + cp -r PyQt-gpl-${pkgver} ${builddir} + pushd ${builddir} > /dev/null [[ "${builddir%-${MINGW_CHOST}}" == "python2" ]] && { local _sipdir=Py2-Qt5 } || { @@ -42,7 +43,7 @@ build() { -q ${MINGW_PREFIX}/bin/qmake.exe \ --verbose make V=1 - popd + popd > /dev/null done } diff --git a/mingw-w64-python-babel/PKGBUILD b/mingw-w64-python-babel/PKGBUILD index a9c3136129..0b2c8b839b 100644 --- a/mingw-w64-python-babel/PKGBUILD +++ b/mingw-w64-python-babel/PKGBUILD @@ -1,8 +1,9 @@ # Maintainer: Alexey Pavlov _realname=babel -pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") -pkgver=1.3 +pkgbase=mingw-w64-python-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") +pkgver=2.1.1 pkgrel=1 pkgdesc="A collection of tools for internationalizing Python applications" url="http://babel.pocoo.org/" @@ -12,15 +13,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools" "${MINGW_PACKAGE_PREFIX}-python3-setuptools" "${MINGW_PACKAGE_PREFIX}-python2-pytz" "${MINGW_PACKAGE_PREFIX}-python3-pytz") -source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/mitsuhiko/babel/archive/${pkgver}.tar.gz" - babel-fix.patch) -md5sums=('752ecd661a4002d64ba07384404a2988' - '6fdce5263b6010a3d6d922df92360b74') +source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/mitsuhiko/babel/archive/${pkgver}.tar.gz") +md5sums=('40cbe93a1ce8c1be06dca47fb8b20963') prepare() { - cd ${srcdir}/${_realname}-${pkgver} - patch -p1 -i ${srcdir}/babel-fix.patch - cd ${srcdir} cp -r ${_realname}-${pkgver} build-python2 cp -r ${_realname}-${pkgver} build-python3 diff --git a/mingw-w64-python-babel/babel-fix.patch b/mingw-w64-python-babel/babel-fix.patch deleted file mode 100644 index 1b1ec3ac91..0000000000 --- a/mingw-w64-python-babel/babel-fix.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -Naur babel-1.3-orig/babel/localtime/_win32.py babel-1.3/babel/localtime/_win32.py ---- babel-1.3-orig/babel/localtime/_win32.py 2013-07-29 15:33:20.000000000 +0400 -+++ babel-1.3/babel/localtime/_win32.py 2015-07-06 09:12:35.343528600 +0300 -@@ -10,8 +10,14 @@ - import pytz - - --tz_names = get_global('windows_zone_mapping') -- -+# When building the cldr data on windows this module gets imported. -+# Because at that point there is no global.dat yet this call will -+# fail. We want to catch it down in that case then and just assume -+# the mapping was empty. -+try: -+ tz_names = get_global('windows_zone_mapping') -+except RuntimeError: -+ tz_names = {} - - def valuestodict(key): - """Convert a registry key's values to a dictionary.""" -diff -Naur babel-1.3-orig/babel/messages/frontend.py babel-1.3/babel/messages/frontend.py ---- babel-1.3-orig/babel/messages/frontend.py 2013-07-29 15:33:20.000000000 +0400 -+++ babel-1.3/babel/messages/frontend.py 2015-07-06 09:19:44.621596500 +0300 -@@ -128,7 +128,7 @@ - - for idx, (locale, po_file) in enumerate(po_files): - mo_file = mo_files[idx] -- infile = open(po_file, 'r') -+ infile = open(po_file, 'rb') - try: - catalog = read_po(infile, locale) - finally: -@@ -439,7 +439,7 @@ - log.info('creating catalog %r based on %r', self.output_file, - self.input_file) - -- infile = open(self.input_file, 'r') -+ infile = open(self.input_file, 'rb') - try: - # Although reading from the catalog template, read_po must be fed - # the locale in order to correctly calculate plurals -@@ -554,7 +554,7 @@ - if not domain: - domain = os.path.splitext(os.path.basename(self.input_file))[0] - -- infile = open(self.input_file, 'U') -+ infile = open(self.input_file, 'rb') - try: - template = read_po(infile) - finally: -@@ -566,7 +566,7 @@ - for locale, filename in po_files: - log.info('updating catalog %r based on %r', filename, - self.input_file) -- infile = open(filename, 'U') -+ infile = open(filename, 'rb') - try: - catalog = read_po(infile, locale=locale, domain=domain) - finally: -@@ -577,7 +577,7 @@ - tmpname = os.path.join(os.path.dirname(filename), - tempfile.gettempprefix() + - os.path.basename(filename)) -- tmpfile = open(tmpname, 'w') -+ tmpfile = open(tmpname, 'wb') - try: - try: - write_po(tmpfile, catalog, -@@ -760,7 +760,7 @@ - - for idx, (locale, po_file) in enumerate(po_files): - mo_file = mo_files[idx] -- infile = open(po_file, 'r') -+ infile = open(po_file, 'rb') - try: - catalog = read_po(infile, locale) - finally: -@@ -1121,7 +1121,7 @@ - tmpname = os.path.join(os.path.dirname(filename), - tempfile.gettempprefix() + - os.path.basename(filename)) -- tmpfile = open(tmpname, 'w') -+ tmpfile = open(tmpname, 'wb') - try: - try: - write_po(tmpfile, catalog, -diff -Naur babel-1.3-orig/babel/numbers.py babel-1.3/babel/numbers.py ---- babel-1.3-orig/babel/numbers.py 2013-07-29 15:33:20.000000000 +0400 -+++ babel-1.3/babel/numbers.py 2015-07-06 09:16:30.100050600 +0300 -@@ -303,7 +303,7 @@ - - - PREFIX_END = r'[^0-9@#.,]' --NUMBER_TOKEN = r'[0-9@#.\-,E+]' -+NUMBER_TOKEN = r'[0-9@#.,E+]' - - PREFIX_PATTERN = r"(?P(?:'[^']*'|%s)*)" % PREFIX_END - NUMBER_PATTERN = r"(?P%s+)" % NUMBER_TOKEN diff --git a/mingw-w64-python-beaker/PKGBUILD b/mingw-w64-python-beaker/PKGBUILD index b1d9d2713c..1df2740ddf 100644 --- a/mingw-w64-python-beaker/PKGBUILD +++ b/mingw-w64-python-beaker/PKGBUILD @@ -2,9 +2,10 @@ # Contributor: Ray Donnelly _realname=beaker +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.7.0 -pkgrel=2 +pkgrel=3 pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications (mingw-w64)" arch=('any') license=('custom') diff --git a/mingw-w64-python-bsddb3/PKGBUILD b/mingw-w64-python-bsddb3/PKGBUILD index 85ccb4f1ce..8927c66a84 100644 --- a/mingw-w64-python-bsddb3/PKGBUILD +++ b/mingw-w64-python-bsddb3/PKGBUILD @@ -1,9 +1,10 @@ # Contributor: Josip _realname=bsddb3 +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=6.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Python bindings for Oracle Berkeley DB (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-colorama/PKGBUILD b/mingw-w64-python-colorama/PKGBUILD index 589e4e6fee..56685da30a 100644 --- a/mingw-w64-python-colorama/PKGBUILD +++ b/mingw-w64-python-colorama/PKGBUILD @@ -2,9 +2,10 @@ # Contributor: Ray Donnelly _realname=colorama +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="Python API for cross-platform colored terminal text (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-csssselect/PKGBUILD b/mingw-w64-python-csssselect/PKGBUILD index ae776d7b33..9c426b57b6 100644 --- a/mingw-w64-python-csssselect/PKGBUILD +++ b/mingw-w64-python-csssselect/PKGBUILD @@ -1,9 +1,10 @@ # Maintainer: Alexey Pavlov _realname=cssselect +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.9.1 -pkgrel=3 +pkgrel=4 pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-cx_Freeze/PKGBUILD b/mingw-w64-python-cx_Freeze/PKGBUILD index c8643cf333..bef92b5b13 100644 --- a/mingw-w64-python-cx_Freeze/PKGBUILD +++ b/mingw-w64-python-cx_Freeze/PKGBUILD @@ -1,10 +1,11 @@ # Maintainer: Frode Solheim _realname=cx_Freeze +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-cx_Freeze" "${MINGW_PACKAGE_PREFIX}-python3-cx_Freeze") pkgver=4.3.3 -pkgrel=3 +pkgrel=5 pkgdesc="Python package for freezing scripts into executables (mingw-w64)" arch=('any') license=('PSF') diff --git a/mingw-w64-python-dateutil/PKGBUILD b/mingw-w64-python-dateutil/PKGBUILD index 8410f5df39..d40299e64a 100644 --- a/mingw-w64-python-dateutil/PKGBUILD +++ b/mingw-w64-python-dateutil/PKGBUILD @@ -1,9 +1,10 @@ # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com > _realname=dateutil +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") pkgver=2.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Provides powerful extensions to the standard datetime module (mingw-w64)" arch=('any') license=('custom:PYTHON') @@ -41,10 +42,10 @@ package_python3-dateutil() { --root=${pkgdir} --optimize=1 install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE - chmod -R a+r $pkgdir/${MINGW_PREFIX}/lib/python3.4/ + chmod -R a+r $pkgdir/${MINGW_PREFIX}/lib/python3.5/ # Remove data files - #rm ${pkgdir}${MINGW_PREFIX}/lib/python3.4/site-packages/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz + #rm ${pkgdir}${MINGW_PREFIX}/lib/python3.5/site-packages/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz } package_python2-dateutil() { diff --git a/mingw-w64-python-docutils/PKGBUILD b/mingw-w64-python-docutils/PKGBUILD index 851710f36b..df0c8be041 100644 --- a/mingw-w64-python-docutils/PKGBUILD +++ b/mingw-w64-python-docutils/PKGBUILD @@ -2,15 +2,15 @@ # Contributor: Ray Donnelly _realname=docutils -pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.12 -pkgrel=4 +pkgrel=5 pkgdesc="Set of tools for processing plaintext docs into formats such as HTML, XML, or LaTeX (mingw-w64)" arch=('any') license=('custom') url="http://docutils.sourceforge.net" -depends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-python3") +makedepends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-python3") source=("http://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.gz") md5sums=('4622263b62c5c771c03502afa3157768') diff --git a/mingw-w64-python-httplib2/PKGBUILD b/mingw-w64-python-httplib2/PKGBUILD index 0b959b91da..5a5dc9d19f 100644 --- a/mingw-w64-python-httplib2/PKGBUILD +++ b/mingw-w64-python-httplib2/PKGBUILD @@ -2,8 +2,9 @@ # Contributor: Ray Donnelly _realname=httplib2 +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=0.9.1 +pkgver=0.9.2 pkgrel=1 pkgdesc="Comprehensive HTTP client library, supporting many features (mingw-w64)" arch=('any') @@ -18,10 +19,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-python3-setuptools" #"git" ) -source=(${_realname}-${pkgver}.tar.gz::https://github.com/jcgregorio/httplib2/archive/v${pkgver}.tar.gz +source=(${_realname}-${pkgver}.tar.gz::https://github.com/jcgregorio/httplib2/archive/${pkgver}.tar.gz ssl_hostname.patch cert.patch) -md5sums=('10f0ec63738292b362ed438abc186a43' +md5sums=('eb39d90dc64bd12a94184d76bddc65a3' '6de5596aedd196a4db96f83f529e3509' '98fab3f5a578c0db600237f025aac991') @@ -29,10 +30,10 @@ prepare() { pushd "${_realname}-${pkgver}" # Patch, ref FS#36839 - patch -p1 -i "$srcdir/ssl_hostname.patch" + patch -p1 -i "${srcdir}/ssl_hostname.patch" # Patch, ref FS#40179 - patch -p1 -i "$srcdir/cert.patch" + patch -p1 -i "${srcdir}/cert.patch" popd diff --git a/mingw-w64-python-icu/PKGBUILD b/mingw-w64-python-icu/PKGBUILD index 161d30edc1..c681645244 100644 --- a/mingw-w64-python-icu/PKGBUILD +++ b/mingw-w64-python-icu/PKGBUILD @@ -1,10 +1,11 @@ # Contributor: Josip _realname=PyICU +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-icu" "${MINGW_PACKAGE_PREFIX}-python3-icu") pkgver=1.9.2 -pkgrel=1 -pkgdesc="Python extension wrapping the ICU C++ API" +pkgrel=2 +pkgdesc="Python extension wrapping the ICU C++ API (mingw-w64)" arch=('any') license=('BSD') url="https://pypi.python.org/pypi/PyICU/" diff --git a/mingw-w64-python-ipython/PKGBUILD b/mingw-w64-python-ipython/PKGBUILD index 3894975b7c..a084d01907 100644 --- a/mingw-w64-python-ipython/PKGBUILD +++ b/mingw-w64-python-ipython/PKGBUILD @@ -1,8 +1,9 @@ # Maintainer: Kyle Kauffman _realname=ipython -pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") -pkgver=3.2.0 +pkgbase=mingw-w64-python-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") +pkgver=4.0.0 pkgrel=1 pkgdesc="An enhanced Interactive Python shell (mingw-w64)" arch=('any') @@ -14,7 +15,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-sqlite3" source=("https://pypi.python.org/packages/source/i/ipython/${_realname}-${pkgver}.tar.gz" 0001-unimplemented-readline-calls.patch) -md5sums=('41aa9b34f39484861e77c46ffb29b699' +md5sums=('c2fecbcf1c0fbdc82625c77a50733dd6' '0b1702a800266e6bd841708270cf9e80') prepare() { @@ -62,10 +63,6 @@ package_python3-ipython() { # "${MINGW_PACKAGE_PREFIX}-python3-tornado: for ipython notebook" all_build ${interpreter} - - for file_script in ipcluster ipcontroller ipengine iptest ipython; do - rm ${pkgdir}${MINGW_PREFIX}/bin/${file_script}{,.cmd} - done install -Dm644 docs/source/about/license_and_copyright.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/ipython/LICENSE" @@ -86,6 +83,9 @@ package_python2-ipython() { # "${MINGW_PACKAGE_PREFIX}-python2-tornado: for ipython notebook" all_build ${interpreter} + for file_script in iptest ipython; do + rm ${pkgdir}${MINGW_PREFIX}/bin/${file_script}{,.cmd} + done install -Dm644 docs/source/about/license_and_copyright.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/ipython2/LICENSE" diff --git a/mingw-w64-python-jinja/PKGBUILD b/mingw-w64-python-jinja/PKGBUILD index c1d8206c92..7e00f848d6 100644 --- a/mingw-w64-python-jinja/PKGBUILD +++ b/mingw-w64-python-jinja/PKGBUILD @@ -1,8 +1,9 @@ # Maintainer: Alexey Pavlov _realname=jinja +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=2.7.3 +pkgver=2.8 pkgrel=1 pkgdesc="A simple pythonic template language written in Python (mingw-w64)" arch=('any') @@ -13,7 +14,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools" "${MINGW_PACKAGE_PREFIX}-python2-setuptools" "${MINGW_PACKAGE_PREFIX}-python2-markupsafe") source=(http://pypi.python.org/packages/source/J/Jinja2/Jinja2-${pkgver}.tar.gz) -sha256sums=('2e24ac5d004db5714976a04ac0e80c6df6e47e98c354cb2c0d82f8879d4f8fdb') +sha256sums=('bc1ff2ff88dbfacefde4ddde471d1417d3b304e8df103a7a9437d47269201bf4') build() { cd "${srcdir}" @@ -27,7 +28,6 @@ build() { } package_python3-jinja() { - pkgdesc='Python3 documentation generator' depends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools" "${MINGW_PACKAGE_PREFIX}-python3-markupsafe") cd "${srcdir}/python3-build" diff --git a/mingw-w64-python-lhafile/PKGBUILD b/mingw-w64-python-lhafile/PKGBUILD index cea0993304..b5d0aca634 100644 --- a/mingw-w64-python-lhafile/PKGBUILD +++ b/mingw-w64-python-lhafile/PKGBUILD @@ -1,10 +1,11 @@ # Maintainer: Frode Solheim _realname=python-lhafile +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-lhafile" "${MINGW_PACKAGE_PREFIX}-python3-lhafile") -pkgver=0.1.0fs4 -pkgrel=3 +pkgver=0.2.1 +pkgrel=1 pkgdesc="LHA module for Python (mingw-w64)" arch=('any') license=('BSD') @@ -13,7 +14,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-python3") options=('staticlibs' 'strip' '!debug') source=(http://fengestad.no/python-lhafile/python-lhafile-${pkgver}.tar.gz) -md5sums=('cedac40d5363bf49b51528522bf05c60') +md5sums=('bc63d61a1b562bbbc52118c168f8cb5e') prepare() { cp -a python-lhafile-${pkgver} python2-lhafile-${pkgver}-${CARCH} diff --git a/mingw-w64-python-lxml/PKGBUILD b/mingw-w64-python-lxml/PKGBUILD index 94046c611d..cc05587fea 100644 --- a/mingw-w64-python-lxml/PKGBUILD +++ b/mingw-w64-python-lxml/PKGBUILD @@ -2,26 +2,25 @@ # Contributor: Ray Donnelly _realname=lxml -pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python-${_realname}-docs") -pkgver=3.4.4 -pkgrel=2 +pkgver=3.5.0b1 +pkgrel=1 arch=('any') license=('BSD' 'custom') url="http://lxml.de/" -depends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-python3") makedepends=("${MINGW_PACKAGE_PREFIX}-python2" - "${MINGW_PACKAGE_PREFIX}-python3" - "${MINGW_PACKAGE_PREFIX}-libxslt" - "${MINGW_PACKAGE_PREFIX}-python2-cssselect" - "${MINGW_PACKAGE_PREFIX}-python3-cssselect") + "${MINGW_PACKAGE_PREFIX}-python3" + "${MINGW_PACKAGE_PREFIX}-libxslt" + "${MINGW_PACKAGE_PREFIX}-python2-cssselect" + "${MINGW_PACKAGE_PREFIX}-python3-cssselect") source=(http://pypi.python.org/packages/source/l/lxml/${_realname}-${pkgver}.tar.gz{,.asc} mingw-python-fix.patch use-distutils-get_platform.patch) -md5sums=('a9a65972afc173ec7a39c585f4eea69c' +md5sums=('c6eb532ab172a91a590de7ad4d5fbcc9' 'SKIP' 'e07163fc1e02cab5fa6009af35d5f823' - '5268f79eb2a69b05da73d357ec8184b1') + '834321a91985c6d5e55de65c1ea1793b') prepare() { cd "${srcdir}/${_realname}-${pkgver}" diff --git a/mingw-w64-python-lxml/use-distutils-get_platform.patch b/mingw-w64-python-lxml/use-distutils-get_platform.patch index 6867ca674a..9813e77a12 100644 --- a/mingw-w64-python-lxml/use-distutils-get_platform.patch +++ b/mingw-w64-python-lxml/use-distutils-get_platform.patch @@ -1,11 +1,11 @@ ---- lxml-3.3.1/setupinfo.py.orig 2014-03-05 01:32:55.698960400 +0000 -+++ lxml-3.3.1/setupinfo.py 2014-03-05 01:47:39.983538500 +0000 -@@ -1,6 +1,7 @@ - import sys, os, os.path +--- lxml-3.5.0b1/setupinfo.py.orig 2014-03-05 01:32:55.698960400 +0000 ++++ lxml-3.5.0b1/setupinfo.py 2014-03-05 01:47:39.983538500 +0000 +@@ -2,6 +2,7 @@ from distutils.core import Extension - from distutils.errors import DistutilsOptionError + from distutils.errors import CompileError, DistutilsOptionError + from distutils.command.build_ext import build_ext as _build_ext +from distutils.util import get_platform - from versioninfo import get_base_dir, split_version + from versioninfo import get_base_dir try: @@ -180,7 +181,7 @@ diff --git a/mingw-w64-python-mako/PKGBUILD b/mingw-w64-python-mako/PKGBUILD index ff57f6899d..f9fe08731a 100644 --- a/mingw-w64-python-mako/PKGBUILD +++ b/mingw-w64-python-mako/PKGBUILD @@ -2,9 +2,10 @@ # Contributor: Ray Donnelly _realname=mako +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=1.0.1 -pkgrel=3 +pkgver=1.0.2 +pkgrel=1 pkgdesc="A super-fast templating language that borrows the best ideas from the existing templating languages (mingw-w64)" arch=('any') license=('custom') @@ -19,7 +20,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python2-nose" "${MINGW_PACKAGE_PREFIX}-python3-nose") options=('staticlibs') source=("https://pypi.python.org/packages/source/M/Mako/Mako-${pkgver}.tar.gz") -md5sums=('9f0aafd177b039ef67b90ea350497a54') +md5sums=('d0bb0b15d94d0d455fbaf047d312cc2d') prepare() { cd ${srcdir} diff --git a/mingw-w64-python-markupsafe/PKGBUILD b/mingw-w64-python-markupsafe/PKGBUILD index b6be9609d5..b8e240ceda 100644 --- a/mingw-w64-python-markupsafe/PKGBUILD +++ b/mingw-w64-python-markupsafe/PKGBUILD @@ -1,9 +1,10 @@ # Maintainer: Alexey Pavlov _realname=markupsafe +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.23 -pkgrel=3 +pkgrel=4 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python (mingw-w64)" arch=('any') license=('custom') diff --git a/mingw-w64-python-matplotlib/PKGBUILD b/mingw-w64-python-matplotlib/PKGBUILD index 6a5ccde64a..6b0f52b1f1 100644 --- a/mingw-w64-python-matplotlib/PKGBUILD +++ b/mingw-w64-python-matplotlib/PKGBUILD @@ -1,8 +1,9 @@ # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com > _realname=matplotlib -pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") -pkgver=1.4.3 +pkgbase=mingw-w64-python-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") +pkgver=1.5.0rc2 pkgrel=1 pkgdesc="A python plotting library, making publication quality plots (mingw-w64)" arch=('any') @@ -28,8 +29,8 @@ makedepends=( source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/matplotlib/matplotlib/archive/v${pkgver}.tar.gz" setupext.py.patch setup.py.patch) -md5sums=('f1bb5e2317cceed593119fad2071e236' - '24b0ed92631fd0adb2ae11ff1ef31490' +md5sums=('a2a75e5c12bb480ca927913df0995aa9' + 'cd1ef742fb22f91cfed3c36dd4a6f1e1' 'b5f64259a266ccc517586debb8c4e5c8') noextract=("${_realname}-${pkgver}.tar.gz") diff --git a/mingw-w64-python-matplotlib/setupext.py.patch b/mingw-w64-python-matplotlib/setupext.py.patch index ccb387a797..aa7f2d21af 100644 --- a/mingw-w64-python-matplotlib/setupext.py.patch +++ b/mingw-w64-python-matplotlib/setupext.py.patch @@ -56,7 +56,7 @@ return ext -@@ -247,11 +255,11 @@ +@@ -247,16 +255,16 @@ """ Determines whether pkg-config exists on this machine. """ @@ -64,9 +64,14 @@ + if sys.platform == 'win32' and not MSYS: self.has_pkgconfig = False else: + try: + self.pkg_config = os.environ['PKG_CONFIG'] + except KeyError: + self.pkg_config = 'pkg-config' + self.set_pkgconfig_path() -- status, output = getstatusoutput("pkg-config --help") -+ status, output = getstatusoutput('sh -c "pkg-config --help"') +- status, output = getstatusoutput(self.pkg_config + " --help") ++ status, output = getstatusoutput('sh -c "'+self.pkg_config+' --help"') self.has_pkgconfig = (status == 0) if not self.has_pkgconfig: print("IMPORTANT WARNING:") @@ -102,8 +107,8 @@ return None status, output = getstatusoutput( -- "pkg-config %s --modversion" % (package)) -+ 'sh -c "pkg-config %s --modversion"' % (package)) +- self.pkg_config + " %s --modversion" % (package)) ++ 'sh -c "'+self.pkg_config+' %s --modversion"' % (package)) if status == 0: return output return None diff --git a/mingw-w64-python-nose/PKGBUILD b/mingw-w64-python-nose/PKGBUILD index c83cd7bd0c..83d8995aac 100644 --- a/mingw-w64-python-nose/PKGBUILD +++ b/mingw-w64-python-nose/PKGBUILD @@ -2,9 +2,10 @@ # Contributor: Ray Donnelly _realname=nose +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.3.7 -pkgrel=2 +pkgrel=3 pkgdesc="A discovery-based unittest extension (mingw-w64)" arch=('any') license=('LGPL-2.1') diff --git a/mingw-w64-python-nuitka/PKGBUILD b/mingw-w64-python-nuitka/PKGBUILD index 9360dcfe6b..8f6177acfd 100644 --- a/mingw-w64-python-nuitka/PKGBUILD +++ b/mingw-w64-python-nuitka/PKGBUILD @@ -1,9 +1,10 @@ # Maintainer: Alexey Pavlov _realname=nuitka +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.5.14.3 -pkgrel=1 +pkgrel=2 pkgdesc="Python to native compiler (mingw-w64)" arch=('any') license=('APACHE') diff --git a/mingw-w64-python-numexpr/PKGBUILD b/mingw-w64-python-numexpr/PKGBUILD index 65005c98e4..40aeb34ccc 100644 --- a/mingw-w64-python-numexpr/PKGBUILD +++ b/mingw-w64-python-numexpr/PKGBUILD @@ -1,8 +1,9 @@ # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com > _realname=numexpr +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") -pkgver=2.4.3 +pkgver=2.4.4 pkgrel=1 pkgdesc="Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas. (mingw-w64)" arch=('any') @@ -13,8 +14,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2-numpy" "${MINGW_PACKAGE_PREFIX}-python2-setuptools" "${MINGW_PACKAGE_PREFIX}-python3-setuptools" "${MINGW_PACKAGE_PREFIX}-gcc") -source=("$_realname-${pkgver}.tar.gz"::https://github.com/pydata/numexpr/archive/v${pkgver}.tar.gz) -md5sums=('4b701ee609a1faa463510c483405d24f') +source=("${_realname}-${pkgver}.tar.gz"::https://github.com/pydata/numexpr/archive/v${pkgver}.tar.gz) +md5sums=('029849d8d9ca89d3bf3bd6695d4e0a4c') prepare() { cp -a ${_realname}-${pkgver} $_realname-py2-${pkgver} diff --git a/mingw-w64-python-pandas/PKGBUILD b/mingw-w64-python-pandas/PKGBUILD index 8109054325..c1c5eb1a85 100644 --- a/mingw-w64-python-pandas/PKGBUILD +++ b/mingw-w64-python-pandas/PKGBUILD @@ -1,9 +1,10 @@ # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com > _realname=pandas +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.16.2 -pkgrel=1 +pkgrel=2 pkgdesc="Cross-section and time series data analysis toolkit (mingw-w64)" arch=('any') url="http://pandas.pydata.org/" diff --git a/mingw-w64-python-patsy/PKGBUILD b/mingw-w64-python-patsy/PKGBUILD index b190013af6..f1f1535ca4 100644 --- a/mingw-w64-python-patsy/PKGBUILD +++ b/mingw-w64-python-patsy/PKGBUILD @@ -1,9 +1,10 @@ # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com > _realname=patsy +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=0.3.0 -pkgrel=2 +pkgver=0.4.0 +pkgrel=1 pkgdesc="A Python package for describing statistical models and for building design matrices (mingw-w64)" arch=('any') url="https://github.com/pydata/patsy" @@ -13,7 +14,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2-numpy" "${MINGW_PACKAGE_PREFIX}-python2-setuptools" "${MINGW_PACKAGE_PREFIX}-python3-setuptools") source=("https://pypi.python.org/packages/source/p/patsy/patsy-${pkgver}.zip") -md5sums=('7545518b413136ba8343dcebea07e5e2') +md5sums=('9043a0d0695eaf5ec021676ccb0eb95d') prepare() { cd "${srcdir}" diff --git a/mingw-w64-python-pip/PKGBUILD b/mingw-w64-python-pip/PKGBUILD index 60ba8e2e24..7b0f1eeed9 100644 --- a/mingw-w64-python-pip/PKGBUILD +++ b/mingw-w64-python-pip/PKGBUILD @@ -1,6 +1,7 @@ # Maintainer: Alexey Pavlov _realname=pip +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=7.1.2 pkgrel=1 @@ -33,9 +34,7 @@ build() { package_python2-pip() { depends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-python2-setuptools") - pushd ${MINGW_PREFIX} > /dev/null - local _mingw_prefix=`pwd -W` - popd > /dev/null + local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX}) cd "${srcdir}/${_realname}-python2" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ @@ -49,13 +48,11 @@ package_python2-pip() { package_python3-pip() { depends=("${MINGW_PACKAGE_PREFIX}-python3" "${MINGW_PACKAGE_PREFIX}-python3-setuptools") - pushd ${MINGW_PREFIX} > /dev/null - local _mingw_prefix=`pwd -W` - popd > /dev/null + local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX}) cd "${srcdir}/${_realname}-python3" 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 + ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX#\/} --root="${pkgdir}" --optimize=1 --skip-build -v # Remove conflicted files rm -f ${pkgdir}${MINGW_PREFIX}/bin/pip{.exe,.exe.manifest,-script.py} diff --git a/mingw-w64-python-pygments/PKGBUILD b/mingw-w64-python-pygments/PKGBUILD index 8ae977c7ed..dbb0030909 100644 --- a/mingw-w64-python-pygments/PKGBUILD +++ b/mingw-w64-python-pygments/PKGBUILD @@ -2,10 +2,10 @@ # Contributor: Ray Donnelly _realname=pygments -pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2.0.2 -pkgrel=3 +pkgrel=4 pkgdesc="Python syntax highlighter (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-pyparsing/PKGBUILD b/mingw-w64-python-pyparsing/PKGBUILD index 293cd37638..69acf09821 100644 --- a/mingw-w64-python-pyparsing/PKGBUILD +++ b/mingw-w64-python-pyparsing/PKGBUILD @@ -1,17 +1,16 @@ # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com > _realname=pyparsing +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2.0.3 -pkgrel=1 +pkgrel=2 pkgdesc='General parsing module for Python (mingw-w64)' arch=('any') url='http://pyparsing.wikispaces.com' license=('MIT') -makedepends=( - "${MINGW_PACKAGE_PREFIX}-python3" - "${MINGW_PACKAGE_PREFIX}-python2" -) +makedepends=("${MINGW_PACKAGE_PREFIX}-python3" + "${MINGW_PACKAGE_PREFIX}-python2") source=("http://downloads.sourceforge.net/pyparsing/pyparsing-${pkgver}.tar.gz") sha256sums=('06e729e1cbf5274703b1f47b6135ed8335999d547f9d8cf048b210fb8ebf844f') diff --git a/mingw-w64-python-pytz/PKGBUILD b/mingw-w64-python-pytz/PKGBUILD index 8a8c833286..59fd5cb9ae 100644 --- a/mingw-w64-python-pytz/PKGBUILD +++ b/mingw-w64-python-pytz/PKGBUILD @@ -1,8 +1,9 @@ # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com > _realname=pytz -pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") -pkgver=2015.4 +pkgbase=mingw-w64-python-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") +pkgver=2015.6 pkgrel=1 pkgdesc="Cross platform time zone library for Python (mingw-w64)" arch=('any') @@ -11,7 +12,7 @@ license=("MIT") makedepends=("${MINGW_PACKAGE_PREFIX}-python3" "${MINGW_PACKAGE_PREFIX}-python2") source=(http://pypi.python.org/packages/source/p/pytz/pytz-${pkgver}.tar.bz2) -md5sums=('39f7375c4b1fa34cdcb4b4765d08f817') +md5sums=('895e42abf59847136bc12ce747775b38') prepare() { cd "${srcdir}" @@ -20,10 +21,10 @@ prepare() { } check(){ - cd ${srcdir}/build-python2/pytz/tests - ${MINGW_PREFIX}/bin/python2 test_tzinfo.py - cd ${srcdir}/build-python3/pytz/tests - ${MINGW_PREFIX}/bin/python3 test_tzinfo.py + cd ${srcdir}/build-python2/pytz/tests + ${MINGW_PREFIX}/bin/python2 test_tzinfo.py + cd ${srcdir}/build-python3/pytz/tests + ${MINGW_PREFIX}/bin/python3 test_tzinfo.py } package_python3-pytz() { diff --git a/mingw-w64-python-reportlab/PKGBUILD b/mingw-w64-python-reportlab/PKGBUILD index 99ea76b230..cb39ff581e 100644 --- a/mingw-w64-python-reportlab/PKGBUILD +++ b/mingw-w64-python-reportlab/PKGBUILD @@ -2,10 +2,10 @@ # Contributor: Ray Donnelly _realname=reportlab -pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=3.0 -pkgrel=3 +pkgrel=4 pkgdesc="A proven industry-strength PDF generating solution (mingw-w64)" arch=('any') license=('custom') diff --git a/mingw-w64-python-scipy/PKGBUILD b/mingw-w64-python-scipy/PKGBUILD index 65cda35891..5318637075 100644 --- a/mingw-w64-python-scipy/PKGBUILD +++ b/mingw-w64-python-scipy/PKGBUILD @@ -1,9 +1,10 @@ # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com > _realname=scipy +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.16.0 -pkgrel=1 +pkgrel=2 pkgdesc="SciPy is open-source software for mathematics, science, and engineering. (mingw-w64)" arch=('any') url="http://www.scipy.org/" diff --git a/mingw-w64-python-six/PKGBUILD b/mingw-w64-python-six/PKGBUILD index ea399573d5..34dd7e75e7 100644 --- a/mingw-w64-python-six/PKGBUILD +++ b/mingw-w64-python-six/PKGBUILD @@ -1,19 +1,18 @@ # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com > _realname=six +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") -pkgver=1.9.0 +pkgver=1.10.0 pkgrel=1 pkgdesc="Python 2 and 3 compatibility utilities (mingw-w64)" arch=('any') url="http://pypi.python.org/pypi/six/" license=('MIT') -makedepends=( - "${MINGW_PACKAGE_PREFIX}-python2" - "${MINGW_PACKAGE_PREFIX}-python3" -) +makedepends=("${MINGW_PACKAGE_PREFIX}-python2" + "${MINGW_PACKAGE_PREFIX}-python3") source=(http://pypi.python.org/packages/source/s/six/six-${pkgver}.tar.gz) -md5sums=('476881ef4012262dfc8adc645ee786c4') +md5sums=('34eed507548117b2ab523ab14b2f8b55') prepare() { cd "${srcdir}" diff --git a/mingw-w64-python-snowballstemmer/PKGBUILD b/mingw-w64-python-snowballstemmer/PKGBUILD index 59a63d20ff..bea2152ff2 100644 --- a/mingw-w64-python-snowballstemmer/PKGBUILD +++ b/mingw-w64-python-snowballstemmer/PKGBUILD @@ -1,9 +1,10 @@ # Maintainer: Alexey Pavlov _realname=snowballstemmer +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Snowball stemming library collection for Python (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-sphinx-alabaster-theme/PKGBUILD b/mingw-w64-python-sphinx-alabaster-theme/PKGBUILD index 65ceb8c553..f3534c12e6 100644 --- a/mingw-w64-python-sphinx-alabaster-theme/PKGBUILD +++ b/mingw-w64-python-sphinx-alabaster-theme/PKGBUILD @@ -1,8 +1,9 @@ # Maintainer: Alexey Pavlov _realname=sphinx-alabaster-theme +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=0.7.4 +pkgver=0.7.6 pkgrel=1 pkgdesc="Modified Kr Sphinx doc theme (mingw-w64)" arch=('any') @@ -12,7 +13,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools" "${MINGW_PACKAGE_PREFIX}-python3-setuptools") options=('staticlibs') source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/bitprophet/alabaster/archive/${pkgver}.tar.gz") -md5sums=('ed0f1f6cba60e930cba5ed45276b5323') +md5sums=('940d47184c4d67d9e1943ba2e5b15a65') prepare() { cd ${srcdir} diff --git a/mingw-w64-python-sphinx/PKGBUILD b/mingw-w64-python-sphinx/PKGBUILD index 7a5f46474f..d463fbd904 100644 --- a/mingw-w64-python-sphinx/PKGBUILD +++ b/mingw-w64-python-sphinx/PKGBUILD @@ -2,9 +2,10 @@ # Contributor: Ray Donnelly _realname=sphinx +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.3.1 -pkgrel=3 +pkgrel=4 pkgdesc="A discovery-based unittest extension (mingw-w64)" arch=('any') license=('LGPL-2.1') diff --git a/mingw-w64-python-sphinx_rtd_theme/PKGBUILD b/mingw-w64-python-sphinx_rtd_theme/PKGBUILD index f18fec1dd0..67b61d68f1 100644 --- a/mingw-w64-python-sphinx_rtd_theme/PKGBUILD +++ b/mingw-w64-python-sphinx_rtd_theme/PKGBUILD @@ -1,8 +1,9 @@ # Maintainer: Alexey Pavlov _realname=sphinx_rtd_theme +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=0.1.8 +pkgver=0.1.9 pkgrel=1 pkgdesc="Python Sphinx Read The Docs Theme (mingw-w64)" arch=('any') @@ -12,7 +13,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools" "${MINGW_PACKAGE_PREFIX}-python3-setuptools") options=('staticlibs') source=("https://pypi.python.org/packages/source/s/${_realname}/${_realname}-${pkgver}.tar.gz") -md5sums=('713ce7c53239449bdd799385577329ee') +md5sums=('86a25c8d47147c872e42dc84cc66f97b') prepare() { cd ${srcdir} diff --git a/mingw-w64-python-statsmodels/PKGBUILD b/mingw-w64-python-statsmodels/PKGBUILD index 5e08b01061..6deef53f1d 100644 --- a/mingw-w64-python-statsmodels/PKGBUILD +++ b/mingw-w64-python-statsmodels/PKGBUILD @@ -1,29 +1,28 @@ # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com > _realname=statsmodels +pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") pkgver=0.6.1 -pkgrel=1 -pkgdesc="Statistical computations and models for use with SciPy. (mingw-w64)" +pkgrel=2 +pkgdesc="Statistical computations and models for use with SciPy (mingw-w64)" arch=('any') url="http://statsmodels.sourceforge.net/" license=('BSD') -makedepends=( - "${MINGW_PACKAGE_PREFIX}-python2-scipy" - "${MINGW_PACKAGE_PREFIX}-python3-scipy" - "${MINGW_PACKAGE_PREFIX}-python2-pandas" - "${MINGW_PACKAGE_PREFIX}-python3-pandas" - "${MINGW_PACKAGE_PREFIX}-python2-patsy" - "${MINGW_PACKAGE_PREFIX}-python3-patsy" - "${MINGW_PACKAGE_PREFIX}-cython" - "${MINGW_PACKAGE_PREFIX}-cython2" - "${MINGW_PACKAGE_PREFIX}-python2-setuptools" - "${MINGW_PACKAGE_PREFIX}-python3-setuptools" - "${MINGW_PACKAGE_PREFIX}-cython" - "${MINGW_PACKAGE_PREFIX}-cython2" - "${MINGW_PACKAGE_PREFIX}-gcc" -) +makedepends=("${MINGW_PACKAGE_PREFIX}-python2-scipy" + "${MINGW_PACKAGE_PREFIX}-python3-scipy" + "${MINGW_PACKAGE_PREFIX}-python2-pandas" + "${MINGW_PACKAGE_PREFIX}-python3-pandas" + "${MINGW_PACKAGE_PREFIX}-python2-patsy" + "${MINGW_PACKAGE_PREFIX}-python3-patsy" + "${MINGW_PACKAGE_PREFIX}-cython" + "${MINGW_PACKAGE_PREFIX}-cython2" + "${MINGW_PACKAGE_PREFIX}-python2-setuptools" + "${MINGW_PACKAGE_PREFIX}-python3-setuptools" + "${MINGW_PACKAGE_PREFIX}-cython" + "${MINGW_PACKAGE_PREFIX}-cython2" + "${MINGW_PACKAGE_PREFIX}-gcc") source=("https://pypi.python.org/packages/source/s/statsmodels/statsmodels-${pkgver}.tar.gz") md5sums=('f7580ebf7d2a2c9b87abfad190dcb9a3') diff --git a/mingw-w64-python3-cairo/PKGBUILD b/mingw-w64-python3-cairo/PKGBUILD index 33f974a343..bf095d2ced 100644 --- a/mingw-w64-python3-cairo/PKGBUILD +++ b/mingw-w64-python3-cairo/PKGBUILD @@ -1,9 +1,10 @@ # Maintainer: Alexey Pavlov _realname=pycairo +pkgbase=mingw-w64-python3-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-python3-cairo" pkgver=1.10.0 -pkgrel=4 +pkgrel=5 pkgdesc="Python2 bindings for the cairo graphics library (mingw-w64)" url="http://www.cairographics.org/pycairo" arch=('any') diff --git a/mingw-w64-sip/PKGBUILD b/mingw-w64-sip/PKGBUILD index a8d5efaf09..9de5673bde 100644 --- a/mingw-w64-sip/PKGBUILD +++ b/mingw-w64-sip/PKGBUILD @@ -5,7 +5,7 @@ _realname=sip pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=4.16.9 -pkgrel=1 +pkgrel=2 pkgdesc="Tool to create Python bindings for C and C++ libraries (mingw-w64)" arch=('any') license=('GPL') @@ -54,8 +54,8 @@ package_python3-sip() { cd python3-${MINGW_CHOST} make DESTDIR="${pkgdir}" install -C siplib - install -Dm644 sipconfig.py "${pkgdir}${MINGW_PREFIX}"/lib/python3.4/site-packages/sipconfig.py - install -Dm644 sipdistutils.py "${pkgdir}${MINGW_PREFIX}"/lib/python3.4/site-packages/sipdistutils.py + install -Dm644 sipconfig.py "${pkgdir}${MINGW_PREFIX}"/lib/python3.5/site-packages/sipconfig.py + install -Dm644 sipdistutils.py "${pkgdir}${MINGW_PREFIX}"/lib/python3.5/site-packages/sipdistutils.py install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-sip/LICENSE" }