pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
py-esptool: Minor adjustments
Module Name: pkgsrc-wip
Committed By: Greg Troxel <gdt%lexort.com@localhost>
Pushed By: gdt
Date: Mon Jul 21 09:26:18 2025 -0400
Changeset: bf944e8f6d645b4eb9171c92b02344e4567361fd
Modified Files:
py-esptool/COMMIT_MSG
py-esptool/Makefile
py-esptool/distinfo
py-esptool/patches/patch-esptool_cli__util.py
Added Files:
py-esptool/TODO
Log Message:
py-esptool: Minor adjustments
(A fair bit of this is overdue cleanup of how the package was before the current update.)
- move patch URL from commit message to patch file
- add commit message note about new/changed deps
- add commit message note about python version
- add \todo in Makefile to align python variables to the combination
of upstream req and pkgsrc rules. (I am finding this confusing;
maybe it's just me.)
- sort dependencies per upstream pyproject.toml, because that's how
I can tell if the list is correct (it was!).
- add TODO with nits
(All of this amounts to nothing in the actual build.)
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bf944e8f6d645b4eb9171c92b02344e4567361fd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
py-esptool/COMMIT_MSG | 9 ++++++---
py-esptool/Makefile | 13 ++++++++-----
py-esptool/TODO | 5 +++++
py-esptool/distinfo | 2 +-
py-esptool/patches/patch-esptool_cli__util.py | 4 +++-
5 files changed, 23 insertions(+), 10 deletions(-)
diffs:
diff --git a/py-esptool/COMMIT_MSG b/py-esptool/COMMIT_MSG
index 36f312d7fb..3224e743c3 100644
--- a/py-esptool/COMMIT_MSG
+++ b/py-esptool/COMMIT_MSG
@@ -4,9 +4,12 @@ Packaged in wip by Frédéric Fauberteau
pkgsrc changes:
---------------
- * Add patch to break the upstream dependency requirement for click<8.2.0
- since devel/py-click is at 8.2.1
- (https://github.com/espressif/esptool/pull/1104).
+ * Adjust dependencies per upstream changes:
+ - require modern py-cryptography, dropping py-ecdsa
+ - add click and rich-click, dropping argcomplete
+ * Add patch to use up-to-date click (as found in pkgsrc), vs
+ upstream's expectation of old click.
+ * Adjust python versions; upstream requires >= 3.10
upstream changes:
-----------------
diff --git a/py-esptool/Makefile b/py-esptool/Makefile
index 12b7f19441..26e0ab29ee 100644
--- a/py-esptool/Makefile
+++ b/py-esptool/Makefile
@@ -12,20 +12,23 @@ LICENSE= gnu-gpl-v2
TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=78:../../devel/py-setuptools
DEPENDS+= ${PYPKGPREFIX}-bitstring>=4.2.1:../../devel/py-bitstring
-DEPENDS+= ${PYPKGPREFIX}-click-[0-9]*:../../devel/py-click
-DEPENDS+= ${PYPKGPREFIX}-intelhex-[0-9]*:../../devel/py-intelhex
-DEPENDS+= ${PYPKGPREFIX}-reedsolo>=1.5.3:../../converters/py-reedsolo
-DEPENDS+= ${PYPKGPREFIX}-rich-click-[0-9]*:../../devel/py-rich-click
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
DEPENDS+= ${PYPKGPREFIX}-serial>=3.3:../../comms/py-serial
+DEPENDS+= ${PYPKGPREFIX}-reedsolo>=1.5.3:../../converters/py-reedsolo
DEPENDS+= ${PYPKGPREFIX}-yaml>=5.1:../../textproc/py-yaml
+DEPENDS+= ${PYPKGPREFIX}-intelhex-[0-9]*:../../devel/py-intelhex
+DEPENDS+= ${PYPKGPREFIX}-rich-click-[0-9]*:../../devel/py-rich-click
+DEPENDS+= ${PYPKGPREFIX}-click-[0-9]*:../../devel/py-click
USE_LANGUAGES= # none
PYTHON_SELF_CONFLICT= yes
+# esptool requires >= 3.10
+# \todo Should 3.10 be explicitly in ACCEPTED?
+# \todo If 39 is not added to accepted, do we need to put it in INCOMPATIBLE?
PYTHON_VERSIONS_INCOMPATIBLE= 39
-PYTHON_VERSIONED_DEPENDENCIES+= cryptography
.include "../../lang/python/versioned_dependencies.mk"
.include "../../lang/python/wheel.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-esptool/TODO b/py-esptool/TODO
new file mode 100644
index 0000000000..c2329d0b57
--- /dev/null
+++ b/py-esptool/TODO
@@ -0,0 +1,5 @@
+ - Understand/fix python version issues. It's confusing what the
+ pkgsrc rules are, and what this package can cope with.
+ - test with an actual chip (gdt will do this)
+ - (probably) prune bugfixes, documentation, refactoring from
+ COMMIT_MSG as not belonging in NEWS
diff --git a/py-esptool/distinfo b/py-esptool/distinfo
index 127ca78b2f..3939daf073 100644
--- a/py-esptool/distinfo
+++ b/py-esptool/distinfo
@@ -3,4 +3,4 @@ $NetBSD: distinfo,v 1.13 2025/04/15 15:42:11 adam Exp $
BLAKE2s (esptool-5.0.1.tar.gz) = 2169c6115850ba1ecb8979baa19d5936c6974d5ce920078cf93d9aa70702b30f
SHA512 (esptool-5.0.1.tar.gz) = dc57f1a36ae0689c878d69c97e207e71f3dfc0b6cb551cc2425c0890329d6b2f1200158150c9a3c1f1d310296f07af4db47fe11b85f76e00140e49ade82eb7a2
Size (esptool-5.0.1.tar.gz) = 373632 bytes
-SHA1 (patch-esptool_cli__util.py) = ed6379945e98a30343df9e3c873a6c563e7ad6ed
+SHA1 (patch-esptool_cli__util.py) = c65229eee5104d55b007fc7c38b4663a3ba37c16
diff --git a/py-esptool/patches/patch-esptool_cli__util.py b/py-esptool/patches/patch-esptool_cli__util.py
index efafcc7a1d..c76a127a49 100644
--- a/py-esptool/patches/patch-esptool_cli__util.py
+++ b/py-esptool/patches/patch-esptool_cli__util.py
@@ -1,6 +1,8 @@
$NetBSD$
-Fix use of click >= 8.2.0.
+Adjust click usage for >= 8.2.0, vs upstream's expecation of old click.
+
+https://github.com/espressif/esptool/pull/1104
--- esptool/cli_util.py.orig 2025-07-19 20:28:53.595125845 +0000
+++ esptool/cli_util.py
Home |
Main Index |
Thread Index |
Old Index