From patchwork Sat Jun 12 13:08:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Bilas X-Patchwork-Id: 1491280 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G2J2D1Qrrz9sRN for ; Sat, 12 Jun 2021 23:09:07 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 46746403E7; Sat, 12 Jun 2021 13:09:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eZLd_mIUTTvL; Sat, 12 Jun 2021 13:09:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 6E5BF4013F; Sat, 12 Jun 2021 13:09:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 0715C1BF5F5 for ; Sat, 12 Jun 2021 13:09:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E9D4240395 for ; Sat, 12 Jun 2021 13:09:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yXI2tH8FrERw for ; Sat, 12 Jun 2021 13:08:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mail.grinn-global.com (mail.grinn-global.com [77.55.128.204]) by smtp4.osuosl.org (Postfix) with ESMTPS id 8848840383 for ; Sat, 12 Jun 2021 13:08:59 +0000 (UTC) X-Virus-Scanned: by amavisd-new using ClamAV (15) Received: from bartekk-pc.lan (host-81-161-202-57.oxylion.net.pl [81.161.202.57]) by server220076.nazwa.pl (Postfix) with ESMTP id 700131C563B; Sat, 12 Jun 2021 15:08:56 +0200 (CEST) From: Bartosz Bilas To: buildroot@buildroot.org Date: Sat, 12 Jun 2021 15:08:54 +0200 Message-Id: <20210612130854.185167-1-b.bilas@grinn-global.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/python-esptool: bump version to 3.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Bilas Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Bartosz Bilas --- ...-wheel-only-when-installing-from-pip.patch | 36 +++++++++++++++++++ package/python-esptool/python-esptool.hash | 4 +-- package/python-esptool/python-esptool.mk | 4 +-- 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 package/python-esptool/0001-setup.py-require-wheel-only-when-installing-from-pip.patch diff --git a/package/python-esptool/0001-setup.py-require-wheel-only-when-installing-from-pip.patch b/package/python-esptool/0001-setup.py-require-wheel-only-when-installing-from-pip.patch new file mode 100644 index 0000000000..3318fa7b26 --- /dev/null +++ b/package/python-esptool/0001-setup.py-require-wheel-only-when-installing-from-pip.patch @@ -0,0 +1,36 @@ +From 3f2746ad05067aad960f7a08e53f6e72c5eecd07 Mon Sep 17 00:00:00 2001 +From: Bartosz Bilas +Date: Sat, 12 Jun 2021 13:50:15 +0200 +Subject: [PATCH] setup.py: require wheel only when installing from pip + +Fix the build from sources (that don't require wheel) +in environments where this module is not available. + +Signed-off-by: Bartosz Bilas +Signed-off-by: Bartosz Bilas +--- + Upstream status: https://github.com/espressif/esptool/pull/632 + + setup.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 2b17b28..1a8421d 100644 +--- a/setup.py ++++ b/setup.py +@@ -110,7 +110,11 @@ setup( + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + ], +- setup_requires=['wheel'] if sys.version_info[0:2] not in [(3, 4), (3, 5)] else [], ++ setup_requires=( ++ ['wheel'] ++ if 'bdist_wheel' in sys.argv and sys.version_info[0:2] not in [(3, 4), (3, 5)] else ++ [] ++ ), + extras_require={ + "dev": [ + 'flake8>=3.2.0', +-- +2.32.0 + diff --git a/package/python-esptool/python-esptool.hash b/package/python-esptool/python-esptool.hash index 3b030ec75b..7a707d34c6 100644 --- a/package/python-esptool/python-esptool.hash +++ b/package/python-esptool/python-esptool.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/esptool/json -md5 ccd2855e14c298712aeb37ac063baad5 esptool-3.0.tar.gz -sha256 87953d235fed2c9adb1292b3769df0149686c9afdb1896dd963f730453cbc934 esptool-3.0.tar.gz +md5 d62d71041896d105d7abd9e9c40f1995 esptool-3.1.tar.gz +sha256 ec6b943c53b4d71f87f98776333d5b4b99905766898a7002c28a9090b92b2de4 esptool-3.1.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index e9e3eb6b59..92f9bfce18 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ESPTOOL_VERSION = 3.0 +PYTHON_ESPTOOL_VERSION = 3.1 PYTHON_ESPTOOL_SOURCE = esptool-$(PYTHON_ESPTOOL_VERSION).tar.gz -PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/dd/3d/d1d4c004927e6e6807c441ce70330ed969c725d2906053fbd2ff994b4439 +PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/9c/c8/28f21b3d3b5e1f1d249be52cdd91793c8c3f7c4f4f255ece7d50984fb05d PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE