From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0C4D6158042 for ; Sat, 26 Oct 2024 15:29:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30D7BE092E; Sat, 26 Oct 2024 15:29:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A40AE092E for ; Sat, 26 Oct 2024 15:29:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A4F53430CD for ; Sat, 26 Oct 2024 15:29:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E3BD51F0B for ; Sat, 26 Oct 2024 15:29:02 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1729956448.b5a801f459a98af551c1671dbe6760d2b3a1e731.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/vcrpy/files/, dev-python/vcrpy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/vcrpy/Manifest dev-python/vcrpy/files/vcrpy-6.0.1-httpbin-compat.patch dev-python/vcrpy/vcrpy-6.0.1-r1.ebuild X-VCS-Directories: dev-python/vcrpy/files/ dev-python/vcrpy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b5a801f459a98af551c1671dbe6760d2b3a1e731 X-VCS-Branch: master Date: Sat, 26 Oct 2024 15:29:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 12a7f05b-52ea-4f2f-bfeb-1a79dd71a992 X-Archives-Hash: 697eb303f82bb52fb7cd1dae12dec0fd commit: b5a801f459a98af551c1671dbe6760d2b3a1e731 Author: Michał Górny gentoo org> AuthorDate: Sat Oct 26 15:27:28 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Oct 26 15:27:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5a801f4 dev-python/vcrpy: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/vcrpy/Manifest | 1 - .../vcrpy/files/vcrpy-6.0.1-httpbin-compat.patch | 40 ------------- dev-python/vcrpy/vcrpy-6.0.1-r1.ebuild | 69 ---------------------- 3 files changed, 110 deletions(-) diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest index 6b02aaa02da9..2b7468425c59 100644 --- a/dev-python/vcrpy/Manifest +++ b/dev-python/vcrpy/Manifest @@ -1,2 +1 @@ -DIST vcrpy-6.0.1.gh.tar.gz 337497 BLAKE2B a00571d7ed0dd895cc120e3e2615e8e6ea3e86344813e87f836a182be45389b200925ae2a02dc754b0b77db642d3be453b3b8c909b26197222b84fa95c6da804 SHA512 79ba9ea29db20ddc3db5676d7bdb05da17848eb126ed63d813a1d2b0de80573fff3afaec2ffe1af491a0310ce922c7545c4569035d0f5868f171db25965c217f DIST vcrpy-6.0.2.gh.tar.gz 338830 BLAKE2B 946c30bc7d0a5663b2dea8989b298665fba6ce63dcb59127e7e444a1384457d65838ba0b24bac7c6285196c3fe796014aa68373ebf902f3e4e8928b76df3a120 SHA512 7e6b86bd60d2a2bd9ca8843f08143ec75656fc017ef7a9df29d4ee45e09bf985e9591204c466372459eb7987951ac2dbc730783e127e0db610e25261656275b2 diff --git a/dev-python/vcrpy/files/vcrpy-6.0.1-httpbin-compat.patch b/dev-python/vcrpy/files/vcrpy-6.0.1-httpbin-compat.patch deleted file mode 100644 index 4e2a91cb4bac..000000000000 --- a/dev-python/vcrpy/files/vcrpy-6.0.1-httpbin-compat.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e60dafb8dce589e7deb63fec552f5c05bd19ac6d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Fri, 16 Feb 2024 19:33:41 +0100 -Subject: [PATCH] Improve test compatibility with legacy httpbin index - -Make the tests slightly more flexible to match both the flasgger-based -and legacy httpbin index. This is needed for compatibility with -https://github.com/psf/httpbin/pull/44 when flasgger is not installed -(e.g. on architectures that are not supported by Rust). ---- - tests/integration/test_basic.py | 2 +- - tests/integration/test_register_persister.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/integration/test_basic.py b/tests/integration/test_basic.py -index bfad6153..99121456 100644 ---- a/tests/integration/test_basic.py -+++ b/tests/integration/test_basic.py -@@ -39,7 +39,7 @@ def test_basic_json_use(tmpdir, httpbin): - test_fixture = str(tmpdir.join("synopsis.json")) - with vcr.use_cassette(test_fixture, serializer="json"): - response = urlopen(httpbin.url).read() -- assert b"A simple HTTP Request & Response Service." in response -+ assert b"HTTP Request & Response Service" in response - - - def test_patched_content(tmpdir, httpbin): -diff --git a/tests/integration/test_register_persister.py b/tests/integration/test_register_persister.py -index e904197c..375f14be 100644 ---- a/tests/integration/test_register_persister.py -+++ b/tests/integration/test_register_persister.py -@@ -66,7 +66,7 @@ def test_load_cassette_with_custom_persister(tmpdir, httpbin): - - with my_vcr.use_cassette(test_fixture, serializer="json"): - response = urlopen(httpbin.url).read() -- assert b"A simple HTTP Request & Response Service." in response -+ assert b"HTTP Request & Response Service" in response - - - def test_load_cassette_persister_exception_handling(tmpdir, httpbin): diff --git a/dev-python/vcrpy/vcrpy-6.0.1-r1.ebuild b/dev-python/vcrpy/vcrpy-6.0.1-r1.ebuild deleted file mode 100644 index 38e9905c6362..000000000000 --- a/dev-python/vcrpy/vcrpy-6.0.1-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing" -HOMEPAGE=" - https://github.com/kevin1024/vcrpy/ - https://pypi.org/project/vcrpy/ -" -SRC_URI=" - https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - -RDEPEND=" - >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/requests-2.16.2[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}] - dev-python/wrapt[${PYTHON_USEDEP}] - dev-python/yarl[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - >=dev-python/pytest-httpbin-2.0.0-r1[${PYTHON_USEDEP}] - dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -PATCHES=( - # https://github.com/kevin1024/vcrpy/pull/823 - "${FILESDIR}/${P}-httpbin-compat.patch" -) - -python_test() { - local EPYTEST_DESELECT=( - # these tests are failing with recent dev-python/werkzeug; losely related: - # https://github.com/kevin1024/vcrpy/issues/645 - tests/integration/test_record_mode.py::test_new_episodes_record_mode_two_times - tests/integration/test_urllib2.py::test_random_body - tests/integration/test_urllib2.py::test_multiple_requests - # Internet - "tests/integration/test_urllib3.py::test_post[https]" - ) - - local EPYTEST_IGNORE=( - # requires boto3 - tests/integration/test_boto3.py - # Internet - tests/integration/test_tornado.py - tests/integration/test_aiohttp.py - ) - - local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs) - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -m 'not online' -p httpbin -p rerunfailures --reruns=5 -}