From 4909e091bf283b113e54588aa568110ba8048ad7 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 29 Mar 2023 01:56:16 +0100 Subject: dev-embedded/platformio: loosen starlette, uvicorn deps Tests pass. Closes: https://bugs.gentoo.org/888427 Signed-off-by: Sam James --- dev-embedded/platformio/platformio-6.1.6-r1.ebuild | 117 +++++++++++++++++++++ dev-embedded/platformio/platformio-6.1.6.ebuild | 113 -------------------- 2 files changed, 117 insertions(+), 113 deletions(-) create mode 100644 dev-embedded/platformio/platformio-6.1.6-r1.ebuild delete mode 100644 dev-embedded/platformio/platformio-6.1.6.ebuild diff --git a/dev-embedded/platformio/platformio-6.1.6-r1.ebuild b/dev-embedded/platformio/platformio-6.1.6-r1.ebuild new file mode 100644 index 000000000000..27e962933b2c --- /dev/null +++ b/dev-embedded/platformio/platformio-6.1.6-r1.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) + +inherit distutils-r1 udev + +DESCRIPTION="An open source ecosystem for IoT development" +HOMEPAGE="https://platformio.org/" +SRC_URI="https://github.com/platformio/platformio-core/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-core-${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + $(python_gen_cond_dep ' + =dev-python/aiofiles-22.1*[${PYTHON_USEDEP}] + dev-python/ajsonrpc[${PYTHON_USEDEP}] + =dev-python/pyserial-3[${PYTHON_USEDEP}] + =dev-python/zeroconf-0.37[${PYTHON_USEDEP}] + =dev-python/requests-2*[${PYTHON_USEDEP}] + >=dev-python/semantic_version-2.9[${PYTHON_USEDEP}] + =dev-python/pyelftools-0.27[${PYTHON_USEDEP}] + =dev-python/starlette-0.21[${PYTHON_USEDEP}] + >=dev-python/uvicorn-0.19[${PYTHON_USEDEP}] + dev-python/wsproto[${PYTHON_USEDEP}] + ') + virtual/udev" +DEPEND="virtual/udev" +BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/jsondiff[${PYTHON_USEDEP}]') )" + +# This list could be refined a bit to have individual tests which need network +# (within EPYTEST_DESELECT) but so many need it that it doesn't seem worth it right now. +EPYTEST_IGNORE=( + # Requires network access + tests/test_builder.py + tests/package/test_manager.py + tests/package/test_manifest.py + tests/commands/test_platform.py + tests/commands/test_test.py + tests/commands/test_ci.py + tests/commands/test_init.py + tests/commands/test_lib.py + tests/commands/test_lib_complex.py + tests/commands/test_boards.py + tests/commands/test_check.py + tests/commands/test_run.py + tests/commands/pkg/test_exec.py + tests/commands/pkg/test_list.py + tests/commands/pkg/test_outdated.py + tests/commands/pkg/test_search.py + tests/commands/pkg/test_show.py + tests/commands/pkg/test_install.py + tests/commands/pkg/test_uninstall.py + tests/commands/pkg/test_update.py + tests/misc/ino2cpp/test_ino2cpp.py + tests/test_maintenance.py + tests/test_misc.py +) + +EPYTEST_DESELECT=( + # Requires network access + tests/misc/test_maintenance.py::test_check_pio_upgrade + tests/misc/test_misc.py::test_ping_internet_ips + tests/misc/test_misc.py::test_api_cache +) + +distutils_enable_tests pytest + +python_prepare_all() { + # Allow newer versions of: + # - zeroconf, bug #831181. + # - wsproto + # - semantic_version, bug #853247 + # - starlette & uvicorn, bug #888427 + sed \ + -e '/zeroconf/s/<[0-9.*]*//' \ + -e '/wsproto/s/==.*/"/' \ + -e '/semantic_version/s/==[0-9.*]*//' \ + -e '/starlette/s/==.*/"/' \ + -e '/uvicorn/s/==.*/"/' \ + -i setup.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + epytest -k "not skip_ci" +} + +src_install() { + distutils-r1_src_install + udev_dorules platformio/assets/system/99-platformio-udev.rules +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/dev-embedded/platformio/platformio-6.1.6.ebuild b/dev-embedded/platformio/platformio-6.1.6.ebuild deleted file mode 100644 index 6c0dd8fa4f4b..000000000000 --- a/dev-embedded/platformio/platformio-6.1.6.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 udev - -DESCRIPTION="An open source ecosystem for IoT development" -HOMEPAGE="https://platformio.org/" -SRC_URI="https://github.com/platformio/platformio-core/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/${PN}-core-${PV} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - $(python_gen_cond_dep ' - =dev-python/aiofiles-22.1*[${PYTHON_USEDEP}] - dev-python/ajsonrpc[${PYTHON_USEDEP}] - =dev-python/pyserial-3[${PYTHON_USEDEP}] - =dev-python/zeroconf-0.37[${PYTHON_USEDEP}] - =dev-python/requests-2*[${PYTHON_USEDEP}] - >=dev-python/semantic_version-2.9[${PYTHON_USEDEP}] - =dev-python/pyelftools-0.27[${PYTHON_USEDEP}] -