py-deepmerge: remove, imported to pkgsrc

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: py-deepmerge: remove, imported to pkgsrc
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Thu, 11 Jun 2026 13:15:23 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Jun 11 15:12:32 2026 +0200
Changeset:	d8f36fd1019083253c0bbbc25c3c0d9eb9242e73

Modified Files:
	Makefile
	py-spsdk/Makefile
	py-zensical/Makefile
Removed Files:
	py-deepmerge/DESCR
	py-deepmerge/Makefile
	py-deepmerge/PLIST
	py-deepmerge/distinfo

Log Message:
py-deepmerge: remove, imported to pkgsrc

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d8f36fd1019083253c0bbbc25c3c0d9eb9242e73

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile              |  1 -
 py-deepmerge/DESCR    |  1 -
 py-deepmerge/Makefile | 19 ---------------
 py-deepmerge/PLIST    | 67 ---------------------------------------------------
 py-deepmerge/distinfo |  5 ----
 py-spsdk/Makefile     |  2 +-
 py-zensical/Makefile  |  2 +-
 7 files changed, 2 insertions(+), 95 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index ca26b7441f..d3f16fde9d 100644
--- a/Makefile
+++ b/Makefile
@@ -3733,7 +3733,6 @@ SUBDIR+=	py-decorated-registry
 SUBDIR+=	py-decoratortools
 SUBDIR+=	py-deep-merge
 SUBDIR+=	py-deep-translator
-SUBDIR+=	py-deepmerge
 SUBDIR+=	py-delay
 SUBDIR+=	py-delegator
 SUBDIR+=	py-delny
