diff --git a/mingw-w64-python-ipykernel/PKGBUILD b/mingw-w64-python-ipykernel/PKGBUILD index 4442440a61..dd9acd74f3 100644 --- a/mingw-w64-python-ipykernel/PKGBUILD +++ b/mingw-w64-python-ipykernel/PKGBUILD @@ -3,16 +3,28 @@ _realname=ipykernel pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=4.8.2 -pkgrel=2 +pkgver=4.9.0 +pkgrel=1 pkgdesc="The ipython kernel for Jupyter (mingw-w64)" arch=('any') url="https://ipython.org/" license=('BSD') makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools" - "${MINGW_PACKAGE_PREFIX}-python3-setuptools") + "${MINGW_PACKAGE_PREFIX}-python3-setuptools" + "${MINGW_PACKAGE_PREFIX}-python2-ipython" + "${MINGW_PACKAGE_PREFIX}-python3-ipython" + "${MINGW_PACKAGE_PREFIX}-python2-backports.shutil_get_terminal_size" + "${MINGW_PACKAGE_PREFIX}-python3-pathlib2" + "${MINGW_PACKAGE_PREFIX}-python2-pathlib2" + "${MINGW_PACKAGE_PREFIX}-python3-pyzmq" + "${MINGW_PACKAGE_PREFIX}-python2-pyzmq" + "${MINGW_PACKAGE_PREFIX}-python2-jupyter_client" + "${MINGW_PACKAGE_PREFIX}-python3-jupyter_client" + "${MINGW_PACKAGE_PREFIX}-python2-jupyter_core" + "${MINGW_PACKAGE_PREFIX}-python3-jupyter_core" + "${MINGW_PACKAGE_PREFIX}-python2-enum34") source=("${_realname}-${pkgver}.tar.gz::https://github.com/ipython/${_realname}/archive/${pkgver}.tar.gz") -sha256sums=('8d603e0561c303a47e6b6445ca5770a477f094451ec4af3d395e429e8439cdb3') +sha256sums=('c4fa19dcdacde4499c85526d8d29fe840efcf9b144c5c7708fc44e329b868c71') prepare() { cd "${srcdir}/${_realname}-${pkgver}" diff --git a/mingw-w64-python-jupyter_client/PKGBUILD b/mingw-w64-python-jupyter_client/PKGBUILD index 2e41ab78dd..524fff6f9d 100644 --- a/mingw-w64-python-jupyter_client/PKGBUILD +++ b/mingw-w64-python-jupyter_client/PKGBUILD @@ -4,7 +4,7 @@ _realname=jupyter_client pkgbase=mingw-w64-python-jupyter_client pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=5.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="The reference implementation of the Jupyter protocol (mingw-w64)" arch=('any') url="https://jupyter.org/" @@ -34,6 +34,7 @@ all_build() { package_python3-jupyter_client() { local interpreter=python3 depends=("${MINGW_PACKAGE_PREFIX}-python3-ipykernel" + "${MINGW_PACKAGE_PREFIX}-python3-jupyter_core" "${MINGW_PACKAGE_PREFIX}-python3-pyzmq") all_build ${interpreter} @@ -44,6 +45,7 @@ package_python3-jupyter_client() { package_python2-jupyter_client() { local interpreter=python2 depends=("${MINGW_PACKAGE_PREFIX}-python2-ipykernel" + "${MINGW_PACKAGE_PREFIX}-python2-jupyter_core" "${MINGW_PACKAGE_PREFIX}-python2-pyzmq") all_build ${interpreter} diff --git a/mingw-w64-python-networkx/PKGBUILD b/mingw-w64-python-networkx/PKGBUILD index 1414c4193e..2f79d74b69 100644 --- a/mingw-w64-python-networkx/PKGBUILD +++ b/mingw-w64-python-networkx/PKGBUILD @@ -4,7 +4,7 @@ _realname=networkx pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}") -pkgver=2.1 +pkgver=2.2 pkgrel=1 pkgdesc="High-productivity software for complex networks (mingw-w64)" arch=('any') @@ -15,7 +15,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools" checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose" "${MINGW_PACKAGE_PREFIX}-python2-nose") source=("https://github.com/networkx/networkx/archive/${_realname}-${pkgver}.tar.gz") -sha256sums=('46aab610cdf15e680d944cafbf926a1d638f0cd2f1336b0f978b768a37d037f4') +sha256sums=('74efce06507cdc2e506c6b7d485a18617adc3a7f355e2dc48ca71c83929bc679') prepare() { cp -a networkx-${_realname}-${pkgver}{,-py2} @@ -31,10 +31,10 @@ build() { check() { cd ${srcdir}/networkx-${_realname}-${pkgver} - nosetests-3.5 + python3 setup.py nosetests cd ${srcdir}/networkx-${_realname}-${pkgver}-py2 - nosetests-2.7 + python2 setup.py nosetests } package_python3-networkx() { diff --git a/mingw-w64-python-olefile/PKGBUILD b/mingw-w64-python-olefile/PKGBUILD index 703663469a..ff3f543fc3 100644 --- a/mingw-w64-python-olefile/PKGBUILD +++ b/mingw-w64-python-olefile/PKGBUILD @@ -3,8 +3,8 @@ _realname=olefile pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=0.45.1 -pkgrel=2 +pkgver=0.46 +pkgrel=1 arch=('any') license=('BSD') url="https://www.decalage.info/olefile" @@ -13,7 +13,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools" "${MINGW_PACKAGE_PREFIX}-python3-setuptools") options=('staticlibs') source=(${_realname}-${pkgver}.tar.gz::https://github.com/decalage2/olefile/archive/v${pkgver}.tar.gz) -sha256sums=('5121154aa1d8d567aade99de73b3586add18468c0b4d1222b5a63ec57f0a51a1') +sha256sums=('11d1a3810e50956c9360a4c76f1ecebf3e54f9d8406f75127bd0d296638488f4') prepare() { cd ${srcdir} diff --git a/mingw-w64-python-openmdao/PKGBUILD b/mingw-w64-python-openmdao/PKGBUILD index c53db90a75..2395a7f8a7 100644 --- a/mingw-w64-python-openmdao/PKGBUILD +++ b/mingw-w64-python-openmdao/PKGBUILD @@ -4,7 +4,7 @@ _realname=openmdao pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}") -pkgver=1.7.4 +pkgver=2.4.0 pkgrel=1 pkgdesc="An open-source MDAO framework written in Python (mingw-w64)" arch=('any') @@ -12,19 +12,20 @@ license=('apache') url="https://openmdao.org/" makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools" "${MINGW_PACKAGE_PREFIX}-python2-setuptools") -source=("OpenMDAO-${pkgver}.tar.gz::https://github.com/OpenMDAO/OpenMDAO1/archive/${pkgver}.tar.gz") -sha256sums=('39393a99409e597d007edb8d11c92c5c47e7afd3365ff9be865a918ac2518b49') +source=("OpenMDAO-${pkgver}.tar.gz::https://github.com/OpenMDAO/OpenMDAO/archive/${pkgver}.tar.gz") +sha256sums=('d33d1ad3dd2e3bc63d886a02327c1b5e821ecfba89ffa94c21bb718e4fb7b158') prepare() { - cp -a OpenMDAO1-${pkgver}{,-py2} + sed -i "s|from distutils.core import setup|from setuptools import setup|" OpenMDAO-${pkgver}/setup.py + cp -a OpenMDAO-${pkgver}{,-py2} } build() { - cd ${srcdir}/OpenMDAO1-${pkgver} + cd ${srcdir}/OpenMDAO-${pkgver} python3 setup.py build - cd ${srcdir}/OpenMDAO1-${pkgver}-py2 + cd ${srcdir}/OpenMDAO-${pkgver}-py2 python2 setup.py build } @@ -46,10 +47,17 @@ package_python3-openmdao() { "${MINGW_PACKAGE_PREFIX}-python3-six" ) - cd OpenMDAO1-${pkgver} + cd OpenMDAO-${pkgver} MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 install -D -m644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE" + + local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) + # fix python command in files + for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do + sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \ + -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f} + done } package_python2-openmdao() { @@ -62,10 +70,27 @@ package_python2-openmdao() { "${MINGW_PACKAGE_PREFIX}-python2-six" ) - cd OpenMDAO1-${pkgver}-py2 + cd OpenMDAO-${pkgver}-py2 MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1 install -D -m644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE" + + local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) + # fix python command in files + for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do + sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \ + -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f} + done + + # Rename executables to not conflict with python3 versions + for f in {openmdao,run_test,webview,wingproj}; do + mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}.exe + if [ -f "${pkgdir}${MINGW_PREFIX}"/bin/${f}.exe.manifest ]; then + mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}.exe.manifest + sed -e "s|${f}|${f}2|g" -i "${pkgdir}${MINGW_PREFIX}"/bin/${f}2.exe.manifest + fi + mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}-script.py + done } package_mingw-w64-i686-python2-openmdao() { diff --git a/mingw-w64-python-pandas/PKGBUILD b/mingw-w64-python-pandas/PKGBUILD index 28ece9c80a..f0252460f3 100644 --- a/mingw-w64-python-pandas/PKGBUILD +++ b/mingw-w64-python-pandas/PKGBUILD @@ -3,7 +3,7 @@ _realname=pandas pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=0.23.3 +pkgver=0.23.4 pkgrel=1 pkgdesc="Cross-section and time series data analysis toolkit (mingw-w64)" arch=('any') @@ -19,7 +19,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2-numpy" "${MINGW_PACKAGE_PREFIX}-python3-setuptools" "${MINGW_PACKAGE_PREFIX}-gcc") source=(${_realname}-${pkgver}.tar.gz::"https://github.com/pandas-dev/${_realname}/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz") -sha256sums=('9cd3614b4e31a0889388ff1bd19ae857ad52658b33f776065793c293a29cf612') +sha256sums=('5b24ca47acf69222e82530e89111dd9d14f9b970ab2cd3a1c2c78f0c4fbba4f4') prepare() { diff --git a/mingw-w64-python-scikit-learn/001-10342.patch b/mingw-w64-python-scikit-learn/001-10342.patch deleted file mode 100644 index 8a9b37a20c..0000000000 --- a/mingw-w64-python-scikit-learn/001-10342.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -urN scikit-learn-0.19.1-orig/sklearn/metrics/cluster/setup.py scikit-learn-0.19.1/sklearn/metrics/cluster/setup.py ---- scikit-learn-0.19.1-orig/sklearn/metrics/cluster/setup.py 2018-05-10 13:03:30.982433283 +0200 -+++ scikit-learn-0.19.1/sklearn/metrics/cluster/setup.py 2018-05-10 13:08:30.205392486 +0200 -@@ -5,7 +5,7 @@ - - - def configuration(parent_package="", top_path=None): -- config = Configuration("metrics/cluster", parent_package, top_path) -+ config = Configuration("cluster", parent_package, top_path) - libraries = [] - if os.name == 'posix': - libraries.append('m') -diff -urN scikit-learn-0.19.1-orig/sklearn/metrics/setup.py scikit-learn-0.19.1/sklearn/metrics/setup.py ---- scikit-learn-0.19.1-orig/sklearn/metrics/setup.py 2018-05-10 13:03:30.982433283 +0200 -+++ scikit-learn-0.19.1/sklearn/metrics/setup.py 2018-05-10 13:08:45.125595586 +0200 -@@ -14,6 +14,7 @@ - if os.name == 'posix': - cblas_libs.append('m') - -+ config.add_subpackage('cluster') - config.add_extension("pairwise_fast", - sources=["pairwise_fast.pyx"], - include_dirs=[os.path.join('..', 'src', 'cblas'), -diff -urN scikit-learn-0.19.1-orig/sklearn/setup.py scikit-learn-0.19.1/sklearn/setup.py ---- scikit-learn-0.19.1-orig/sklearn/setup.py 2018-05-10 13:03:30.945766331 +0200 -+++ scikit-learn-0.19.1/sklearn/setup.py 2018-05-10 13:08:53.652377292 +0200 -@@ -51,7 +51,6 @@ - config.add_subpackage('feature_extraction') - config.add_subpackage('manifold') - config.add_subpackage('metrics') -- config.add_subpackage('metrics/cluster') - config.add_subpackage('neighbors') - config.add_subpackage('tree') - config.add_subpackage('svm') diff --git a/mingw-w64-python-scikit-learn/PKGBUILD b/mingw-w64-python-scikit-learn/PKGBUILD index 3816412f52..340a03a0ac 100644 --- a/mingw-w64-python-scikit-learn/PKGBUILD +++ b/mingw-w64-python-scikit-learn/PKGBUILD @@ -3,7 +3,7 @@ _realname=scikit-learn pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=0.19.1 +pkgver=0.19.2 pkgrel=2 pkgdesc="A set of python modules for machine learning and data mining (mingw-w64)" arch=('any') @@ -18,14 +18,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-cython2" "${MINGW_PACKAGE_PREFIX}-cython" ) -source=("${_realname}-${pkgver}.tar.gz::https://github.com/scikit-learn/${_realname}/archive/${pkgver}.tar.gz" - 001-10342.patch) -sha256sums=('2947f531ad52e81b2436b26608d8198778ac0b4baa7d2925db8b3b3fcb39c8a2' - 'fc2cc84cc0cc3f049f275813e8b5ff17efa14b03ae96be166946588b1bf28276') +source=("${_realname}-${pkgver}.tar.gz::https://github.com/scikit-learn/${_realname}/archive/${pkgver}.tar.gz") +sha256sums=('3024e3dc85ca8b26de33c2c5aec7c7a5f1f4a750463cb1378f1c61b4dc28ec58') prepare() { cd "$srcdir"/${_realname}-${pkgver} - patch -p1 -i ${srcdir}/001-10342.patch cd "$srcdir"