From 098fa6d16bae52185f44652151ef8db9fdb16653 Mon Sep 17 00:00:00 2001 From: Horea Christian Date: Thu, 31 Mar 2022 14:36:16 -0400 Subject: [PATCH] dev-vcs/dandi-cli: video tests failing and migrated to pycryptodome Upstram report: https://github.com/dandi/dandi-cli/issues/944 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Horea Christian --- dev-vcs/dandi-cli/dandi-cli-0.34.1.ebuild | 2 +- dev-vcs/dandi-cli/dandi-cli-0.35.0.ebuild | 2 +- dev-vcs/dandi-cli/dandi-cli-0.37.0.ebuild | 13 ++++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dev-vcs/dandi-cli/dandi-cli-0.34.1.ebuild b/dev-vcs/dandi-cli/dandi-cli-0.34.1.ebuild index 767e882..efc6c9f 100644 --- a/dev-vcs/dandi-cli/dandi-cli-0.34.1.ebuild +++ b/dev-vcs/dandi-cli/dandi-cli-0.34.1.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-python/keyring[${PYTHON_USEDEP}] dev-python/keyrings_alt[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pycryptodomex[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] dev-python/pydantic[${PYTHON_USEDEP}] dev-python/pynwb[${PYTHON_USEDEP}] dev-python/pyout[${PYTHON_USEDEP}] diff --git a/dev-vcs/dandi-cli/dandi-cli-0.35.0.ebuild b/dev-vcs/dandi-cli/dandi-cli-0.35.0.ebuild index b04157b..e59f3ca 100644 --- a/dev-vcs/dandi-cli/dandi-cli-0.35.0.ebuild +++ b/dev-vcs/dandi-cli/dandi-cli-0.35.0.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-python/keyring[${PYTHON_USEDEP}] dev-python/keyrings_alt[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pycryptodomex[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] dev-python/pydantic[${PYTHON_USEDEP}] dev-python/pynwb[${PYTHON_USEDEP}] dev-python/pyout[${PYTHON_USEDEP}] 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 4338ae1..1102e7f 100644 --- a/dev-vcs/dandi-cli/dandi-cli-0.37.0.ebuild +++ b/dev-vcs/dandi-cli/dandi-cli-0.37.0.ebuild @@ -16,9 +16,6 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test etelemetry" -RESTRICT="test" -# video tests fail: -# https://github.com/dandi/dandi-cli/issues/944 RDEPEND=" dev-python/appdirs[${PYTHON_USEDEP}] @@ -33,7 +30,7 @@ RDEPEND=" dev-python/keyring[${PYTHON_USEDEP}] dev-python/keyrings_alt[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pycryptodomex[${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}] @@ -52,7 +49,6 @@ DEPEND=" dev-python/responses[${PYTHON_USEDEP}] dev-python/pyfakefs[${PYTHON_USEDEP}] dev-python/pytest-mock[${PYTHON_USEDEP}] - media-libs/opencv[${PYTHON_USEDEP}] ) " @@ -64,6 +60,13 @@ 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