9 files changed, 115 insertions, 280 deletions
diff --git a/dev-vcs/dandi-cli/Manifest b/dev-vcs/dandi-cli/Manifest
index d58fa0e76..f84e21730 100644
--- a/dev-vcs/dandi-cli/Manifest
+++ b/dev-vcs/dandi-cli/Manifest
@@ -1,4 +1,2 @@
-DIST dandi-0.45.1.tar.gz 321362 BLAKE2B d07296be6bd4237fea4aa83c0b087de45234157aa6aa457f8d44f56b514a4deca11226831182b84c19a72b398183b3b181beb3946c7f8cce2d842ac80f0b57e2 SHA512 07d97420651bbd82d8d4146322ff80873489bd49869834ace9986f1ddc1880be5ff6bd1d625d8b4607a90de8007aeba152e8161af05c25a804cb18c7a0c78e29
-DIST dandi-0.46.6.tar.gz 218868 BLAKE2B 7900c153172aa9669d0eae6bc2293ef51d1640b2fdd4e40eb887b1aba555d61617f95fb76601f1e81aeb9e0a54901c711bfb3c95eb478853490b29a0c1ee20e7 SHA512 db04e261205be716d6a098fbb63760411d3869c692df78954b50b649228747e0c18a9a32d3a9b0a5f21f55432e6a6cadad2142ee99168d02f02cfe51bf7eef93
-DIST dandi-cli-0.38.0.gh.tar.gz 322974 BLAKE2B 5451eb922019e0b06de1181161d23fac21ddbd772fb9ff5b23e296eb5ccc54c44b6c6c62d5d8f25bf075e6c93136f1db4d3ab72d372dfa7a28c84fc03008e0f3 SHA512 a77d834dadbd532ce016425fe25324582a5d2c442b52087d5751770d99c84fa9532a08525ee75f40d45ccb5c50ed11b9fbe0c29a24c7d1b24c253d218538e054
-DIST dandi-cli-0.39.4.gh.tar.gz 329268 BLAKE2B c34674570c3474dbc12a2f96c0877a84ca3cddbf8d04cb1bc7cc47e6d03bbf4103cf8f36d4267f59bfb5da2504300e14dc007a3f23a5d807bb92cece506fb7b7 SHA512 8ac4ae25eb9b09530a017ca2812a490c578157caeb0cca2737630f9796ec4559fc2379f150764544e1cd474cf481f87bb08dd255d4bf4dcc7722c8006ae78c4b
+DIST dandi-0.61.0.tar.gz 306755 BLAKE2B 8d279fddf4a9c390c91d09915d978f5709c297bb4284e8c8f3026ef9c94a9b2bab4b24409ff1d915550ab2564f8398a1afb236b226a41303264898de51deed42 SHA512 3cbd5c81c024cfca01c94fd2f9c794b22170f830a39c283f5cde1dfd998447287559457e324f81f46154fa38bf065720736da3be13a5668bc7453d091dd51869
+DIST dandi-0.61.2.tar.gz 306867 BLAKE2B 9a51c26f36d462e518241d40604726973727f17c70855136b6ea8e8402fb2c30ecc3adbbf7db6ed967bdb8c63a11da0809c09ae61f3a4996784b0b2083c1ec3a SHA512 9f4f3a02e62a3c4af3496a29faa18c696263e71dd2baf56c2925696c09e4c633a3a28a1fe30329764b98cba3006e4ccfe0884f5bae3d580f643f4cf946b2d291
diff --git a/dev-vcs/dandi-cli/dandi-cli-0.38.0.ebuild b/dev-vcs/dandi-cli/dandi-cli-0.38.0.ebuild
deleted file mode 100644
index 1842cbb5e..000000000
--- a/dev-vcs/dandi-cli/dandi-cli-0.38.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="DANDI command line client to facilitate common operations"
-HOMEPAGE="https://github.com/dandi/dandi-cli"
-SRC_URI="https://github.com/dandi/dandi-cli/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test etelemetry"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-didyoumean[${PYTHON_USEDEP}]
-	~dev-python/dandi-schema-0.6.0[${PYTHON_USEDEP}]
-	dev-python/fasteners[${PYTHON_USEDEP}]
-	dev-python/fscacher[${PYTHON_USEDEP}]
-	dev-python/humanize[${PYTHON_USEDEP}]
-	dev-python/interleave[${PYTHON_USEDEP}]
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/keyrings-alt[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	>=dev-python/pydantic-1.9.0[${PYTHON_USEDEP}]
-	dev-python/pynwb[${PYTHON_USEDEP}]
-	dev-python/pyout[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/semantic_version[${PYTHON_USEDEP}]
-	dev-python/tenacity[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/zarr[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	test? (
-		dev-python/anys[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		media-libs/opencv[ffmpeg,${PYTHON_USEDEP}]
-	)
-"
-# Upstream might be amenable to dropping opencv:
-# https://github.com/dandi/dandi-cli/issues/944
-
-# Some tests require deep copy with git history
-# https://github.com/dandi/dandi-cli/issues/878#issuecomment-1021720299
-EPYTEST_DESELECT=(
-	"dandi/tests/test_utils.py::test_get_instance_dandi_with_api"
-	"dandi/tests/test_utils.py::test_get_instance_url"
-	"dandi/tests/test_utils.py::test_get_instance_cli_version_too_old"
-	"dandi/tests/test_utils.py::test_get_instance_bad_cli_version"
-)
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.37.0-pip-versioncheck.patch"
-	"${FILESDIR}/${PN}-0.37.0-pep517.patch"
-)
-
-src_prepare() {
-	if use etelemetry; then
-		default
-	else
-		eapply "${FILESDIR}/${PN}-0.28.0-no-etelemetry.patch"
-		default
-		sed -i "/etelemetry/d" setup.cfg
-	fi
-}
-
-python_test() {
-	export DANDI_TESTS_NONETWORK=1
-	epytest
-}
diff --git a/dev-vcs/dandi-cli/dandi-cli-0.39.4.ebuild b/dev-vcs/dandi-cli/dandi-cli-0.39.4.ebuild
deleted file mode 100644
index a83a0b219..000000000
--- a/dev-vcs/dandi-cli/dandi-cli-0.39.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="DANDI command line client to facilitate common operations"
-HOMEPAGE="https://github.com/dandi/dandi-cli"
-SRC_URI="https://github.com/dandi/dandi-cli/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test etelemetry"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-didyoumean[${PYTHON_USEDEP}]
-	~dev-python/dandi-schema-0.6.0[${PYTHON_USEDEP}]
-	dev-python/fasteners[${PYTHON_USEDEP}]
-	dev-python/fscacher[${PYTHON_USEDEP}]
-	dev-python/humanize[${PYTHON_USEDEP}]
-	dev-python/interleave[${PYTHON_USEDEP}]
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/keyrings-alt[${PYTHON_USEDEP}]
-	dev-python/nwbinspector[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	>=dev-python/pydantic-1.9.0[${PYTHON_USEDEP}]
-	dev-python/pynwb[${PYTHON_USEDEP}]
-	dev-python/pyout[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/semantic_version[${PYTHON_USEDEP}]
-	dev-python/tenacity[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/zarr[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/anys[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		media-libs/opencv[ffmpeg,${PYTHON_USEDEP}]
-	)
-"
-# Upstream might be amenable to dropping opencv:
-# https://github.com/dandi/dandi-cli/issues/944
-
-# Some tests require deep copy with git history
-# https://github.com/dandi/dandi-cli/issues/878#issuecomment-1021720299
-EPYTEST_DESELECT=(
-	"dandi/tests/test_utils.py::test_get_instance_dandi_with_api"
-	"dandi/tests/test_utils.py::test_get_instance_url"
-	"dandi/tests/test_utils.py::test_get_instance_cli_version_too_old"
-	"dandi/tests/test_utils.py::test_get_instance_bad_cli_version"
-)
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.37.0-pip-versioncheck.patch"
-	"${FILESDIR}/${PN}-0.37.0-pep517.patch"
-)
-
-src_prepare() {
-	if use etelemetry; then
-		default
-	else
-		eapply "${FILESDIR}/${PN}-0.28.0-no-etelemetry.patch"
-		default
-		sed -i "/etelemetry/d" setup.cfg
-	fi
-}
-
-python_test() {
-	export DANDI_TESTS_NONETWORK=1
-	epytest
-}
diff --git a/dev-vcs/dandi-cli/dandi-cli-0.45.1.ebuild b/dev-vcs/dandi-cli/dandi-cli-0.61.0.ebuild
index 0453e2f00..35ac320f5 100644
--- a/dev-vcs/dandi-cli/dandi-cli-0.45.1.ebuild
+++ b/dev-vcs/dandi-cli/dandi-cli-0.61.0.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{10..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 MY_PN="dandi"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="DANDI command line client to facilitate common operations"
 HOMEPAGE="https://github.com/dandi/dandi-cli"
-#SRC_URI="https://github.com/dandi/dandi-cli/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="$(pypi_sdist_url dandi)"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -22,10 +21,11 @@ KEYWORDS="~amd64"
 IUSE="test etelemetry"
 
 RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
+	>=dev-python/dandi-schema-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-2.0.0[${PYTHON_USEDEP}]
+	>=sci-biology/bidsschematools-0.7.0[${PYTHON_USEDEP}]
 	dev-python/click-didyoumean[${PYTHON_USEDEP}]
-	=dev-python/dandi-schema-0.7*[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
 	dev-python/fasteners[${PYTHON_USEDEP}]
 	dev-python/fscacher[${PYTHON_USEDEP}]
 	dev-python/humanize[${PYTHON_USEDEP}]
@@ -35,25 +35,29 @@ RDEPEND="
 	dev-python/keyrings-alt[${PYTHON_USEDEP}]
 	dev-python/nwbinspector[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/platformdirs[${PYTHON_USEDEP}]
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	>=dev-python/pydantic-1.9.0[${PYTHON_USEDEP}]
 	dev-python/pynwb[${PYTHON_USEDEP}]
 	dev-python/pyout[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/semantic_version[${PYTHON_USEDEP}]
+	dev-python/semantic-version[${PYTHON_USEDEP}]
 	dev-python/tenacity[${PYTHON_USEDEP}]
+	dev-python/versioneer[${PYTHON_USEDEP}]
 	dev-python/wheel[${PYTHON_USEDEP}]
 	dev-python/zarr[${PYTHON_USEDEP}]
+	>=dev-python/zarr_checksum-0.4.0[${PYTHON_USEDEP}]
 "
 
 BDEPEND="
 	test? (
 		dev-python/anys[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
 		dev-python/pyfakefs[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
 		media-libs/opencv[ffmpeg,${PYTHON_USEDEP}]
 	)
 "
@@ -62,17 +66,13 @@ BDEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
-distutils_enable_tests pytest
+EPYTEST_DESELECT=(
+	# Reported upstream:
+	# https://github.com/dandi/dandi-cli/issues/1394
+	dandi/cli/tests/test_command.py::test_no_heavy_imports
+)
 
-src_prepare() {
-	if use etelemetry; then
-		default
-	else
-		eapply "${FILESDIR}/${PN}-0.28.0-no-etelemetry.patch"
-		default
-		sed -i "/etelemetry/d" setup.cfg
-	fi
-}
+distutils_enable_tests pytest
 
 python_test() {
 	export DANDI_TESTS_NONETWORK=1
diff --git a/dev-vcs/dandi-cli/dandi-cli-0.46.6.ebuild b/dev-vcs/dandi-cli/dandi-cli-0.61.2.ebuild
index 581257bdb..760fb32b4 100644
--- a/dev-vcs/dandi-cli/dandi-cli-0.46.6.ebuild
+++ b/dev-vcs/dandi-cli/dandi-cli-0.61.2.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{10..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 MY_PN="dandi"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="DANDI command line client to facilitate common operations"
 HOMEPAGE="https://github.com/dandi/dandi-cli"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="$(pypi_sdist_url dandi)"
+
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -21,10 +23,12 @@ KEYWORDS="~amd64"
 IUSE="test etelemetry"
 
 RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
+	>=dev-python/dandi-schema-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-2.0.0[${PYTHON_USEDEP}]
+	>=sci-biology/bidsschematools-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/zarr_checksum-0.4.0[${PYTHON_USEDEP}]
 	dev-python/click-didyoumean[${PYTHON_USEDEP}]
-	=dev-python/dandi-schema-0.7*[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
 	dev-python/fasteners[${PYTHON_USEDEP}]
 	dev-python/fscacher[${PYTHON_USEDEP}]
 	dev-python/humanize[${PYTHON_USEDEP}]
@@ -34,45 +38,43 @@ RDEPEND="
 	dev-python/keyrings-alt[${PYTHON_USEDEP}]
 	dev-python/nwbinspector[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/platformdirs[${PYTHON_USEDEP}]
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	>=dev-python/pydantic-1.9.0[${PYTHON_USEDEP}]
 	dev-python/pynwb[${PYTHON_USEDEP}]
 	dev-python/pyout[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/semantic_version[${PYTHON_USEDEP}]
+	dev-python/semantic-version[${PYTHON_USEDEP}]
 	dev-python/tenacity[${PYTHON_USEDEP}]
+	dev-python/versioneer[${PYTHON_USEDEP}]
 	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/yarl[${PYTHON_USEDEP}]
 	dev-python/zarr[${PYTHON_USEDEP}]
 "
 
 BDEPEND="
 	test? (
 		dev-python/anys[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
 		dev-python/pyfakefs[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
 		media-libs/opencv[ffmpeg,${PYTHON_USEDEP}]
 	)
 "
 # Upstream might be amenable to dropping opencv:
 # https://github.com/dandi/dandi-cli/issues/944
 
-S="${WORKDIR}/${MY_P}"
+EPYTEST_DESELECT=(
+	# Reported upstream:
+	# https://github.com/dandi/dandi-cli/issues/1394
+	dandi/cli/tests/test_command.py::test_no_heavy_imports
+)
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	if use etelemetry; then
-		default
-	else
-		eapply "${FILESDIR}/${PN}-0.28.0-no-etelemetry.patch"
-		default
-		sed -i "/etelemetry/d" setup.cfg
-	fi
-}
-
 python_test() {
 	export DANDI_TESTS_NONETWORK=1
 	epytest
diff --git a/dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pep517.patch b/dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pep517.patch
deleted file mode 100644
index 4d4715f95..000000000
--- a/dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pep517.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a363b68b79b3dd2004912640c90958882a918537 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 4 May 2022 19:49:37 +0200
-Subject: [PATCH] Prepend to sys.path to fix versioneer in PEP517 mode
-
-Prepend the current directory to sys.path rather than appending it
-in order to fix the build in PEP517 mode properly.  If the path
-is appended and versioneer is installed on the system, the system
-versioneer.py (i.e. the module used to install versioneer into projects)
-is imported rather than the local file, and the build fails:
-
-```
-Traceback (most recent call last):
-  File "/usr/lib/python-exec/python3.10/gpep517", line 4, in <module>
-    sys.exit(main())
-  File "/usr/lib/python3.10/site-packages/gpep517/__main__.py", line 136, in main
-    return func(args)
-  File "/usr/lib/python3.10/site-packages/gpep517/__main__.py", line 44, in build_wheel
-    wheel_name = backend.build_wheel(args.wheel_dir, args.config_json)
-  File "/usr/lib/python3.10/site-packages/setuptools/build_meta.py", line 244, in build_wheel
-    return self._build_with_temp_dir(['bdist_wheel'], '.whl',
-  File "/usr/lib/python3.10/site-packages/setuptools/build_meta.py", line 229, in _build_with_temp_dir
-    self.run_setup()
-  File "/usr/lib/python3.10/site-packages/setuptools/build_meta.py", line 174, in run_setup
-    exec(compile(code, __file__, 'exec'), locals())
-  File "setup.py", line 32, in <module>
-    "version": versioneer.get_version(),
-AttributeError: module 'versioneer' has no attribute 'get_version'
-```
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index e8dddc985..05765009c 100755
---- a/setup.py
-+++ b/setup.py
-@@ -23,7 +23,7 @@
- # This is needed for versioneer to be importable when building with PEP 517.
- # See <https://github.com/warner/python-versioneer/issues/193> and links
- # therein for more information.
--sys.path.append(os.path.dirname(__file__))
-+sys.path.insert(0, os.path.dirname(__file__))
- 
- try:
-     import versioneer
diff --git a/dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pip-versioncheck.patch b/dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pip-versioncheck.patch
deleted file mode 100644
index bcc3853d3..000000000
--- a/dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pip-versioncheck.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/setup.cfg	2021-10-06 11:44:40.549337707 -0400
-+++ b/dsetup.cfg	2021-10-06 11:45:10.236935245 -0400
-@@ -30,8 +30,8 @@
-     appdirs
-     click
-     click-didyoumean
--    dandischema ~= 0.6.0
--    etelemetry >= 0.2.2
-+    dandischema
-+    etelemetry
-     fasteners
-     fscacher
-     # Specifying != might be what causes pip 19.3.1 first to install hdmf 1.5.1
diff --git a/dev-vcs/dandi-cli/files/dandi-cli-0.55.0-hdf5.patch b/dev-vcs/dandi-cli/files/dandi-cli-0.55.0-hdf5.patch
new file mode 100644
index 000000000..4cd55ca7e
--- /dev/null
+++ b/dev-vcs/dandi-cli/files/dandi-cli-0.55.0-hdf5.patch
@@ -0,0 +1,29 @@
+From d16bf0855e9ef7c029e8aca969ddfa04c1d7fdfd Mon Sep 17 00:00:00 2001
+From: "John T. Wodder II" <git@varonathe.org>
+Date: Thu, 25 May 2023 14:17:36 -0400
+Subject: [PATCH] Fix test for newer hdf5
+
+---
+ dandi/tests/test_files.py | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/dandi/tests/test_files.py b/dandi/tests/test_files.py
+index 4dbf0f223..3e44cf6b1 100644
+--- a/dandi/tests/test_files.py
++++ b/dandi/tests/test_files.py
+@@ -374,7 +374,14 @@ def test_validate_bogus(tmp_path):
+     errors = dandi_file(path).get_validation_errors()
+     # ATM we would get 2 errors -- since could not be open in two places,
+     # but that would be too rigid to test. Let's just see that we have expected errors
+-    assert any(e.message.startswith("Unable to open file") for e in errors)
++    assert any(
++        e.message.startswith(
++            ("Unable to open file", "Unable to synchronously open file")
++        )
++        for e in errors
++    )
++    # Recent versions of hdf5 changed the error message, hence the need to
++    # check for two different patterns.
+ 
+ 
+ def test_upload_zarr(new_dandiset, tmp_path):
diff --git a/dev-vcs/dandi-cli/files/dandi-cli-0.59.0-no-etelemetry.patch b/dev-vcs/dandi-cli/files/dandi-cli-0.59.0-no-etelemetry.patch
new file mode 100644
index 000000000..4d4f42a03
--- /dev/null
+++ b/dev-vcs/dandi-cli/files/dandi-cli-0.59.0-no-etelemetry.patch
@@ -0,0 +1,40 @@
+diff --git a/dandi/files/bases.py b/dandi/files/bases.py
+index 45f5929f..38bde34f 100644
+--- a/dandi/files/bases.py
++++ b/dandi/files/bases.py
+@@ -18,7 +18,6 @@ from dandischema.digests.dandietag import DandiETag
+ from dandischema.models import BareAsset, CommonModel
+ from dandischema.models import Dandiset as DandisetMeta
+ from dandischema.models import get_schema_version
+-from etelemetry import get_project
+ from packaging.version import Version
+ from pydantic import ValidationError
+ import requests
+@@ -737,6 +736,7 @@ def _get_nwb_inspector_version():
+     _current_nwbinspector_version = get_package_version(name="nwbinspector")
+     # Ensure latest version of NWB Inspector is installed and used client-side
+     try:
++        from etelemetry import get_project
+         max_version = Version(
+             get_project(repo="NeurodataWithoutBorders/nwbinspector")["version"]
+         )
+diff --git a/setup.cfg b/setup.cfg
+--- a/setup.cfg	2024-01-09 14:08:33.952653200 -0500
++++ b/setup.cfg	2024-01-25 01:45:34.594335960 -0500
+@@ -34,7 +34,6 @@
+ 	click >= 7.1
+ 	click-didyoumean
+ 	dandischema ~= 0.8.0
+-	etelemetry >= 0.2.2
+ 	fasteners
+ 	fscacher >= 0.3.0
+ 	hdmf != 3.5.0
+@@ -147,9 +146,6 @@
+ [mypy-click_didyoumean.*]
+ ignore_missing_imports = True
+
+-[mypy-etelemetry.*]
+-ignore_missing_imports = True
+-
+ [mypy-fasteners.*]
+ ignore_missing_imports = True