git: d6bd6f6a52c3 - main - cad/apio: revert "cad/apio: update 1.5.1 → 1.6.0"

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Mon, 12 Oct 2026 14:22:16 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d6bd6f6a52c3d4186641f30fddf5cea1c1fd88cf

commit d6bd6f6a52c3d4186641f30fddf5cea1c1fd88cf
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2026-10-12 14:19:03 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2026-10-12 14:22:09 +0000

    cad/apio: revert "cad/apio: update 1.5.1 → 1.6.0"
    
    Will investigate.
    
    This reverts commit a6e2ce1cfb1302628155539b6ff60861326a2716.
    
    Reported by:    antoine
---
 cad/apio/Makefile                   | 16 ++++++--------
 cad/apio/distinfo                   |  6 +++---
 cad/apio/files/patch-pyproject.toml | 42 +++++++++++++++----------------------
 3 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/cad/apio/Makefile b/cad/apio/Makefile
index 02f3b81ed12a..e77557b860f2 100644
--- a/cad/apio/Makefile
+++ b/cad/apio/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	apio
-DISTVERSION=	1.6.0
+DISTVERSION=	1.5.1
+PORTEPOCH=	1
 CATEGORIES=	cad python
 MASTER_SITES=	PYPI
 
@@ -10,25 +11,20 @@ WWW=		https://github.com/FPGAwars/apio
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apollo-fpga>0:cad/py-apollo-fpga@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}blackiceprog>0:cad/py-blackiceprog@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
+PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}debugpy>0:devel/py-debugpy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}icefunprog>0:cad/py-icefunprog@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}invoke>0:devel/py-invoke@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}json5>0:devel/py-json5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyusb>0:devel/py-pyusb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>0:textproc/py-rich@${PY_FLAVOR} \
 		scons-${PY_FLAVOR}>0:devel/scons@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}semantic-version>0:devel/py-semantic-version@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tinyfpgab>0:cad/py-tinyfpgab@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tinyprog>0:cad/py-tinyprog@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}vcdvcd>0:cad/py-vcdvcd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=2:devel/py-flit-core@${PY_FLAVOR} \
 		${PY_DEPENDS}
@@ -37,7 +33,7 @@ RUN_DEPENDS=	${PY_DEPENDS}
 USES=		python shebangfix
 USE_PYTHON=	autoplist noflavors pep517
 
-SHEBANG_FILES=	apio/__main__.py
+SHEBANG_FILES=	apio/__main__.py apio/common/proto/update-protos.sh
 python_OLD_CMD=	venv/bin/python
 
 NO_ARCH=	yes
diff --git a/cad/apio/distinfo b/cad/apio/distinfo
index b73ab5f38d00..ec1fb292a7f8 100644
--- a/cad/apio/distinfo
+++ b/cad/apio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1791739708
-SHA256 (apio-1.6.0.tar.gz) = 132cf7d69586220b9d63ec8c98454788444f8969a5b6ba400bda32e54833c4f9
-SIZE (apio-1.6.0.tar.gz) = 6562061
+TIMESTAMP = 1787825084
+SHA256 (apio-1.5.1.tar.gz) = 631b0334263fe25458c259836e8d20f97dc09bdbe9f9366181bc551529507dc6
+SIZE (apio-1.5.1.tar.gz) = 6534767
diff --git a/cad/apio/files/patch-pyproject.toml b/cad/apio/files/patch-pyproject.toml
index 7a5b49e6b166..b72deab378ae 100644
--- a/cad/apio/files/patch-pyproject.toml
+++ b/cad/apio/files/patch-pyproject.toml
@@ -2,7 +2,7 @@
 -- The removed dependencies (blackiceprog, tinyprog, etc.) are not yet in the FreeBSD ports tree.
 -- apio will still work for other boards.
 
---- pyproject.toml.orig	2026-09-17 03:09:48 UTC
+--- pyproject.toml.orig	2026-05-27 05:22:31 UTC
 +++ pyproject.toml
 @@ -2,7 +2,7 @@
  # Package version is set in apio/__init.py
@@ -13,7 +13,7 @@
  build-backend = "flit_core.buildapi"
  
  [tool.flit.metadata.urls]
-@@ -37,26 +37,26 @@ requires = [
+@@ -34,25 +34,19 @@
  ]
  requires-python = ">=3.11"
  requires = [
@@ -35,28 +35,20 @@
 -    'protobuf==6.33.0',
 -    'rich==14.0.0',
 -    'vcdvcd==2.6.0',
--    'invoke==2.2.1',
--    'json5==0.15.0',
-+    'click>=8.2.1',
-+    'colorama>=0.4.6',
-+    'configobj>=5.0.9',
-+    'debugpy>=1.8.19',
-+    'packaging>=25.0',
-+    'pyserial>=3.5',
-+    'requests>=2.33.1',
-+    'scons>=4.8.1',
-+    'semantic_version>=2.10.0',
-+    'wheel>=0.45.1',
-+    'blackiceprog>=2.0.0',
-+    'tinyfpgab>=1.1.0',
-+    'tinyprog>=1.0.21',
-+    'icefunprog>=2.0.3',
-+    'apollo_fpga>=1.1.1',
-+    'protobuf>=6.33.0',
-+    'rich>=14.0.0',
-+    'vcdvcd>=2.6.0',
-+    'invoke>=2.2.1',
-+    'json5>=0.15.0',
+-    'invoke==2.2.1'
++    'click>=0',
++    'colorama>=0',
++    'configobj>=0',
++    'debugpy>=0',
++    'packaging>=0',
++    'pyserial>=0',
++    'requests>=0',
++    'scons>=0',
++    'semantic_version>=0',
++    'wheel>=0',
++    'protobuf>=0',
++    'rich>=0',
++    'invoke>=0'
  ]
  
- [tool.flit.metadata.requires-extra]
+ [tool.flit.sdist]