diff --git a/dev-vcs/dandi-cli/Manifest b/dev-vcs/dandi-cli/Manifest index 9b66f8a..55dccd5 100644 --- a/dev-vcs/dandi-cli/Manifest +++ b/dev-vcs/dandi-cli/Manifest @@ -1,3 +1,4 @@ DIST dandi-cli-0.34.1.tar.gz 179765 SHA256 7b8ef65b49c6adb42c927018214f11a9c549ba6297373c929b551e1443ca95c0 SHA512 c6e42052a3bbce374589eea43f3cef9525f2d95b555731dc2899f432567c92ab6425a59b131f22f547b9e74a6225462e2dc50a7c3f1b707e17fb49e75d2e0d55 WHIRLPOOL 89b9aa5b6682d4ba2c0b035ea90ad5b77fc025cb7cfd474dc8d41297e3efc567c1ded27751912c0b588f87927a117984889907c60b49dda80eb26bac8be1c93b DIST dandi-cli-0.35.0.tar.gz 180324 SHA256 c05706225096cc2357552c822d6c8da985b553d2b0406415cc0037acac50222f SHA512 07689e678d064501ec6879eeb40389c87491cbde4321b382c5c1041b9a8228845086978629327a9b271b5ac62f4c66e4d3c32c1edffead93ec66ce4d03b96d9a WHIRLPOOL bd970e1983a49a7af547431fb2717cf706884fcc232698b548d687d4971699da49bff818a64081f8d83628f165996fa40182331f740933e87d69cffcd4d85d06 DIST dandi-cli-0.37.0.tar.gz 212121 SHA256 4bf40a179d68ae4f0b28a5b62db6da8d14e17e9cb3b747162379cceab8055448 SHA512 fe96b760bb8526cf2670be4523121b389ede82699a8b13a9b46e4511012ab15390d9aec35b5403fa4d52dd79738a37980bcc83755df738b4039ae56eb6ca0f14 WHIRLPOOL 62a0fdc4f527bc246dd0452fd481e19bd07b146b9e118b8caa71227be78f5573649b0f55912cf54fe9606dc0de579692f94cc5a92f5c9a59a9d6c091bc3c068f +DIST dandi-cli-0.38.0.tar.gz 322974 SHA256 654f9da46f9f81d8a023c62ecf4aa7cc42c20e677fc2073341df4b1a044523fc SHA512 a77d834dadbd532ce016425fe25324582a5d2c442b52087d5751770d99c84fa9532a08525ee75f40d45ccb5c50ed11b9fbe0c29a24c7d1b24c253d218538e054 WHIRLPOOL 00c3dbbc2673a6591e0b0c79339bb1320cf1471f2b667ee106590581d39b714ecd7ea94f148bb17a4e13a7f22204dba3ccd611b84002db09060b65a82d6fca5f diff --git a/dev-vcs/dandi-cli/dandi-cli-0.37.0.ebuild b/dev-vcs/dandi-cli/dandi-cli-0.37.0.ebuild index 1102e7f..48c1627 100644 --- a/dev-vcs/dandi-cli/dandi-cli-0.37.0.ebuild +++ b/dev-vcs/dandi-cli/dandi-cli-0.37.0.ebuild @@ -49,8 +49,11 @@ DEPEND=" 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 @@ -60,13 +63,6 @@ EPYTEST_DESELECT=( "dandi/tests/test_utils.py::test_get_instance_cli_version_too_old" "dandi/tests/test_utils.py::test_get_instance_bad_cli_version" ) -# Opencv test fail as of now: -# https://github.com/dandi/dandi-cli/issues/944 -# add media-libs/opencv[${PYTHON_USEDEP}] to DEPEND test? -EPYTEST_DESELECT+=( - "dandi/tests/test_organize.py::test_video_organize" - "dandi/tests/test_organize.py::test_video_organize_common" -) distutils_enable_tests pytest diff --git a/dev-vcs/dandi-cli/dandi-cli-0.38.0.ebuild b/dev-vcs/dandi-cli/dandi-cli-0.38.0.ebuild new file mode 100644 index 0000000..48c1627 --- /dev/null +++ b/dev-vcs/dandi-cli/dandi-cli-0.38.0.ebuild @@ -0,0 +1,86 @@ +# 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}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test etelemetry" + +RDEPEND=" + dev-python/appdirs[${PYTHON_USEDEP}] + dev-python/click[${PYTHON_USEDEP}] + dev-python/click-didyoumean[${PYTHON_USEDEP}] + ~dev-python/dandischema-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" +) + +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 +}