diff --git a/py-deepmerge/DESCR b/py-deepmerge/DESCR
deleted file mode 100644
index 296b22756a..0000000000
--- a/py-deepmerge/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-A tools to handle merging of nested data structures in Python.
diff --git a/py-deepmerge/Makefile b/py-deepmerge/Makefile
deleted file mode 100644
index 8b6c5afa8f..0000000000
--- a/py-deepmerge/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	deepmerge-2.0
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_PYPI:=d/deepmerge/}
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://pypi.org/project/deepmerge/
-COMMENT=	Toolset to deeply merge Python dictionaries
-LICENSE=	mit
-
-TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
-
-USE_LANGUAGES=	# none
-
-.include "../../lang/python/wheel.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/py-deepmerge/PLIST b/py-deepmerge/PLIST
deleted file mode 100644
index fc95f2ebdd..0000000000
--- a/py-deepmerge/PLIST
+++ /dev/null
@@ -1,67 +0,0 @@
-@comment $NetBSD$
-${PYSITELIB}/${WHEEL_INFODIR}/METADATA
-${PYSITELIB}/${WHEEL_INFODIR}/RECORD
-${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
-${PYSITELIB}/${WHEEL_INFODIR}/licenses/LICENSE
-${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
-${PYSITELIB}/deepmerge/__init__.py
-${PYSITELIB}/deepmerge/__init__.pyc
-${PYSITELIB}/deepmerge/__init__.pyo
-${PYSITELIB}/deepmerge/_version.py
-${PYSITELIB}/deepmerge/_version.pyc
-${PYSITELIB}/deepmerge/_version.pyo
-${PYSITELIB}/deepmerge/exception.py
-${PYSITELIB}/deepmerge/exception.pyc
-${PYSITELIB}/deepmerge/exception.pyo
-${PYSITELIB}/deepmerge/extended_set.py
-${PYSITELIB}/deepmerge/extended_set.pyc
-${PYSITELIB}/deepmerge/extended_set.pyo
-${PYSITELIB}/deepmerge/merger.py
-${PYSITELIB}/deepmerge/merger.pyc
-${PYSITELIB}/deepmerge/merger.pyo
-${PYSITELIB}/deepmerge/py.typed
-${PYSITELIB}/deepmerge/strategy/__init__.py
-${PYSITELIB}/deepmerge/strategy/__init__.pyc
-${PYSITELIB}/deepmerge/strategy/__init__.pyo
-${PYSITELIB}/deepmerge/strategy/core.py
-${PYSITELIB}/deepmerge/strategy/core.pyc
-${PYSITELIB}/deepmerge/strategy/core.pyo
-${PYSITELIB}/deepmerge/strategy/dict.py
-${PYSITELIB}/deepmerge/strategy/dict.pyc
-${PYSITELIB}/deepmerge/strategy/dict.pyo
-${PYSITELIB}/deepmerge/strategy/fallback.py
-${PYSITELIB}/deepmerge/strategy/fallback.pyc
-${PYSITELIB}/deepmerge/strategy/fallback.pyo
-${PYSITELIB}/deepmerge/strategy/list.py
-${PYSITELIB}/deepmerge/strategy/list.pyc
-${PYSITELIB}/deepmerge/strategy/list.pyo
-${PYSITELIB}/deepmerge/strategy/set.py
-${PYSITELIB}/deepmerge/strategy/set.pyc
-${PYSITELIB}/deepmerge/strategy/set.pyo
-${PYSITELIB}/deepmerge/strategy/type_conflict.py
-${PYSITELIB}/deepmerge/strategy/type_conflict.pyc
-${PYSITELIB}/deepmerge/strategy/type_conflict.pyo
-${PYSITELIB}/deepmerge/tests/__init__.py
-${PYSITELIB}/deepmerge/tests/__init__.pyc
-${PYSITELIB}/deepmerge/tests/__init__.pyo
-${PYSITELIB}/deepmerge/tests/strategy/__init__.py
-${PYSITELIB}/deepmerge/tests/strategy/__init__.pyc
-${PYSITELIB}/deepmerge/tests/strategy/__init__.pyo
-${PYSITELIB}/deepmerge/tests/strategy/test_core.py
-${PYSITELIB}/deepmerge/tests/strategy/test_core.pyc
-${PYSITELIB}/deepmerge/tests/strategy/test_core.pyo
-${PYSITELIB}/deepmerge/tests/strategy/test_list.py
-${PYSITELIB}/deepmerge/tests/strategy/test_list.pyc
-${PYSITELIB}/deepmerge/tests/strategy/test_list.pyo
-${PYSITELIB}/deepmerge/tests/strategy/test_set_merge.py
-${PYSITELIB}/deepmerge/tests/strategy/test_set_merge.pyc
-${PYSITELIB}/deepmerge/tests/strategy/test_set_merge.pyo
-${PYSITELIB}/deepmerge/tests/strategy/test_type_conflict.py
-${PYSITELIB}/deepmerge/tests/strategy/test_type_conflict.pyc
-${PYSITELIB}/deepmerge/tests/strategy/test_type_conflict.pyo
-${PYSITELIB}/deepmerge/tests/test_full.py
-${PYSITELIB}/deepmerge/tests/test_full.pyc
-${PYSITELIB}/deepmerge/tests/test_full.pyo
-${PYSITELIB}/deepmerge/tests/test_merger.py
-${PYSITELIB}/deepmerge/tests/test_merger.pyc
-${PYSITELIB}/deepmerge/tests/test_merger.pyo
diff --git a/py-deepmerge/distinfo b/py-deepmerge/distinfo
deleted file mode 100644
index deb22254bf..0000000000
--- a/py-deepmerge/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD$
-
-BLAKE2s (deepmerge-2.0.tar.gz) = 71a3a05e257d12a3f18941440367f0901b78697f049c96bcf722ac332bffcfbc
-SHA512 (deepmerge-2.0.tar.gz) = 1702ad6162d26ab94a60ed55dd558bce41dc87be7eb2b6ea662d7e78780e2e410056c7ab39493002288f435a1293f035c3bba3ce1340f484416974f57bf205de
-Size (deepmerge-2.0.tar.gz) = 19890 bytes
diff --git a/py-spsdk/Makefile b/py-spsdk/Makefile
index 511739147e..a49a120999 100644
--- a/py-spsdk/Makefile
+++ b/py-spsdk/Makefile
@@ -22,7 +22,7 @@ DEPENDS+=	${PYPKGPREFIX}-colorama>=0.4.6:../../comms/py-colorama
 DEPENDS+=	${PYPKGPREFIX}-commentjson>=0.9:../../wip/py-commentjson
 DEPENDS+=	${PYPKGPREFIX}-crcmod>=0:../../security/py-crcmod
 DEPENDS+=	${PYPKGPREFIX}-cryptography>=3.4.4:../../security/py-cryptography
-DEPENDS+=	${PYPKGPREFIX}-deepmerge>=0:../../wip/py-deepmerge
+DEPENDS+=	${PYPKGPREFIX}-deepmerge>=0:../../devel/py-deepmerge
 DEPENDS+=	${PYPKGPREFIX}-fastjsonschema>=2.15.1:../../textproc/py-fastjsonschema
 DEPENDS+=	${PYPKGPREFIX}-hexdump>=0:../../wip/py-hexdump
 DEPENDS+=	${PYPKGPREFIX}-jinja2>=3.0:../../textproc/py-jinja2
diff --git a/py-zensical/Makefile b/py-zensical/Makefile
index 1df86601f1..632feee905 100644
--- a/py-zensical/Makefile
+++ b/py-zensical/Makefile
@@ -12,7 +12,7 @@ LICENSE=	mit
 
 TOOL_DEPENDS+=	${PYPKGPREFIX}-maturin-[0-9]*:../../devel/py-maturin
 DEPENDS+=	${PYPKGPREFIX}-click-[0-9]*:../../devel/py-click
-DEPENDS+=	${PYPKGPREFIX}-deepmerge-[0-9]*:../../wip/py-deepmerge
+DEPENDS+=	${PYPKGPREFIX}-deepmerge-[0-9]*:../../devel/py-deepmerge
 DEPENDS+=	${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown
 DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 DEPENDS+=	${PYPKGPREFIX}-pymdown-extensions-[0-9]*:../../wip/py-pymdown-extensions
Prev by Date: ipv6calc: style fixes
Next by Date: py-pymdown-extensions: remove, imported to pkgsrc
Previous by Thread: ipv6calc: style fixes
Next by Thread: py-pymdown-extensions: remove, imported to pkgsrc
Indexes:
Home | Main Index | Thread Index | Old Index