summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingbei Li2019-02-12 13:13:10 +0800
committerJingbei Li2019-02-12 13:13:10 +0800
commit32715533a0b86519f8f628b7fffef4d9fce7b068 (patch)
treead0d5df0f79b36529a6e0e40860d6238b73ef487
parent530f2fd35438c498b0a79aceb7f02fd997af0eb7 (diff)
downloadaur-32715533a0b86519f8f628b7fffef4d9fce7b068.tar.gz
removed fix-utf8.patch
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
-rw-r--r--fix-utf8.patch29
3 files changed, 1 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 46eb5145097b..a6fd311efb40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,10 +17,8 @@ pkgbase = python-scipy-mkl
depends = intel-mkl
source = https://github.com/scipy/scipy/releases/download/v1.2.1/scipy-1.2.1.tar.gz
source = build_python.sh
- source = fix-utf8.patch
sha256sums = e085d1babcb419bbe58e2e805ac61924dac4ca45a07c9fa081144739e500aa3c
sha256sums = 4970774d5c0b43c48634b01c1eabf7604dc3c98177fb5fed5585dc5be71183b4
- sha256sums = 8095c3ed80658019f8976ff7e298ac80939b3c2814dfdd372d63c04a285d419e
pkgname = python-scipy-mkl
depends = intel-compiler-base
diff --git a/PKGBUILD b/PKGBUILD
index ad938d0c327c..6c6ae635c7ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,16 +20,12 @@ checkdepends=('python-pytest' 'python2-pytest')
source=(
"https://github.com/scipy/scipy/releases/download/v${pkgver}/scipy-${pkgver}.tar.gz"
"build_python.sh"
- 'fix-utf8.patch'
)
sha256sums=('e085d1babcb419bbe58e2e805ac61924dac4ca45a07c9fa081144739e500aa3c'
- '4970774d5c0b43c48634b01c1eabf7604dc3c98177fb5fed5585dc5be71183b4'
- '8095c3ed80658019f8976ff7e298ac80939b3c2814dfdd372d63c04a285d419e')
+ '4970774d5c0b43c48634b01c1eabf7604dc3c98177fb5fed5585dc5be71183b4')
prepare() {
cd scipy-${pkgver}
- # Fix unicode issues that prevent importing scipy.stats on py2
- patch -p1 -i ../fix-utf8.patch
cd ${srcdir}
cp -r scipy-${pkgver} scipy-${pkgver}-py2
diff --git a/fix-utf8.patch b/fix-utf8.patch
deleted file mode 100644
index 0b9f82a03aa5..000000000000
--- a/fix-utf8.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4a8a35f2c27be9f209cfc6f347e7a57a4a62e693 Mon Sep 17 00:00:00 2001
-From: Eric Larson <larson.eric.d@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