From patchwork Sat Oct 21 18:15:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Brodkin X-Patchwork-Id: 828953 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZvnZCRh6"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yK9p44Zlmz9sPt for ; Sun, 22 Oct 2017 05:15:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0031B266B5; Sat, 21 Oct 2017 18:15:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CJZ2jJvsQ27H; Sat, 21 Oct 2017 18:15:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B7818266C6; Sat, 21 Oct 2017 18:15:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8770A1C2252 for ; Sat, 21 Oct 2017 18:15:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8199388C67 for ; Sat, 21 Oct 2017 18:15:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g8CMZGi3zA+C for ; Sat, 21 Oct 2017 18:15:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7A75988C62 for ; Sat, 21 Oct 2017 18:15:51 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id p75so2970388wmg.3 for ; Sat, 21 Oct 2017 11:15:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=O5aiJrJq9LyBS99wTvR6SnfiUejrH4n95T3jDJJQs0M=; b=ZvnZCRh6Inuzc6C66XaaLphpoOPc8QXzhljsL8Zp7Kx8LyOtKNnoBWOQuoTxwUG1e/ DzmCe6JXpoa4kzLRuXVoYTkd2QDqC7l1eSVhHF6ITSVjpGZwcpUrvXQhkWS+jFpc26OA C7s6gfIr6XSgYu5pQdnYULs4I/8doeUH4efnqQ3pD4KRs3YUJdiq6lYj68RpFY+Px3GF 9be7Nx4fBxDF+DTIs9mw2meSACfRlDxoLFj6PF8lxBFIGGx+jwgVdymhwnY5GwWUAQGG YLinloxcSDHSBHyds9lKrtFqETK2tgtz24ptk8WaFbefy0fYLg8zgtVdxautuipcxEQj kCIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=O5aiJrJq9LyBS99wTvR6SnfiUejrH4n95T3jDJJQs0M=; b=lu1nO3T38NiGik9Qow25Uru+klBnMuSbfRQZVKb1NPJQHlU8rUdeukZP2NzsCzQR+P o18/QAysbAYpjWg1e4dhRwyJ+qiijFCycI5I49UmgMFQnEBaSUPtQiEKP9RlQ6Iy+5E1 EsDvP0BUgNT9fg6UJcBxJBaljxOJBENp8zCAdoPJNYjPUC8DgLv3Ms9UGeu3TsQhqzUy 8vqRlknD6Mvu+z136/35tmvci5bq1h2dXKA8zIMnV3P5yh0Y2DFYwQiKeItYrgx1vMoQ qxFPrUVmV0IvT4o26UKNcslCjjG5FA4bAt0g1f/4SVuq2kyrvyUzz93qzWy3lXC3Kc3C O87w== X-Gm-Message-State: AMCzsaUzNOIMycvoDNzIYRL5Tn+bvKAcK/SIBBUigXyfpJyeMPBDERqP jIylbmIyB5cQ4B3ta4AIa5k1E43ldnQ= X-Google-Smtp-Source: ABhQp+TSRAT2f5eT4UO7/OtDd/YAohD89j+ZbwX+RCzOVTszndFH5f5J7nm9Y1T10CazrttXoaNdUA== X-Received: by 10.28.87.17 with SMTP id l17mr1788241wmb.158.1508609749654; Sat, 21 Oct 2017 11:15:49 -0700 (PDT) Received: from localhost.localdomain (nat.sh.cvut.cz. [213.195.201.2]) by smtp.gmail.com with ESMTPSA id o138sm1461733wmg.36.2017.10.21.11.15.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Oct 2017 11:15:48 -0700 (PDT) From: Alexey Brodkin X-Google-Original-From: Alexey Brodkin To: buildroot@busybox.net Date: Sat, 21 Oct 2017 21:15:46 +0300 Message-Id: <1508609746-1781-1-git-send-email-abrodkin@synopsys.com> X-Mailer: git-send-email 2.7.5 Cc: Thomas Petazzoni , Alexey Brodkin Subject: [Buildroot] [PATCH] python-numpy: Bump version to 1.13.3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This is just a bug-fix release. Removing 0003-BUG-Ensure-_npy_scaled_cexp-f-l-is-defined-when-need.patch as it is a part of the release. Signed-off-by: Alexey Brodkin --- ..._npy_scaled_cexp-f-l-is-defined-when-need.patch | 43 ---------------------- package/python-numpy/python-numpy.hash | 4 +- package/python-numpy/python-numpy.mk | 2 +- 3 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 package/python-numpy/0003-BUG-Ensure-_npy_scaled_cexp-f-l-is-defined-when-need.patch diff --git a/package/python-numpy/0003-BUG-Ensure-_npy_scaled_cexp-f-l-is-defined-when-need.patch b/package/python-numpy/0003-BUG-Ensure-_npy_scaled_cexp-f-l-is-defined-when-need.patch deleted file mode 100644 index a243df544ebc..000000000000 --- a/package/python-numpy/0003-BUG-Ensure-_npy_scaled_cexp-f-l-is-defined-when-need.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9aa5d577c58f04f9606674dd6f326aee1bf1e6e8 Mon Sep 17 00:00:00 2001 -From: Charles Harris -Date: Thu, 21 Sep 2017 10:10:05 -0600 -Subject: [PATCH] BUG: Ensure `_npy_scaled_cexp{,f,l}` is defined when needed. - -The `_npy_scaled_cexp{,f,l}` functions were previously only defined when -the npy_cexp fallback functions were needed, but they are also called by -the npy_csinh and npy_ccosh functions. - -Signed-off-by: Alexey Brodkin ---- - numpy/core/src/npymath/npy_math_complex.c.src | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/numpy/core/src/npymath/npy_math_complex.c.src b/numpy/core/src/npymath/npy_math_complex.c.src -index a82a6737c..fb31e8e6a 100644 ---- a/numpy/core/src/npymath/npy_math_complex.c.src -+++ b/numpy/core/src/npymath/npy_math_complex.c.src -@@ -184,7 +184,9 @@ npy_carg@c@(@ctype@ z) - #define SCALED_CEXP_LOWERL 11357.216553474703895L - #define SCALED_CEXP_UPPERL 22756.021937783004509L - --#ifndef HAVE_CEXP@C@ -+#if !defined(HAVE_CSINH@C@) || \ -+ !defined(HAVE_CCOSH@C@) || \ -+ !defined(HAVE_CEXP@C@) - - static - @ctype@ -@@ -212,6 +214,10 @@ _npy_scaled_cexp@c@(@type@ x, @type@ y, npy_int expt) - npy_ldexp@c@(mant * mantsin, expt + exsin)); - } - -+#endif -+ -+#ifndef HAVE_CEXP@C@ -+ - @ctype@ - npy_cexp@c@(@ctype@ z) - { --- -2.11.0 - diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash index 7dcdb44a008f..6e76c62e7d7a 100644 --- a/package/python-numpy/python-numpy.hash +++ b/package/python-numpy/python-numpy.hash @@ -1,2 +1,2 @@ -# Copied from https://github.com/numpy/numpy/releases/tag/v1.13.1 -sha256 de020ec06f1e9ce1115a50161a38bf8d4c2525379900f9cb478cc613a1e7cd93 numpy-1.13.1.tar.gz +# Copied from https://github.com/numpy/numpy/releases/tag/v1.13.3 +sha256 4c6b4eef790528bebb7ec9590d74cc193868940fe68e4109a91c196df72d8094 numpy-1.13.3.tar.gz diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index d0c279f70686..d0d38371a36b 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_NUMPY_VERSION = 1.13.1 +PYTHON_NUMPY_VERSION = 1.13.3 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION) PYTHON_NUMPY_LICENSE = BSD-3-Clause