From bd41223a5c8c040b01fa500ecd68c1433039cf21 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Tue, 21 Jan 2025 17:54:52 +0000 Subject: Adding metadata --- dev-python/cloudflare/Manifest | 4 +- dev-python/cloudflare/cloudflare-3.1.0-r3.ebuild | 101 ----------------------- dev-python/cloudflare/cloudflare-4.0.0.ebuild | 100 ++++++++++++++++++++++ 3 files changed, 102 insertions(+), 103 deletions(-) delete mode 100644 dev-python/cloudflare/cloudflare-3.1.0-r3.ebuild create mode 100644 dev-python/cloudflare/cloudflare-4.0.0.ebuild (limited to 'dev-python/cloudflare') diff --git a/dev-python/cloudflare/Manifest b/dev-python/cloudflare/Manifest index 6d6b442851e1..f6b85cb49255 100644 --- a/dev-python/cloudflare/Manifest +++ b/dev-python/cloudflare/Manifest @@ -1,3 +1,3 @@ DIST cloudflare-2.19.4.gh.tar.gz 151397 BLAKE2B c91c95f52314c5177d823ef8f827ea2f76f6cc703260449aea12d54c1b77d061feca15d4bb845f84cfb4fd80789e5064e54d7530daf546d54d17054b9e0b4fda SHA512 8ae11e73760c57b610abfe5e2c8fdc83c2e0b9e07340884925ec9ac3bf5b40b4edf39b2b8ce7330538369d7573146a2ddac195efb0efb4ff657f75fdacb31aed -DIST cloudflare-3.1.0.gh.tar.gz 1436993 BLAKE2B 136ed341bd16bd04165d94c10d82b2ad617a434728b290aff1dfc9bf11193786011224feeef567455df451efc7921c41c9835e80413738f80db60b3213396df8 SHA512 72f42012e8b4a4497523d159139ebbcef99b75f58a55a429ecb3dcdcfdad3ce3b3694cccb06bc6ec72c6148b1e1516083bda0fb43babdeb8933561e5821fbb1d -DIST cloudflare-python-3.1.0-prism.tar.gz 10537403 BLAKE2B 67caa6b98f452890ea9613e875d534ddb14c8d3720af5c57bceb04e2e3518702ecafe1bf37f02e53818f8cbc5c6bd8c799c18342879b07d39ba64831168f5495 SHA512 718f968755c62aa4b66bbf3659437751734c3183d6c5d48b025b72355d59414578bb0748f01fa38d46c33736af10d52742723a4eda47d9868d86ec2b499ece27 +DIST cloudflare-4.0.0.gh.tar.gz 1715334 BLAKE2B 3ec5ace00c173caec36e75001a7f0fb08e3747902cfbd45a29958c7d4a124b93b24c431ed0967d2100056de7b3063625379723512aee4be7a03dfeb2c4bdbc5a SHA512 ac156af42cadfd1c63568df485c816de0b3720af18ec12b25cb88e06476e817707a29de91bfce8da3b7f7b4e690b6c33aa6c38bc2b485901e81e032dae0d0109 +DIST cloudflare-python-4.0.0-prism.tar.gz 10687934 BLAKE2B d8696ec3f20d56e8ed5578d96ff41e4b90faf8d440b734b76d7217b8127f1c428e523f75f266cd9a677a3501b961844107afb03b2ec06f9940aadbf369a3567e SHA512 0d622922f26f9a6749858f226ff8ac5baee613a771e9cbe16787932304b5c1654c1a6d928ce7fe4734bc0710f3357160dcbe441f9238ae8c33cde02435e169e8 diff --git a/dev-python/cloudflare/cloudflare-3.1.0-r3.ebuild b/dev-python/cloudflare/cloudflare-3.1.0-r3.ebuild deleted file mode 100644 index 561ef9b3b894..000000000000 --- a/dev-python/cloudflare/cloudflare-3.1.0-r3.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9,10,11,12,13} ) -DISTUTILS_USE_PEP517="hatchling" -inherit distutils-r1 -DESCRIPTION="Python wrapper for the Cloudflare v4 API" -HOMEPAGE="https://pypi.org/project/cloudflare/" -if [ "${PV}" == 9999 ]; then - EGIT_REPO_URI="https://github.com/cloudflare/cloudflare-python" - inherit git-r3 -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 - test? ( https://github.com/Phoenix591/${MYPN}/releases/download/${PV}/${MYPN}-${PV}-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 -SLOT="3" -RDEPEND=" ${DEPEND} - >=dev-python/httpx-0.23.0[${PYTHON_USEDEP}] - =dev-python/pydantic-2.9*[${PYTHON_USEDEP}] - >=dev-python/typing-extensions-4.7.0[${PYTHON_USEDEP}] - >=dev-python/anyio-4.3.0[${PYTHON_USEDEP}] - >=dev-python/distro-1.7.0[${PYTHON_USEDEP}] - >=dev-python/sniffio-1.3.1[${PYTHON_USEDEP}] - prism.log || die "Failed starting prism" & - echo $! >"${T}/mock.pid" || die - # Wait for server to come online - echo -n "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 - die "Prism mock server failed" - fi -} -stop_mock() { - kill $(cat "${T}/mock.pid") || die -} diff --git a/dev-python/cloudflare/cloudflare-4.0.0.ebuild b/dev-python/cloudflare/cloudflare-4.0.0.ebuild new file mode 100644 index 000000000000..c1ed94e2cdc1 --- /dev/null +++ b/dev-python/cloudflare/cloudflare-4.0.0.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9,10,11,12,13} ) +DISTUTILS_USE_PEP517="hatchling" +inherit distutils-r1 +DESCRIPTION="Python wrapper for the Cloudflare v4 API" +HOMEPAGE="https://pypi.org/project/cloudflare/" +if [ "${PV}" == 9999 ]; then + EGIT_REPO_URI="https://github.com/cloudflare/cloudflare-python" + inherit git-r3 +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 + test? ( https://github.com/Phoenix591/${MYPN}/releases/download/${PV}/${MYPN}-${PV}-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 +SLOT="0" +RDEPEND=" ${DEPEND} + >=dev-python/httpx-0.23.0[${PYTHON_USEDEP}] + >=dev-python/pydantic-2.9.2[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-4.7.0[${PYTHON_USEDEP}] + >=dev-python/anyio-4.3.0[${PYTHON_USEDEP}] + >=dev-python/distro-1.7.0[${PYTHON_USEDEP}] + >=dev-python/sniffio-1.3.1[${PYTHON_USEDEP}] + " + +BDEPEND="test? ( + >=net-libs/nodejs-18.20.1 + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/time-machine[${PYTHON_USEDEP}] + dev-python/dirty-equals[${PYTHON_USEDEP}] + dev-python/respx[${PYTHON_USEDEP}] + ${RDEPEND} +)" + +distutils_enable_tests pytest +RESTRICT+=" !test? ( test )" + +src_unpack() { + unpack "${P}.gh.tar.gz" + use test && cd "${S}" && unpack "cloudflare-python-${PV}-prism.tar.gz" +} + +#python_prepare_all() { +# # don't install tests or examples +# sed -i -e "s/'cli4', 'examples'/'cli4'/" \ +# -e "s#'CloudFlare/tests',##" \ +# setup.py || die +# sed -i -e "/def test_ips7_should_fail():/i@pytest.mark.xfail(reason='Now fails upstream')" \ +# -e "2s/^/import pytest/" \ +# CloudFlare/tests/test_cloudflare_calls.py || die +# distutils-r1_python_prepare_all +#} + +python_test() { + # these 2 tests fail in an ebuild environment for some reason + # help appreciated + local EPYTEST_DESELECT=( + tests/test_client.py::TestCloudflare::test_validate_headers + tests/test_client.py::TestAsyncCloudflare::test_validate_headers ) + #intermittently fail for unknown reasons, passed along to upstream + EPYTEST_DESELECT+=( + tests/test_client.py::TestAsyncCloudflare::test_copy_build_request + tests/test_client.py::TestCloudflare::test_copy_build_request ) + epytest +} + +src_test() { + start_mock + distutils-r1_src_test + stop_mock +} +start_mock() { +# Run prism mock api server, this is what needs nodejs + node --no-warnings node_modules/@stainless-api/prism-cli/dist/index.js 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" + while ! grep -q "✖ fatal\|Prism is listening" "prism.log" ; do + echo -n "." || die + sleep 0.5 + done + if grep -q "✖ fatal" prism.log; then + die "Prism mock server failed" + fi +} +stop_mock() { + kill $(cat "${T}/mock.pid") || die +} -- cgit v1.3