* [gentoo-commits] repo/gentoo:master commit in: dev-python/vcrpy/files/, dev-python/vcrpy/
@ 2024-02-11 13:10 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2024-02-11 13:10 UTC (permalink / raw
To: gentoo-commits
commit: a0197b61755ff951b00d54f51e1b7d6d42e0c7e1
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 13:03:48 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 13:10:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0197b61
dev-python/vcrpy: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/vcrpy/Manifest | 2 -
dev-python/vcrpy/files/vcrpy-5.1.0-py312.patch | 35 --------------
dev-python/vcrpy/vcrpy-5.1.0.ebuild | 67 --------------------------
dev-python/vcrpy/vcrpy-6.0.0.ebuild | 62 ------------------------
4 files changed, 166 deletions(-)
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index ffd285abcec2..c46c3f45a3a1 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,3 +1 @@
-DIST vcrpy-5.1.0.gh.tar.gz 337183 BLAKE2B 76805db7c034fe4f6e0d6fb18340ad24a25a28ece4576d97958d689e46667a8ab2fb6cdc8186f635a7c4f4833d4ea541573bf6c5e0f775f842e60683336ad87e SHA512 dfb2e02027ed2e37f4c2201b410847cf1f03b1999853e3f838e49abf1e93641d58addb18f6144c484f9d4618693b9a99d73dc7fb55eb1de2c383109e054e3713
-DIST vcrpy-6.0.0.gh.tar.gz 337408 BLAKE2B b335b3e89b759b111e34ed26753d528ce0b83bd6e408b35bb60371ada1d773e8e6e690991d468ae63fb61b799c2f79f2677043bc8a56a3b95fec477ee7c679e3 SHA512 d10c8a01843b8390c16fda26b0266d8b89d9d95978f99127f0c261e94dab6b7c358522fa6d059063e3c194885e8be46ef206bdfc1252511840058dd5df4cf11d
DIST vcrpy-6.0.1.gh.tar.gz 337497 BLAKE2B a00571d7ed0dd895cc120e3e2615e8e6ea3e86344813e87f836a182be45389b200925ae2a02dc754b0b77db642d3be453b3b8c909b26197222b84fa95c6da804 SHA512 79ba9ea29db20ddc3db5676d7bdb05da17848eb126ed63d813a1d2b0de80573fff3afaec2ffe1af491a0310ce922c7545c4569035d0f5868f171db25965c217f
diff --git a/dev-python/vcrpy/files/vcrpy-5.1.0-py312.patch b/dev-python/vcrpy/files/vcrpy-5.1.0-py312.patch
deleted file mode 100644
index 2dc9fdf09e88..000000000000
--- a/dev-python/vcrpy/files/vcrpy-5.1.0-py312.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 69621c67fb29dedd9ece4a7bdbf50380fbe4c5ee Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 3 Aug 2023 06:51:45 +0200
-Subject: [PATCH] Copy `debuglevel` and `_http_vsn` attrs into response classes
-
-Copy the `debuglevel` and `_http_vsn` attributes from base connection
-class into response classes, in order to fix compatibility with
-Python 3.12. For reasons I don't comprehend, these end up being called
-on the class rather than instance, so regular proxying logic does not
-work.
-
-Fixes #707
----
- vcr/stubs/__init__.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/vcr/stubs/__init__.py b/vcr/stubs/__init__.py
-index dafaec71..4d4bb39d 100644
---- a/vcr/stubs/__init__.py
-+++ b/vcr/stubs/__init__.py
-@@ -389,6 +389,8 @@ class VCRHTTPConnection(VCRConnection):
-
- _baseclass = HTTPConnection
- _protocol = "http"
-+ debuglevel = _baseclass.debuglevel
-+ _http_vsn = _baseclass._http_vsn
-
-
- class VCRHTTPSConnection(VCRConnection):
-@@ -397,3 +399,5 @@ class VCRHTTPSConnection(VCRConnection):
- _baseclass = HTTPSConnection
- _protocol = "https"
- is_verified = True
-+ debuglevel = _baseclass.debuglevel
-+ _http_vsn = _baseclass._http_vsn
diff --git a/dev-python/vcrpy/vcrpy-5.1.0.ebuild b/dev-python/vcrpy/vcrpy-5.1.0.ebuild
deleted file mode 100644
index 0cc7495e8266..000000000000
--- a/dev-python/vcrpy/vcrpy-5.1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-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 ~ia64 ~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[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-py312.patch"
-)
-
-distutils_enable_tests pytest
-
-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
- # broken in general
- tests/integration/test_boto.py
- # Internet
- tests/integration/test_tornado.py
- # broken by simplejson, doesn't seem important
- # https://github.com/kevin1024/vcrpy/issues/751
- tests/unit/test_serialize.py::test_serialize_binary_request
- # new httpbin, sigh
- # https://github.com/kevin1024/vcrpy/issues/761
- tests/integration/test_basic.py::test_basic_json_use
- tests/integration/test_register_persister.py::test_load_cassette_with_custom_persister
- )
-
- local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
- epytest -m 'not online'
-}
diff --git a/dev-python/vcrpy/vcrpy-6.0.0.ebuild b/dev-python/vcrpy/vcrpy-6.0.0.ebuild
deleted file mode 100644
index 212c7bfe7855..000000000000
--- a/dev-python/vcrpy/vcrpy-6.0.0.ebuild
+++ /dev/null
@@ -1,62 +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..12} )
-
-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 ~ia64 ~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[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-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)
- epytest -m 'not online'
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/vcrpy/files/, dev-python/vcrpy/
@ 2024-02-16 18:38 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2024-02-16 18:38 UTC (permalink / raw
To: gentoo-commits
commit: f580c35947fac3dc7d48795941be7e61660699f1
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 18:37:29 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 18:38:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f580c359
dev-python/vcrpy: Fix compatibility with patched httpbin
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../vcrpy/files/vcrpy-6.0.1-httpbin-compat.patch | 40 ++++++++++++++++++++++
dev-python/vcrpy/vcrpy-6.0.1.ebuild | 5 +++
2 files changed, 45 insertions(+)
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
new file mode 100644
index 000000000000..4e2a91cb4bac
--- /dev/null
+++ b/dev-python/vcrpy/files/vcrpy-6.0.1-httpbin-compat.patch
@@ -0,0 +1,40 @@
+From e60dafb8dce589e7deb63fec552f5c05bd19ac6d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+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.ebuild b/dev-python/vcrpy/vcrpy-6.0.1.ebuild
index 6e8afec2a509..257bac69d0b4 100644
--- a/dev-python/vcrpy/vcrpy-6.0.1.ebuild
+++ b/dev-python/vcrpy/vcrpy-6.0.1.ebuild
@@ -38,6 +38,11 @@ BDEPEND="
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:
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/vcrpy/files/, dev-python/vcrpy/
@ 2024-10-26 15:29 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2024-10-26 15:29 UTC (permalink / raw
To: gentoo-commits
commit: b5a801f459a98af551c1671dbe6760d2b3a1e731
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 26 15:27:28 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> 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 <mgorny <AT> 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?= <mgorny@gentoo.org>
-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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-26 15:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-16 18:38 [gentoo-commits] repo/gentoo:master commit in: dev-python/vcrpy/files/, dev-python/vcrpy/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-10-26 15:29 Michał Górny
2024-02-11 13:10 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox