* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-httpbin/files/, dev-python/pytest-httpbin/
@ 2019-11-22 16:21 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2019-11-22 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 2265797ee76d7c0bf2a07259dfa41b77c86bcd65
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 14:29:35 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 16:21:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2265797e
dev-python/pytest-httpbin: Bump to 1.0.0, fix tests
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pytest-httpbin/Manifest | 1 +
.../files/pytest-httpbin-1.0.0-pypy3-hang.patch | 31 ++++++++++++++++++++++
.../pytest-httpbin/pytest-httpbin-1.0.0.ebuild | 30 +++++++++++++++++++++
3 files changed, 62 insertions(+)
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index c25da0561c3..1425c261b39 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1 +1,2 @@
DIST pytest-httpbin-0.2.3.tar.gz 9498 BLAKE2B ad41f72c80430eeea8c7f48185daf63c6adddfad36798179df27677aacc8af85419a678ba6f3df5281ca7f7ba0b3ee721cd97e5fe86eb5117417be53332f98e8 SHA512 f3c4eb67d1b02c27d8edb42622793fa3604e3f0bd5086e4986b8f0402a9fb8d7969a466be92fc6a7e301e829dbeb300183b40dccc9ec5da1d158cb4d08274f8b
+DIST pytest-httpbin-1.0.0.gh.tar.gz 17813 BLAKE2B b7e0ad9f131e4d236161b66b1d6d8e6087285a6d52df1accb044b30bcdac6c5f3350e9dbfe1cf33ab64b6d6aac6b463de81c31fd12dd950426b6ed8ef4eaf289 SHA512 2794134cc005cb969752e0c1119459d3f1e106f679942880a6b9ff507f2ee31c8ac4146a9c01b9a920368ea516443954b1b7044f7b1c270fe251f7d36adf7661
diff --git a/dev-python/pytest-httpbin/files/pytest-httpbin-1.0.0-pypy3-hang.patch b/dev-python/pytest-httpbin/files/pytest-httpbin-1.0.0-pypy3-hang.patch
new file mode 100644
index 00000000000..02f63bffa72
--- /dev/null
+++ b/dev-python/pytest-httpbin/files/pytest-httpbin-1.0.0-pypy3-hang.patch
@@ -0,0 +1,31 @@
+diff -dupr a/pytest_httpbin/serve.py b/pytest_httpbin/serve.py
+--- a/pytest_httpbin/serve.py 2019-02-11 20:54:14.000000000 +0100
++++ b/pytest_httpbin/serve.py 2019-11-22 15:50:17.407769297 +0100
+@@ -116,6 +116,7 @@ class Server(object):
+
+ def stop(self):
+ self._server.shutdown()
++ self._server.socket.close()
+
+ @property
+ def url(self):
+Only in b: pytest_httpbin.egg-info
+Only in b/tests: __pycache__
+diff -dupr a/tests/test_httpbin.py b/tests/test_httpbin.py
+--- a/tests/test_httpbin.py 2019-02-11 20:54:14.000000000 +0100
++++ b/tests/test_httpbin.py 2019-11-22 15:59:53.955324547 +0100
+@@ -1,3 +1,4 @@
++import sys
+ import unittest
+ import requests
+ import pytest_httpbin
+@@ -40,6 +41,8 @@ def test_httpbin_join(httpbin):
+ def test_httpbin_str(httpbin):
+ assert httpbin + '/foo' == httpbin.url + '/foo'
+
++@unittest.skipIf(hasattr(sys, 'pypy_version_info')
++ and sys.hexversion >= 0x03000000, 'hangs on PyPy3')
+ def test_chunked_encoding(httpbin_both):
+ assert requests.get(httpbin_both.url + '/stream/20').status_code == 200
+
+Only in b: .tox
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
new file mode 100644
index 00000000000..e13e8f79c0b
--- /dev/null
+++ b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily test your HTTP library against a local copy of httpbin"
+HOMEPAGE="https://github.com/kevin1024/pytest-httpbin
+ https://pypi.org/project/pytest-httpbin/"
+SRC_URI="https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ dev-python/httpbin[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+ "${FILESDIR}"/pytest-httpbin-1.0.0-pypy3-hang.patch
+)
+
+distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-httpbin/files/, dev-python/pytest-httpbin/
@ 2023-05-23 13:37 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2023-05-23 13:37 UTC (permalink / raw
To: gentoo-commits
commit: 6e0c8e02fc7083b8fcbb1b0d8b75af5dece8d961
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 13:34:15 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 23 13:37:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e0c8e02
dev-python/pytest-httpbin: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pytest-httpbin/Manifest | 1 -
.../files/pytest-httpbin-1.0.0-pypy3-hang.patch | 31 ----------------
.../pytest-httpbin/pytest-httpbin-1.0.2.ebuild | 43 ----------------------
3 files changed, 75 deletions(-)
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index bf5af2cacf98..d7f45743003d 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1,2 +1 @@
-DIST pytest-httpbin-1.0.2.gh.tar.gz 18727 BLAKE2B 56a7fa1c1694cad98815fc6c6f676b509942fa1fca192ecb4cb5a0d9f325d7df6ddb3a3ac67d884c8f8caba807677351c42c28a3bcba80b9196e74d666951cc2 SHA512 b4adac1c37506391d83f7772814b4a9ce5134cc6834d8758e71d39610f8b29e57e72b11b2233be51e41b2c36bc305d40fc4b260a7f83d10390f4e940df8aa366
DIST pytest-httpbin-2.0.0.gh.tar.gz 19799 BLAKE2B 7725bc958417c076ee920abce83bdad8295bc4c9551500040867650d54c306e79a1ea92b013124b793058103fc9685dbb2202be5f1b2da935509f68457d63d68 SHA512 62876590bacae6601739f5cc2eccb087024e16731afc9613b5e6928c2a2f64b73418ddcb3c4f13a4bfe1f074510f922d85411d05ebf66f123a4a09d535771b64
diff --git a/dev-python/pytest-httpbin/files/pytest-httpbin-1.0.0-pypy3-hang.patch b/dev-python/pytest-httpbin/files/pytest-httpbin-1.0.0-pypy3-hang.patch
deleted file mode 100644
index 02f63bffa72d..000000000000
--- a/dev-python/pytest-httpbin/files/pytest-httpbin-1.0.0-pypy3-hang.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -dupr a/pytest_httpbin/serve.py b/pytest_httpbin/serve.py
---- a/pytest_httpbin/serve.py 2019-02-11 20:54:14.000000000 +0100
-+++ b/pytest_httpbin/serve.py 2019-11-22 15:50:17.407769297 +0100
-@@ -116,6 +116,7 @@ class Server(object):
-
- def stop(self):
- self._server.shutdown()
-+ self._server.socket.close()
-
- @property
- def url(self):
-Only in b: pytest_httpbin.egg-info
-Only in b/tests: __pycache__
-diff -dupr a/tests/test_httpbin.py b/tests/test_httpbin.py
---- a/tests/test_httpbin.py 2019-02-11 20:54:14.000000000 +0100
-+++ b/tests/test_httpbin.py 2019-11-22 15:59:53.955324547 +0100
-@@ -1,3 +1,4 @@
-+import sys
- import unittest
- import requests
- import pytest_httpbin
-@@ -40,6 +41,8 @@ def test_httpbin_join(httpbin):
- def test_httpbin_str(httpbin):
- assert httpbin + '/foo' == httpbin.url + '/foo'
-
-+@unittest.skipIf(hasattr(sys, 'pypy_version_info')
-+ and sys.hexversion >= 0x03000000, 'hangs on PyPy3')
- def test_chunked_encoding(httpbin_both):
- assert requests.get(httpbin_both.url + '/stream/20').status_code == 200
-
-Only in b: .tox
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild
deleted file mode 100644
index ef92b210fea8..000000000000
--- a/dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild
+++ /dev/null
@@ -1,43 +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_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily test your HTTP library against a local copy of httpbin"
-HOMEPAGE="
- https://github.com/kevin1024/pytest-httpbin/
- https://pypi.org/project/pytest-httpbin/
-"
-SRC_URI="
- https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
- dev-python/httpbin[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/requests[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/pytest-httpbin-1.0.0-pypy3-hang.patch
-)
-
-EPYTEST_DESELECT=(
- tests/test_server.py::test_redirect_location_is_https_for_secure_server
-)
-
-distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-httpbin/files/, dev-python/pytest-httpbin/
@ 2024-08-03 14:33 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2024-08-03 14:33 UTC (permalink / raw
To: gentoo-commits
commit: dbd4d49cdc4d2c240671a008d7841a196a219d7a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 3 13:56:38 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 14:33:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbd4d49c
dev-python/pytest-httpbin: Backport upstream cert update
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/pytest-httpbin-2.0.0-certs.patch | 83 ++++++++++++++++++++++
.../pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild | 54 ++++++++++++++
2 files changed, 137 insertions(+)
diff --git a/dev-python/pytest-httpbin/files/pytest-httpbin-2.0.0-certs.patch b/dev-python/pytest-httpbin/files/pytest-httpbin-2.0.0-certs.patch
new file mode 100644
index 000000000000..fbf8814ea63e
--- /dev/null
+++ b/dev-python/pytest-httpbin/files/pytest-httpbin-2.0.0-certs.patch
@@ -0,0 +1,83 @@
+From 7bf62b4e8848ce0990cb8d09b8b630dc4140f41b Mon Sep 17 00:00:00 2001
+From: Thomas Grainger <tagrain@gmail.com>
+Date: Tue, 30 Jul 2024 11:52:27 +0100
+Subject: [PATCH] generate certs with trustme 586f775
+
+diff --git a/pytest_httpbin/certs.py b/pytest_httpbin/certs.py
+index 75444d5..230f41b 100644
+--- a/pytest_httpbin/certs.py
++++ b/pytest_httpbin/certs.py
+@@ -15,7 +15,7 @@
+ def where():
+ """Return the preferred certificate bundle."""
+ # vendored bundle inside Requests
+- return os.path.join(os.path.dirname(__file__), "certs", "cacert.pem")
++ return os.path.join(os.path.dirname(__file__), "certs", "client.pem")
+
+
+ if __name__ == "__main__":
+diff --git a/pytest_httpbin/certs/client.pem b/pytest_httpbin/certs/client.pem
+new file mode 100644
+index 0000000..7946137
+--- /dev/null
++++ b/pytest_httpbin/certs/client.pem
+@@ -0,0 +1,12 @@
++-----BEGIN CERTIFICATE-----
++MIIB0TCCAXegAwIBAgIUScnyyX1CI+ywC6GdKol8IIwuGnkwCgYIKoZIzj0EAwIw
++RDEbMBkGA1UECgwSdHJ1c3RtZSB2MS4xLjArZGV2MSUwIwYDVQQLDBxUZXN0aW5n
++IENBICNBdXNVcWJaNG81d3pjb0tCMCAXDTAwMDEwMTAwMDAwMFoYDzMwMDAwMTAx
++MDAwMDAwWjBEMRswGQYDVQQKDBJ0cnVzdG1lIHYxLjEuMCtkZXYxJTAjBgNVBAsM
++HFRlc3RpbmcgQ0EgI0F1c1VxYlo0bzV3emNvS0IwWTATBgcqhkjOPQIBBggqhkjO
++PQMBBwNCAARhrRi78wmZY28t3/y8MTDDCsi7Lzir4WaQm96gf4/9kSolBTFVDUvB
++MkSC7Yged+2bWEzTRERZQLf88uiorUnAo0UwQzAdBgNVHQ4EFgQUHymIBJV4gCrA
++qv+6Q9pSJFtd7PYwEgYDVR0TAQH/BAgwBgEB/wIBCTAOBgNVHQ8BAf8EBAMCAYYw
++CgYIKoZIzj0EAwIDSAAwRQIgLf0sybmdbJoTIgZWrU1k11oecQbdkzh+3jFtNEFn
++zYUCIQCRXjIBDZXtyaywk3DgIggByCQxrrB5vjlnyYTd9vNUSw==
++-----END CERTIFICATE-----
+diff --git a/pytest_httpbin/certs/server.key b/pytest_httpbin/certs/server.key
+new file mode 100644
+index 0000000..fd9fd82
+--- /dev/null
++++ b/pytest_httpbin/certs/server.key
+@@ -0,0 +1,5 @@
++-----BEGIN EC PRIVATE KEY-----
++MHcCAQEEIPNMu1H1DN9x0VLZNzO3BFp5boEGyc80XFaR1ML18uFRoAoGCCqGSM49
++AwEHoUQDQgAEiNIfYxmsmjemcRRpcd4qP+x1yONFBZZli7CEKxg9j3x5j1OJPeyC
++BQ83kogrxJYLbRjdHUx4VOCEXjffmYhnMA==
++-----END EC PRIVATE KEY-----
+diff --git a/pytest_httpbin/certs/server.pem b/pytest_httpbin/certs/server.pem
+new file mode 100644
+index 0000000..7c70f64
+--- /dev/null
++++ b/pytest_httpbin/certs/server.pem
+@@ -0,0 +1,15 @@
++-----BEGIN CERTIFICATE-----
++MIICTDCCAfOgAwIBAgIUZ9rBQX/YRZFcqXCIzOSAd1D0IUcwCgYIKoZIzj0EAwIw
++RDEbMBkGA1UECgwSdHJ1c3RtZSB2MS4xLjArZGV2MSUwIwYDVQQLDBxUZXN0aW5n
++IENBICNBdXNVcWJaNG81d3pjb0tCMCAXDTAwMDEwMTAwMDAwMFoYDzMwMDAwMTAx
++MDAwMDAwWjBGMRswGQYDVQQKDBJ0cnVzdG1lIHYxLjEuMCtkZXYxJzAlBgNVBAsM
++HlRlc3RpbmcgY2VydCAjLVdQNWpjLTllQ0U0S0JxMjBZMBMGByqGSM49AgEGCCqG
++SM49AwEHA0IABIjSH2MZrJo3pnEUaXHeKj/sdcjjRQWWZYuwhCsYPY98eY9TiT3s
++ggUPN5KIK8SWC20Y3R1MeFTghF4335mIZzCjgb4wgbswHQYDVR0OBBYEFCO99Ega
++h7pEyFEJVwe09DZzNHDtMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUHymIBJV4
++gCrAqv+6Q9pSJFtd7PYwLwYDVR0RAQH/BCUwI4IJbG9jYWxob3N0hwR/AAABhxAA
++AAAAAAAAAAAAAAAAAAABMA4GA1UdDwEB/wQEAwIFoDAqBgNVHSUBAf8EIDAeBggr
++BgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMDMAoGCCqGSM49BAMCA0cAMEQCIHB0
++imdD2aQuq4DipTvnFJjmT+w8i3D/Pz8X6bPdkJW/AiATl+m4TW4BE5v1ID3ftDhz
++ja8s574nAjDAqcSL7otVpQ==
++-----END CERTIFICATE-----
+diff --git a/pytest_httpbin/serve.py b/pytest_httpbin/serve.py
+index c15c227..8310140 100644
+--- a/pytest_httpbin/serve.py
++++ b/pytest_httpbin/serve.py
+@@ -60,8 +60,8 @@ def finish_request(self, request, client_address):
+ try:
+ context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+ context.load_cert_chain(
+- os.path.join(CERT_DIR, "cert.pem"),
+- os.path.join(CERT_DIR, "key.pem"),
++ os.path.join(CERT_DIR, "server.pem"),
++ os.path.join(CERT_DIR, "server.key"),
+ )
+ with context.wrap_socket(
+ request, server_side=True, suppress_ragged_eofs=False
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..edb7415b41b3
--- /dev/null
+++ b/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild
@@ -0,0 +1,54 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily test your HTTP library against a local copy of httpbin"
+HOMEPAGE="
+ https://github.com/kevin1024/pytest-httpbin/
+ https://pypi.org/project/pytest-httpbin/
+"
+SRC_URI="
+ https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+ dev-python/httpbin[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/requests[${PYTHON_USEDEP}]
+ )
+"
+
+EPYTEST_DESELECT=(
+ tests/test_server.py::test_redirect_location_is_https_for_secure_server
+ # minor exception message mismatch on pypy3
+ # https://github.com/kevin1024/pytest-httpbin/issues/77
+ tests/test_server.py::test_dont_crash_on_handshake_timeout
+)
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ # https://github.com/kevin1024/vcrpy/issues/848
+ # https://github.com/kevin1024/pytest-httpbin/pull/90
+ "${FILESDIR}/${P}-certs.patch"
+)
+
+src_prepare() {
+ # remove old certs
+ rm -r pytest_httpbin/certs || die
+
+ distutils-r1_src_prepare
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-httpbin/files/, dev-python/pytest-httpbin/
@ 2024-10-05 7:39 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2024-10-05 7:39 UTC (permalink / raw
To: gentoo-commits
commit: 541f2890ef2228092df21aa591abe20769f483e6
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 5 07:38:07 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 5 07:38:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=541f2890
dev-python/pytest-httpbin: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pytest-httpbin/Manifest | 1 -
.../files/pytest-httpbin-2.0.0-certs.patch | 83 ----------------------
.../pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild | 54 --------------
3 files changed, 138 deletions(-)
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index 3d0dfa08d053..30a2635fad81 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1,2 +1 @@
-DIST pytest-httpbin-2.0.0.gh.tar.gz 19799 BLAKE2B 7725bc958417c076ee920abce83bdad8295bc4c9551500040867650d54c306e79a1ea92b013124b793058103fc9685dbb2202be5f1b2da935509f68457d63d68 SHA512 62876590bacae6601739f5cc2eccb087024e16731afc9613b5e6928c2a2f64b73418ddcb3c4f13a4bfe1f074510f922d85411d05ebf66f123a4a09d535771b64
DIST pytest-httpbin-2.1.0.gh.tar.gz 13140 BLAKE2B d1108b8464dbc1075007b4695810afe46fed17b51a785f12dfa184ba27efcfe88818ab8073c050334398eecfd647cd9169ef2d053e3fb424a02ece8a8d8c1518 SHA512 849985f170318ea3ad1d2af8811f3e3fef0e62bd6bdc611f061a8cd7d84a2d85d0ba9caf8c97298e1c99b979b08f1a28476927fa7abc1fa57334732ecfbdf2db
diff --git a/dev-python/pytest-httpbin/files/pytest-httpbin-2.0.0-certs.patch b/dev-python/pytest-httpbin/files/pytest-httpbin-2.0.0-certs.patch
deleted file mode 100644
index fbf8814ea63e..000000000000
--- a/dev-python/pytest-httpbin/files/pytest-httpbin-2.0.0-certs.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 7bf62b4e8848ce0990cb8d09b8b630dc4140f41b Mon Sep 17 00:00:00 2001
-From: Thomas Grainger <tagrain@gmail.com>
-Date: Tue, 30 Jul 2024 11:52:27 +0100
-Subject: [PATCH] generate certs with trustme 586f775
-
-diff --git a/pytest_httpbin/certs.py b/pytest_httpbin/certs.py
-index 75444d5..230f41b 100644
---- a/pytest_httpbin/certs.py
-+++ b/pytest_httpbin/certs.py
-@@ -15,7 +15,7 @@
- def where():
- """Return the preferred certificate bundle."""
- # vendored bundle inside Requests
-- return os.path.join(os.path.dirname(__file__), "certs", "cacert.pem")
-+ return os.path.join(os.path.dirname(__file__), "certs", "client.pem")
-
-
- if __name__ == "__main__":
-diff --git a/pytest_httpbin/certs/client.pem b/pytest_httpbin/certs/client.pem
-new file mode 100644
-index 0000000..7946137
---- /dev/null
-+++ b/pytest_httpbin/certs/client.pem
-@@ -0,0 +1,12 @@
-+-----BEGIN CERTIFICATE-----
-+MIIB0TCCAXegAwIBAgIUScnyyX1CI+ywC6GdKol8IIwuGnkwCgYIKoZIzj0EAwIw
-+RDEbMBkGA1UECgwSdHJ1c3RtZSB2MS4xLjArZGV2MSUwIwYDVQQLDBxUZXN0aW5n
-+IENBICNBdXNVcWJaNG81d3pjb0tCMCAXDTAwMDEwMTAwMDAwMFoYDzMwMDAwMTAx
-+MDAwMDAwWjBEMRswGQYDVQQKDBJ0cnVzdG1lIHYxLjEuMCtkZXYxJTAjBgNVBAsM
-+HFRlc3RpbmcgQ0EgI0F1c1VxYlo0bzV3emNvS0IwWTATBgcqhkjOPQIBBggqhkjO
-+PQMBBwNCAARhrRi78wmZY28t3/y8MTDDCsi7Lzir4WaQm96gf4/9kSolBTFVDUvB
-+MkSC7Yged+2bWEzTRERZQLf88uiorUnAo0UwQzAdBgNVHQ4EFgQUHymIBJV4gCrA
-+qv+6Q9pSJFtd7PYwEgYDVR0TAQH/BAgwBgEB/wIBCTAOBgNVHQ8BAf8EBAMCAYYw
-+CgYIKoZIzj0EAwIDSAAwRQIgLf0sybmdbJoTIgZWrU1k11oecQbdkzh+3jFtNEFn
-+zYUCIQCRXjIBDZXtyaywk3DgIggByCQxrrB5vjlnyYTd9vNUSw==
-+-----END CERTIFICATE-----
-diff --git a/pytest_httpbin/certs/server.key b/pytest_httpbin/certs/server.key
-new file mode 100644
-index 0000000..fd9fd82
---- /dev/null
-+++ b/pytest_httpbin/certs/server.key
-@@ -0,0 +1,5 @@
-+-----BEGIN EC PRIVATE KEY-----
-+MHcCAQEEIPNMu1H1DN9x0VLZNzO3BFp5boEGyc80XFaR1ML18uFRoAoGCCqGSM49
-+AwEHoUQDQgAEiNIfYxmsmjemcRRpcd4qP+x1yONFBZZli7CEKxg9j3x5j1OJPeyC
-+BQ83kogrxJYLbRjdHUx4VOCEXjffmYhnMA==
-+-----END EC PRIVATE KEY-----
-diff --git a/pytest_httpbin/certs/server.pem b/pytest_httpbin/certs/server.pem
-new file mode 100644
-index 0000000..7c70f64
---- /dev/null
-+++ b/pytest_httpbin/certs/server.pem
-@@ -0,0 +1,15 @@
-+-----BEGIN CERTIFICATE-----
-+MIICTDCCAfOgAwIBAgIUZ9rBQX/YRZFcqXCIzOSAd1D0IUcwCgYIKoZIzj0EAwIw
-+RDEbMBkGA1UECgwSdHJ1c3RtZSB2MS4xLjArZGV2MSUwIwYDVQQLDBxUZXN0aW5n
-+IENBICNBdXNVcWJaNG81d3pjb0tCMCAXDTAwMDEwMTAwMDAwMFoYDzMwMDAwMTAx
-+MDAwMDAwWjBGMRswGQYDVQQKDBJ0cnVzdG1lIHYxLjEuMCtkZXYxJzAlBgNVBAsM
-+HlRlc3RpbmcgY2VydCAjLVdQNWpjLTllQ0U0S0JxMjBZMBMGByqGSM49AgEGCCqG
-+SM49AwEHA0IABIjSH2MZrJo3pnEUaXHeKj/sdcjjRQWWZYuwhCsYPY98eY9TiT3s
-+ggUPN5KIK8SWC20Y3R1MeFTghF4335mIZzCjgb4wgbswHQYDVR0OBBYEFCO99Ega
-+h7pEyFEJVwe09DZzNHDtMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUHymIBJV4
-+gCrAqv+6Q9pSJFtd7PYwLwYDVR0RAQH/BCUwI4IJbG9jYWxob3N0hwR/AAABhxAA
-+AAAAAAAAAAAAAAAAAAABMA4GA1UdDwEB/wQEAwIFoDAqBgNVHSUBAf8EIDAeBggr
-+BgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMDMAoGCCqGSM49BAMCA0cAMEQCIHB0
-+imdD2aQuq4DipTvnFJjmT+w8i3D/Pz8X6bPdkJW/AiATl+m4TW4BE5v1ID3ftDhz
-+ja8s574nAjDAqcSL7otVpQ==
-+-----END CERTIFICATE-----
-diff --git a/pytest_httpbin/serve.py b/pytest_httpbin/serve.py
-index c15c227..8310140 100644
---- a/pytest_httpbin/serve.py
-+++ b/pytest_httpbin/serve.py
-@@ -60,8 +60,8 @@ def finish_request(self, request, client_address):
- try:
- context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
- context.load_cert_chain(
-- os.path.join(CERT_DIR, "cert.pem"),
-- os.path.join(CERT_DIR, "key.pem"),
-+ os.path.join(CERT_DIR, "server.pem"),
-+ os.path.join(CERT_DIR, "server.key"),
- )
- with context.wrap_socket(
- request, server_side=True, suppress_ragged_eofs=False
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild
deleted file mode 100644
index 638ad7ac691a..000000000000
--- a/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,54 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily test your HTTP library against a local copy of httpbin"
-HOMEPAGE="
- https://github.com/kevin1024/pytest-httpbin/
- https://pypi.org/project/pytest-httpbin/
-"
-SRC_URI="
- https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
- dev-python/httpbin[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/requests[${PYTHON_USEDEP}]
- )
-"
-
-EPYTEST_DESELECT=(
- tests/test_server.py::test_redirect_location_is_https_for_secure_server
- # minor exception message mismatch on pypy3
- # https://github.com/kevin1024/pytest-httpbin/issues/77
- tests/test_server.py::test_dont_crash_on_handshake_timeout
-)
-
-distutils_enable_tests pytest
-
-PATCHES=(
- # https://github.com/kevin1024/vcrpy/issues/848
- # https://github.com/kevin1024/pytest-httpbin/pull/90
- "${FILESDIR}/${P}-certs.patch"
-)
-
-src_prepare() {
- # remove old certs
- rm -r pytest_httpbin/certs || die
-
- distutils-r1_src_prepare
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-05 7:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-23 13:37 [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-httpbin/files/, dev-python/pytest-httpbin/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-10-05 7:39 Michał Górny
2024-08-03 14:33 Michał Górny
2019-11-22 16:21 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