From patchwork Tue Apr 7 11:15:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1072 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-il1-f197.google.com (mail-il1-f197.google.com [209.85.166.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 3D31F3F379 for ; Tue, 7 Apr 2020 13:15:44 +0200 (CEST) Received: by mail-il1-f197.google.com with SMTP id t10sf2784921ilf.2 for ; Tue, 07 Apr 2020 04:15:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1586258143; cv=pass; d=google.com; s=arc-20160816; b=VPTyosLMROKE8+A80nFeSvhZ5syIrYKknOMGxTcLZwLVtanIGQt8HsEnDX6jMORC2+ IDQdMllI0sDSUmH+ch7tOwi1bAiYAmWpdAZnPm6FFjhCOrqhR6rzAp8mZQHCG8L8V/le HVG+7eHYnJ9s4l0e62PgstRTaI8mLx6UfCoXB2wcCFel9FiZpMpY3ewGwMdPepDcN4Uy qBlBbAOyIhELnJ8PE+0ACM7P/z1ATfk+6La3Io/9LDaO3UIcZ/cj/rIIe/lzSHgVQoy1 cxhWTfzY6Kt+kYqIw5GH1XMbGOKy7T9Arsfqec23dO7ma99gUhxxhKMx8bFyRilNf4Ky U9qA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:references:in-reply-to:message-id:date :subject:cc:to:from:mime-version:dkim-signature; bh=JOS7foj68HNiR90bWsC2m0RGgqCm08PClq1SwT9aSI4=; b=nEWIzhgdYTXoSnKFGx9GBkez+2Kb0k/mcZjK/gxYFdS0aVN8ZGELDyxPkcL34OHhxU m+20SOJ/Df7sECmie2ySVOW/vIqCUNwleoNI2YEnYWlv33mvET+L8JYfoF4l4MTLdvXZ xXlNq1opb4xHiDdWFgqLWPAzmL5zYi6XPafgr0wLOWURH1Ohr1/PJXALnPe96uY5k/5e 1fbnSBfp+cW1Xvd1HwqsRo3PXA50e2QqDUZ+MR2p7+42t578NyCKQ0FtdYypNGeHvdUp +zMJ7lw6eqSiFxNzPv3DeoWNx1ZH/LI+665uLu5eH8AKiU7ywzqT0UDm1ETVRkyVOLrg 4ZhA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=C2hAeUc1; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=JOS7foj68HNiR90bWsC2m0RGgqCm08PClq1SwT9aSI4=; b=J/nQj0tgLCJTMsKF2W7eOwXbUpX1rV1C5jG8H9OE5SrgZFIqdDEXKiRmT0M6srPymg kWmpdebdnR4fb8YH+aW3KcsaAtf6vPan+DlZhns6ThbXdG9xbOWMHPYhSuhEN5fvzm7l Vugo1ygRKkTISXzfAe1YJ0V28rT1bMWUAJK3Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=JOS7foj68HNiR90bWsC2m0RGgqCm08PClq1SwT9aSI4=; b=BMLwKAWbeaXT7pQ6ViPKmrRLPtq4EuUNEF4bY0aChI3Rx+W5avrP8LoIpp5CtPs8h8 7AADY1HpY8NZfPfhnyQcL4jEYdstgVMQ6sx0fZICQCHO/jLCAs5ENC/wv+vhHy9qqABi DRUAu9gyU9hu+uUUGWIiDIDA5uw03eA8Vw9yY21v6Bv6tk00iQRL0vg/Cxpy/q2DoAcg 0HZdaowfu8wSs/ZTZnytfPFgRoafXdaomPsj9HNhE3J+tI9fCLkIHUBVO/Xf3gb1Wf95 0vTqz40MokIjUmaYE6a85L8aMo+8xJWMQ6p5XXH5lQdTP4UnjMrykTg16TlJFwzS5MRW lhyQ== X-Gm-Message-State: AGi0PuaeistRglyY5x6WIiGiA31EynEETJ2BfcjeBeQLUWTk9nmVxBoi aD+h6NwipgmuPAtnGZtQch+p95G3 X-Google-Smtp-Source: APiQypInBKHsQT1BO/894Q5uSDrW7sN1k0cChA/E0u4W57u2C1Ei6uowCVsj9WSm8eEC5iOvMtU20Q== X-Received: by 2002:a05:6e02:10d0:: with SMTP id s16mr1865405ilj.30.1586258143296; Tue, 07 Apr 2020 04:15:43 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6638:229:: with SMTP id f9ls692050jaq.10.gmail; Tue, 07 Apr 2020 04:15:43 -0700 (PDT) X-Received: by 2002:a02:69d4:: with SMTP id e203mr1412535jac.12.1586258142738; Tue, 07 Apr 2020 04:15:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586258142; cv=none; d=google.com; s=arc-20160816; b=nkYnS3ZEYhX20WdcC31MV/Pfq1da9Qz/EyFvi7MpNDlkOBRksOrz6oM4uvXkbs8uTY OSb88F22h3yium8IXRsN+0Wt+ESrkYtLEs+wJBBnDskhjfrlgmRREt9JMYWzXEVjOlWf l9KFpFHVe54v6nDWQurLPQlzunD3ftamsZn3mTs6mYfmCq2NaQM5oqoeePz9jSoaqIZk uH/exy6NmyZK2Tu+spbAfVy15XXZpDzclP7JSHY5s8uANinjjjqTBgddMLGYv2grzX6Q D7L+fUfLDn0glYJgejPcIp33WV6YAgSrNyUyfvuY5haRASZc9Q2yx+KIAjmRB4N3gdoS xsTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xWqwo4NFm1G/c2A2cbd8Gmeg5ghG1JUGeOkcfmOAgi8=; b=HtfRsaHxFLv+WnPMueqMAR+THZ9noye3LEbt1V80walc4/KtIpDJXg77KDdDodEfpd uxRbi1Vbezv3FbO+pC9itBgvfde2e2I9GPOmSv6/ktTb2bCIlYeg9eiztodavQvwYZ3l Ub+xdYsaUnuOAS+VoNxJmfAHTYM6CBQlVQTlUFobcqd0xLTPHSP+22oH1Qb2TzynL8uT WHoRq7/ERZz+duVqcjCb4K3qfByGvFljCHzfE2JrOmMvUEqu8/uNF4r0OjiHPULc77lI Ak5s8ovqF7ONhVHkp3wdbG+hQN2KvpWq1QkEC7gcCdHXSVQ+CbECJV3y9Ypyi8eKqiQX F13w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=C2hAeUc1; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id q73sor2884642ilb.146.2020.04.07.04.15.42 for (Google Transport Security); Tue, 07 Apr 2020 04:15:42 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:902:5989:: with SMTP id p9mr1989564pli.279.1586258142317; Tue, 07 Apr 2020 04:15:42 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:79b0:3a91:34a5:abd7]) by smtp.gmail.com with ESMTPSA id e187sm13788802pfe.50.2020.04.07.04.15.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 04:15:41 -0700 (PDT) From: Jagan Teki To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Angelo Compagnucci , Suniel Mahesh , Esben Haabendal , Yegor Yefremov , linux-amarula@amarulasolutions.com, Jagan Teki , Samuel Martin , Gwenhael Goavec-Merou Subject: [PATCH v8 1/5] package/python-numpy: Bump to version 1.18.2 Date: Tue, 7 Apr 2020 16:45:11 +0530 Message-Id: <20200407111515.21131-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200407111515.21131-1-jagan@amarulasolutions.com> References: <20200407111515.21131-1-jagan@amarulasolutions.com> X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=C2hAeUc1; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Bump the python-numpy version to 1.18.2, this version of python-numpy will support python3 only, not python2. Drop python2 dependency from opencv3, gnuadio packages since the python support on these are selecting python-numpy. Cc: Samuel Martin Cc: Gwenhael Goavec-Merou Cc: Esben Haabendal Signed-off-by: Jagan Teki --- Changes for v8: - none Changes for v7: - bump 1.181.2 numpy - drop 'BR2_PACKAGE_HOST_PYTHON_CYTHON' selection from numpy - drop python2 dependency from gnuradio.mk - drop python2 dependency from opencv3.mk - update the commit message package/gnuradio/Config.in | 2 +- package/gnuradio/gnuradio.mk | 4 ++-- package/opencv3/Config.in | 2 +- package/opencv3/opencv3.mk | 14 -------------- package/python-numpy/Config.in | 1 + package/python-numpy/python-numpy.hash | 14 +++++++------- package/python-numpy/python-numpy.mk | 4 +++- 7 files changed, 15 insertions(+), 26 deletions(-) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 6d438bcd6f..bf69ed605b 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -63,7 +63,7 @@ config BR2_PACKAGE_GNURADIO_FEC config BR2_PACKAGE_GNURADIO_PYTHON bool "python support" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_BOOST_PYTHON diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 41d4619f72..ab5b79e3e5 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -13,7 +13,7 @@ GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO # host-python-mako and host-python-six are needed for volk to compile GNURADIO_DEPENDENCIES = \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) \ + host-python3 \ host-python-mako \ host-python-six \ host-swig \ @@ -108,7 +108,7 @@ GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF endif ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) -GNURADIO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) +GNURADIO_DEPENDENCIES += python3 GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON else GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in index d4b17b6acf..18c390c515 100644 --- a/package/opencv3/Config.in +++ b/package/opencv3/Config.in @@ -156,7 +156,7 @@ config BR2_PACKAGE_OPENCV3_LIB_PHOTO config BR2_PACKAGE_OPENCV3_LIB_PYTHON bool "python" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_PYTHON_NUMPY diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 8a8257b387..fe41f6f382 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -312,19 +312,6 @@ OPENCV3_CONF_OPTS += -DWITH_V4L=OFF -DWITH_LIBV4L=OFF endif ifeq ($(BR2_PACKAGE_OPENCV3_LIB_PYTHON),y) -ifeq ($(BR2_PACKAGE_PYTHON),y) -OPENCV3_CONF_OPTS += \ - -DBUILD_opencv_python2=ON \ - -DBUILD_opencv_python3=OFF \ - -DPYTHON2_EXECUTABLE=$(HOST_DIR)/bin/python2 \ - -DPYTHON2_INCLUDE_PATH=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) \ - -DPYTHON2_LIBRARIES=$(STAGING_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR).so \ - -DPYTHON2_NUMPY_INCLUDE_DIRS=$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/numpy/core/include \ - -DPYTHON2_PACKAGES_PATH=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ - -DPYTHON2_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) -OPENCV3_DEPENDENCIES += python -OPENCV3_KEEP_PY_FILES += usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/cv2/config*.py -else OPENCV3_CONF_OPTS += \ -DBUILD_opencv_python2=OFF \ -DBUILD_opencv_python3=ON \ @@ -336,7 +323,6 @@ OPENCV3_CONF_OPTS += \ -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) OPENCV3_DEPENDENCIES += python3 OPENCV3_KEEP_PY_FILES += usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/cv2/config*.py -endif OPENCV3_CONF_ENV += $(PKG_PYTHON_DISTUTILS_ENV) OPENCV3_DEPENDENCIES += python-numpy else diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index 5b9ee5803b..507d52c4d8 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_NUMPY bool "python-numpy" + depends on BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy needs fenv.h which is not provided by uclibc depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash index eb4123e3f6..ff9d02643c 100644 --- a/package/python-numpy/python-numpy.hash +++ b/package/python-numpy/python-numpy.hash @@ -1,9 +1,9 @@ -# Copied from https://github.com/numpy/numpy/releases/tag/v1.16.4 -sha256 a3bccb70ad94091a5b9e2469fabd41ac877c140a6828c2022e35560a2ec0346c numpy-1.16.4.tar.gz +# Copied from https://github.com/numpy/numpy/releases/tag/v1.18.1 +sha256 da204ce460aa4247e595b7c7189d2fb2ed5f796bc03197055de01dac61d0125e numpy-1.18.2.tar.gz # License files, locally calculated -sha256 6b5086f61fe0c71564a79304ecbaa60f11fa3f3debf82f73d16a611cab102adc LICENSE.txt -sha256 426a5a484480f57a295db48c2c04f47bb3274752dd82a7fd6541dfa2cb90f641 doc/sphinxext/LICENSE.txt +sha256 ad81d0c21843ba6ce6fe5fa3eaacb61120be70cd798c52f63df3f4c12a843f0c LICENSE.txt +sha256 d3045980e80a6b39f98586c24bc7f39a7625b4b9f08ce72e367d12814743d047 numpy/core/src/multiarray/dragon4.c +sha256 426a5a484480f57a295db48c2c04f47bb3274752dd82a7fd6541dfa2cb90f641 doc/sphinxext/LICENSE.txt sha256 154a8706fa0fdeff1073bf6239c4ecf51f562ab107066eef839dade1a45c824c doc/scipy-sphinx-theme/LICENSE.txt -sha256 a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55 numpy/linalg/lapack_lite/LICENSE.txt -sha256 badf51c7e3e7de9c7630bd069780f5c197b846ef7660b342a1e58d5553592d8e tools/npy_tempita/license.txt -sha256 d37526b4a34c0aa859afe6f9b7e64ca7c306b7430df8113dd5ac6fcb246bd2d4 numpy/core/src/multiarray/dragon4.c +sha256 a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55 numpy/linalg/lapack_lite/LICENSE.txt +sha256 badf51c7e3e7de9c7630bd069780f5c197b846ef7660b342a1e58d5553592d8e tools/npy_tempita/license.txt diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 3b474efa6e..3f0df7a640 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_NUMPY_VERSION = 1.16.4 +PYTHON_NUMPY_VERSION = 1.18.2 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, BSD-2-Clause, PSF, Apache-2.0, MIT, Zlib @@ -14,6 +14,8 @@ PYTHON_NUMPY_LICENSE_FILES = LICENSE.txt doc/sphinxext/LICENSE.txt \ tools/npy_tempita/license.txt \ numpy/core/src/multiarray/dragon4.c PYTHON_NUMPY_SETUP_TYPE = setuptools +PYTHON_NUMPY_DEPENDENCIES += host-python-cython +HOST_PYTHON_NUMPY_DEPENDENCIES += host-python-cython ifeq ($(BR2_PACKAGE_CLAPACK),y) PYTHON_NUMPY_DEPENDENCIES += clapack