[arch-commits] Commit in python-scipy/repos/community-x86_64 (3 files)

Antonio Rojas arojas at archlinux.org
Sat Jan 5 12:08:27 UTC 2019


    Date: Saturday, January 5, 2019 @ 12:08:26
  Author: arojas
Revision: 420673

archrelease: copy trunk to community-x86_64

Added:
  python-scipy/repos/community-x86_64/PKGBUILD
    (from rev 420672, python-scipy/trunk/PKGBUILD)
  python-scipy/repos/community-x86_64/fix-utf8.patch
    (from rev 420672, python-scipy/trunk/fix-utf8.patch)
Deleted:
  python-scipy/repos/community-x86_64/PKGBUILD

----------------+
 PKGBUILD       |  195 ++++++++++++++++++++++++++++---------------------------
 fix-utf8.patch |   29 ++++++++
 2 files changed, 130 insertions(+), 94 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-05 12:08:01 UTC (rev 420672)
+++ PKGBUILD	2019-01-05 12:08:26 UTC (rev 420673)
@@ -1,94 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: Ray Rashif <schiv at archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
-# Contributor: Bodor Dávid Gábor <david.gabor.bodor at gmail.com>
-# Contributor: Andrzej Giniewicz <gginiu at gmail.com>
-
-_name=scipy
-pkgname=('python-scipy' 'python2-scipy')
-pkgver=1.2.0
-pkgrel=1
-pkgdesc="SciPy is open-source software for mathematics, science, and engineering."
-arch=('x86_64')
-url="http://www.scipy.org/"
-license=('BSD')
-makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy' 'python-setuptools' 'python2-setuptools')
-checkdepends=('python-pytest' 'python2-pytest')
-#source=("https://github.com/scipy/scipy/releases/download/v${pkgver}/scipy-${pkgver}.tar.xz")
-source=("https://pypi.python.org/packages/source/${_name:0:1}/${_name}/${_name}-${pkgver}.tar.gz")
-md5sums=('e57011507865b0b702aff6077d412e03')
-
-build() {
-  # required for gfortran
-  export LDFLAGS="-Wall -shared"
-
-  # 2 builds
-  cp -r scipy-${pkgver} scipy-${pkgver}-py2
-
-  # build for python3
-  cd scipy-${pkgver}
-  python3 setup.py config_fc --fcompiler=gnu95 build
-
-  # build for python2
-  cd ../scipy-${pkgver}-py2
-
-  for file in $(find . -name '*.py' -print); do
-       sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-       sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-  done
-
-  python2 setup.py config_fc --fcompiler=gnu95 build
-}
-
-check() {
-  # we need to do a temp install so we can import scipy
-  # also, the tests must not be run from the scipy source directory
-  export LDFLAGS="-Wall -shared"
-
-  cd ${srcdir}/scipy-${pkgver}
-  python3 setup.py config_fc --fcompiler=gnu95 install \
-    --prefix=/usr --root=${srcdir}/test --optimize=1
-  export PYTHONPATH=${srcdir}/test/usr/lib/python3.7/site-packages
-  cd ${srcdir}
-  python -c "from scipy import test; test('full')"
-
-  cd ${srcdir}/scipy-${pkgver}-py2
-  python2 setup.py config_fc --fcompiler=gnu95 install \
-    --prefix=/usr --root=${srcdir}/test --optimize=1
-  export PYTHONPATH=${srcdir}/test/usr/lib/python2.7/site-packages
-  cd ${srcdir}
-  python2 -c "from scipy import test; test('full')"
-}
-
-package_python-scipy() {
-  depends=('python-numpy')
-  provides=('python3-scipy' 'scipy')
-  optdepends=('python-pillow: for image saving module')
-
-  cd scipy-${pkgver}
-  export LDFLAGS="-Wall -shared"
-
-  python3 setup.py config_fc --fcompiler=gnu95 install \
-    --prefix=/usr --root=${pkgdir} --optimize=1
-
-  install -Dm644 LICENSE.txt \
-    "${pkgdir}/usr/share/licenses/python-scipy/LICENSE"
-}
-
-package_python2-scipy() {
-  depends=('python2-numpy')
-  optdepends=('python2-pillow: for image saving module')
-  conflicts=('python-scipy<0.9.0')
-
-  cd scipy-${pkgver}-py2
-  export LDFLAGS="-Wall -shared"
-
-  python2 setup.py config_fc --fcompiler=gnu95 install \
-    --prefix=/usr --root=${pkgdir} --optimize=1
-
-  install -Dm644 LICENSE.txt \
-    "${pkgdir}/usr/share/licenses/python2-scipy/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: python-scipy/repos/community-x86_64/PKGBUILD (from rev 420672, python-scipy/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-01-05 12:08:26 UTC (rev 420673)
@@ -0,0 +1,101 @@
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: Ray Rashif <schiv at archlinux.org>
+# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
+# Contributor: Bodor Dávid Gábor <david.gabor.bodor at gmail.com>
+# Contributor: Andrzej Giniewicz <gginiu at gmail.com>
+
+_name=scipy
+pkgname=('python-scipy' 'python2-scipy')
+pkgver=1.2.0
+pkgrel=2
+pkgdesc="SciPy is open-source software for mathematics, science, and engineering."
+arch=('x86_64')
+url="http://www.scipy.org/"
+license=('BSD')
+makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy' 'python-setuptools' 'python2-setuptools')
+checkdepends=('python-pytest' 'python2-pytest')
+#source=("https://github.com/scipy/scipy/releases/download/v${pkgver}/scipy-${pkgver}.tar.xz")
+source=("https://pypi.python.org/packages/source/${_name:0:1}/${_name}/${_name}-${pkgver}.tar.gz"
+        fix-utf8.patch)
+md5sums=('e57011507865b0b702aff6077d412e03'
+         '20712d0338980270f5f3edca4b3f17e4')
+
+prepare() {
+  cd scipy-${pkgver}
+  patch -p1 -i ../fix-utf8.patch # Fix unicode issues that prevent importing scipy.stats on py2
+}
+
+build() {
+  # required for gfortran
+  export LDFLAGS="-Wall -shared"
+
+  # 2 builds
+  cp -r scipy-${pkgver} scipy-${pkgver}-py2
+
+  # build for python3
+  cd scipy-${pkgver}
+  python3 setup.py config_fc --fcompiler=gnu95 build
+
+  # build for python2
+  cd ../scipy-${pkgver}-py2
+
+  for file in $(find . -name '*.py' -print); do
+       sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
+       sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
+  done
+
+  python2 setup.py config_fc --fcompiler=gnu95 build
+}
+
+check() {
+  # we need to do a temp install so we can import scipy
+  # also, the tests must not be run from the scipy source directory
+  export LDFLAGS="-Wall -shared"
+
+  cd ${srcdir}/scipy-${pkgver}
+  python3 setup.py config_fc --fcompiler=gnu95 install \
+    --prefix=/usr --root=${srcdir}/test --optimize=1
+  export PYTHONPATH=${srcdir}/test/usr/lib/python3.7/site-packages
+  cd ${srcdir}
+  python -c "from scipy import test; test('full')"
+
+  cd ${srcdir}/scipy-${pkgver}-py2
+  python2 setup.py config_fc --fcompiler=gnu95 install \
+    --prefix=/usr --root=${srcdir}/test --optimize=1
+  export PYTHONPATH=${srcdir}/test/usr/lib/python2.7/site-packages
+  cd ${srcdir}
+  python2 -c "from scipy import test; test('full')"
+}
+
+package_python-scipy() {
+  depends=('python-numpy')
+  provides=('python3-scipy' 'scipy')
+  optdepends=('python-pillow: for image saving module')
+
+  cd scipy-${pkgver}
+  export LDFLAGS="-Wall -shared"
+
+  python3 setup.py config_fc --fcompiler=gnu95 install \
+    --prefix=/usr --root=${pkgdir} --optimize=1
+
+  install -Dm644 LICENSE.txt \
+    "${pkgdir}/usr/share/licenses/python-scipy/LICENSE"
+}
+
+package_python2-scipy() {
+  depends=('python2-numpy')
+  optdepends=('python2-pillow: for image saving module')
+  conflicts=('python-scipy<0.9.0')
+
+  cd scipy-${pkgver}-py2
+  export LDFLAGS="-Wall -shared"
+
+  python2 setup.py config_fc --fcompiler=gnu95 install \
+    --prefix=/usr --root=${pkgdir} --optimize=1
+
+  install -Dm644 LICENSE.txt \
+    "${pkgdir}/usr/share/licenses/python2-scipy/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: python-scipy/repos/community-x86_64/fix-utf8.patch (from rev 420672, python-scipy/trunk/fix-utf8.patch)
===================================================================
--- fix-utf8.patch	                        (rev 0)
+++ fix-utf8.patch	2019-01-05 12:08:26 UTC (rev 420673)
@@ -0,0 +1,29 @@
+From 4a8a35f2c27be9f209cfc6f347e7a57a4a62e693 Mon Sep 17 00:00:00 2001
+From: Eric Larson <larson.eric.d at gmail.com>
+Date: Wed, 19 Dec 2018 10:50:47 -0500
+Subject: [PATCH] FIX: Fix encoding lines
+
+---
+ scipy/stats/_continuous_distns.py   | 1 +
+ scipy/stats/_stats_mstats_common.py | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/scipy/stats/_continuous_distns.py b/scipy/stats/_continuous_distns.py
+index 44c05bb7d67..b48d7e7af32 100644
+--- a/scipy/stats/_continuous_distns.py
++++ b/scipy/stats/_continuous_distns.py
+@@ -1,3 +1,4 @@
++# -*- encoding: utf-8 -*-
+ #
+ # Author:  Travis Oliphant  2002-2011 with contributions from
+ #          SciPy Developers 2004-2011
+diff --git a/scipy/stats/_stats_mstats_common.py b/scipy/stats/_stats_mstats_common.py
+index e86c8287b48..be478da1f2a 100644
+--- a/scipy/stats/_stats_mstats_common.py
++++ b/scipy/stats/_stats_mstats_common.py
+@@ -1,3 +1,5 @@
++# -*- encoding: utf-8 -*-
++
+ from collections import namedtuple
+ 
+ import numpy as np



More information about the arch-commits mailing list