From nobody Tue Oct 19 02:58:04 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 901A017F37F1; Tue, 19 Oct 2021 02:58:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HYJMc3lPwz4xfx; Tue, 19 Oct 2021 02:58:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 610004553; Tue, 19 Oct 2021 02:58:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19J2w4TF093875; Tue, 19 Oct 2021 02:58:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19J2w415093874; Tue, 19 Oct 2021 02:58:04 GMT (envelope-from git) Date: Tue, 19 Oct 2021 02:58:04 GMT Message-Id: <202110190258.19J2w415093874@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fukang Chen Subject: git: 304a720bf8c4 - main - comms/py-esptool: Update to 3.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: loader X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 304a720bf8c4bb80ba4caf986f48f012e1595080 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by loader: URL: https://cgit.FreeBSD.org/ports/commit/?id=304a720bf8c4bb80ba4caf986f48f012e1595080 commit 304a720bf8c4bb80ba4caf986f48f012e1595080 Author: Fukang Chen AuthorDate: 2021-10-19 02:19:49 +0000 Commit: Fukang Chen CommitDate: 2021-10-19 02:56:14 +0000 comms/py-esptool: Update to 3.1 Changelog: https://github.com/espressif/esptool/releases/tag/v3.1 PR: 259235 Submitted by: Tomasz "CeDeROM" CEDRO (based on) MFH: No (feature release) --- comms/py-esptool/Makefile | 35 +++++++++++++++++++++++++++-------- comms/py-esptool/distinfo | 10 +++++++--- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/comms/py-esptool/Makefile b/comms/py-esptool/Makefile index 79f51c9c64cc..ce68fcad9d76 100644 --- a/comms/py-esptool/Makefile +++ b/comms/py-esptool/Makefile @@ -1,10 +1,15 @@ PORTNAME= esptool DISTVERSIONPREFIX= v -DISTVERSION= 2.5.1 -PORTREVISION= 2 +DISTVERSION= 3.1 CATEGORIES= comms python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ +# Fix running test/test_espefuse_host.py on FreeBSD +PATCHFILES= 74c55a8ffce4347a11479b07d50ccca33e0c0b8d.patch:-p1 +# The wheel package is only required when installing from pip +PATCHFILES+= 4b14df383c179d9b9bea48c269869e434de878fe.patch:-p1 + MAINTAINER= loader@FreeBSD.org COMMENT= Utility to communicate with Espressif ESP8266 & ESP32 chips @@ -12,10 +17,11 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyserial>=3.0:comms/py-pyserial@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyaes>0:security/py-pyaes@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR}\ + ${PYTHON_PKGNAMEPREFIX}bitstring>=3.1.6:devel/py-bitstring@${PY_FLAVOR}\ + ${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.4:security/py-cryptography@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}reedsolo>=1.5.3,<=1.5.4:devel/py-reedsolo@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR} USES= python:3.6+ USE_GITHUB= yes @@ -24,15 +30,28 @@ USE_PYTHON= autoplist concurrent distutils GH_ACCOUNT= espressif NO_ARCH= yes +# test/test_espefuse_host.py calls the python command +# through subprocess Popen(), create an alias for it. +BINARY_ALIAS= python=${PYTHON_CMD} + ESPTOOL_BAUDRATE?= 115200 ESPTOOL_CHIP?= esp8266 ESPTOOL_SERIALPORT?= /dev/ttyU0 do-test: - @cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest \ - --ignore test/test_esptool.py + @cd ${TEST_WRKSRC} && for test in \ + test/test_imagegen.py \ + test/test_espsecure.py \ + test/test_merge_bin.py \ + test/test_modules.py; \ + do ${SETENV} ${TEST_ENV} ${PYTHON_CMD} $${test}; done + @cd ${TEST_WRKSRC} && for chip in \ + esp32 esp32s2 esp32s3beta2 esp32s3beta3 esp32c3; \ + do ${SETENV} ${TEST_ENV} ${PYTHON_CMD} \ + test/test_espefuse_host.py $${chip}; done .if exists(${ESPTOOL_SERIALPORT}) @cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} \ + PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \ ${PYTHON_CMD} test/test_esptool.py \ ${ESPTOOL_SERIALPORT} ${ESPTOOL_CHIP} ${ESPTOOL_BAUDRATE} .endif diff --git a/comms/py-esptool/distinfo b/comms/py-esptool/distinfo index 8c0043f90422..39281ef7e9fa 100644 --- a/comms/py-esptool/distinfo +++ b/comms/py-esptool/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1545284851 -SHA256 (espressif-esptool-v2.5.1_GH0.tar.gz) = 6730b69d8ba09ff09f845873eaeef352bd18a4ee24b31b0898fd8fc5f178c037 -SIZE (espressif-esptool-v2.5.1_GH0.tar.gz) = 4042666 +TIMESTAMP = 1634543623 +SHA256 (espressif-esptool-v3.1_GH0.tar.gz) = 5edc768a63df4d73bdeba534146f6b3e41fbbe3c25f08be627733fc38535a976 +SIZE (espressif-esptool-v3.1_GH0.tar.gz) = 6897273 +SHA256 (74c55a8ffce4347a11479b07d50ccca33e0c0b8d.patch) = fe02a173c314956eea1f8a838659f8782d887754fe7f69ff2e0926b5bc2bfd2f +SIZE (74c55a8ffce4347a11479b07d50ccca33e0c0b8d.patch) = 2014 +SHA256 (4b14df383c179d9b9bea48c269869e434de878fe.patch) = 7ab9ccd35d44f597c327f446830958558d38bd2d8744e14839a82062a73da217 +SIZE (4b14df383c179d9b9bea48c269869e434de878fe.patch) = 1087