From e52fb36be56cce540151cbb22caa501d28a90893 Mon Sep 17 00:00:00 2001 From: Kyle Elbert Date: Sun, 17 May 2026 15:34:18 -0500 Subject: [PATCH] dev-python/cloudflare: minor cleanups Signed-off-by: Kyle Elbert --- dev-python/cloudflare/Manifest | 2 +- dev-python/cloudflare/cloudflare-5.1.0.ebuild | 32 ++++++++----------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dev-python/cloudflare/Manifest b/dev-python/cloudflare/Manifest index 40f61c2b3c..518b982fee 100644 --- a/dev-python/cloudflare/Manifest +++ b/dev-python/cloudflare/Manifest @@ -1,5 +1,5 @@ DIST cloudflare-2.19.4.gh.tar.gz 151397 BLAKE2B c91c95f52314c5177d823ef8f827ea2f76f6cc703260449aea12d54c1b77d061feca15d4bb845f84cfb4fd80789e5064e54d7530daf546d54d17054b9e0b4fda SHA512 8ae11e73760c57b610abfe5e2c8fdc83c2e0b9e07340884925ec9ac3bf5b40b4edf39b2b8ce7330538369d7573146a2ddac195efb0efb4ff657f75fdacb31aed DIST cloudflare-4.3.1.gh.tar.gz 2025113 BLAKE2B 05020324460b8857d21b2aac16e4c7fe316d5ad0bc0999a4c67e276d258cfd2cc4c85aa0fe82ed67931a2b02a3b90d39d9fd04eb3a6f8647a750bafdbe92e8a7 SHA512 36865ab8e88b2eaa3e0a5ad353db45bce55f166a96860f044bd88750de6a08a489e92492c721972be5582de551f31ba154ee6dccd386ca1b73c10864d185539a -DIST cloudflare-5.1.0.gh.tar.gz 2948037 BLAKE2B 0579a61085ddce04a491a0182411ad9f3772cd47b8a9a88f0d8dabcbee0e4cf223bc5374c2ba9d86c42d3e88e645ea50bf12ce9714b526af0a5ccf0d16f860cb SHA512 10ca9735b79d65c927fa61a0d66094e5e4020487def1e70a16676337d76e357ae84bc6abf0e274197f008818add3a026234e28492783ddd3ff9090cf2b7ee74a DIST cloudflare-python-4.3.1-prism.tar.gz 10857296 BLAKE2B b22423b4cc641243517de470c86597a13faab5aa3caa3bc6ffa2a1bcd53ae72ffdebc0eb7f693911ab4b36adf46afb8216bcb9e76085f85147b866c532147757 SHA512 5df269b007905518c5fa500d21ebabc3ec5ee06160a1454ba080c1dd0feb6c7e65a8f3684ec243e15eb28c7e4ac91c2861f83d5314576985501ae64645b70e94 DIST cloudflare-python-5.1.0-prism.tar.gz 12189459 BLAKE2B 66df6d17cb7501fa22260a61c9706dae562347af7fda6bcecb6d23b931601f135a694faed54faa4e3831c0c23edb9068d06e84ee2f7e41bf0f0c108a779887fd SHA512 4c56fde917697dd548715ca6735d3b7eef0f59b98e0f4381484248d766e785a6d1733eb3b1a94151bebb901b9b3d04531092bcce77ea805d135357bf4db69043 +DIST cloudflare-python-5.1.0.gh.tar.gz 2948037 BLAKE2B 0579a61085ddce04a491a0182411ad9f3772cd47b8a9a88f0d8dabcbee0e4cf223bc5374c2ba9d86c42d3e88e645ea50bf12ce9714b526af0a5ccf0d16f860cb SHA512 10ca9735b79d65c927fa61a0d66094e5e4020487def1e70a16676337d76e357ae84bc6abf0e274197f008818add3a026234e28492783ddd3ff9090cf2b7ee74a diff --git a/dev-python/cloudflare/cloudflare-5.1.0.ebuild b/dev-python/cloudflare/cloudflare-5.1.0.ebuild index 23c349bc2d..8213a85bbc 100644 --- a/dev-python/cloudflare/cloudflare-5.1.0.ebuild +++ b/dev-python/cloudflare/cloudflare-5.1.0.ebuild @@ -16,15 +16,15 @@ else MYPV=$(ver_rs 3 -) MYPV=${MYPV/beta/beta.} MYPN="cloudflare-python" - SRC_URI="https://github.com/cloudflare/cloudflare-python/archive/refs/tags/v${MYPV}.tar.gz -> ${P}.gh.tar.gz + SRC_URI=" + https://github.com/cloudflare/cloudflare-python/archive/refs/tags/v${MYPV}.tar.gz -> ${MYPN}-${MYPV}.gh.tar.gz test? ( https://github.com/Phoenix591/${MYPN}/releases/download/${MYPV}/${MYPN}-${MYPV}-prism.tar.gz )" #Prism archive generated by workflow # https://github.com/Phoenix591/cloudflare-python/blob/master/.github/workflows/test-tar.yml S="${WORKDIR}/${MYPN}-${MYPV}" KEYWORDS="~amd64 ~arm64" fi -LICENSE="MIT test? ( ISC Apache-2.0 MIT BSD CC0-1.0 0BSD )" -# nodejs module and deps used to test +LICENSE="MIT" SLOT="0" RDEPEND=" ${DEPEND} >=dev-python/httpx-0.23.0[${PYTHON_USEDEP}] @@ -42,24 +42,21 @@ BDEPEND="test? ( dev-python/dirty-equals[${PYTHON_USEDEP}] ${RDEPEND} )" -EPYTEST_PLUGINS=( pytest-xdist pytest-asyncio respx ) +EPYTEST_PLUGINS=( pytest-asyncio pytest-xdist respx ) +EPYTEST_DESELECT=( + tests/test_client.py::TestCloudflare::test_validate_headers + tests/test_client.py::TestAsyncCloudflare::test_validate_headers +) + distutils_enable_tests pytest RESTRICT+=" !test? ( test )" -DOCS="docs/migration-guides/v5.0.0-migration-guide.md" +DOCS=( docs/migration-guides/v5.0.0-migration-guide.md ) src_unpack() { - unpack "${P}.gh.tar.gz" + unpack "${MYPN}-${MYPV}.gh.tar.gz" use test && cd "${S}" && unpack "cloudflare-python-${MYPV}-prism.tar.gz" } -python_test() { - # these 2 tests fail in our sandbox for some reason - local EPYTEST_DESELECT=( - tests/test_client.py::TestCloudflare::test_validate_headers - tests/test_client.py::TestAsyncCloudflare::test_validate_headers ) - epytest -} - src_test() { start_mock distutils-r1_src_test @@ -71,9 +68,8 @@ start_mock() { "cloudflare-spec.yml" >prism.log || die "Failed starting prism" & echo $! >"${T}/mock.pid" || die # Wait for server to come online - echo -n "Waiting for mockserver" + einfo "Waiting for mockserver" while ! grep -q "✖ fatal\|Prism is listening" "prism.log" ; do - echo -n "." || die sleep 0.5 done if grep -q "✖ fatal" prism.log; then @@ -81,13 +77,13 @@ start_mock() { fi } stop_mock() { - kill $(cat "${T}/mock.pid") || die + kill $(<"${T}/mock.pid") || die } pkg_postinst() { if ver_replacing -lt "5.0.0_beta1"; then elog "Cloudflare 5 has several breaking changes" - elog "See /usr/share/doc/${P}/docs/v5-migration-guide.md" + elog "See /usr/share/doc/${P}/docs/v5.0.0-migration-guide.md" elog "It also includes a new optional dependency on httpx-aiohttp" elog "Check the README for details" fi