public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/httpretty/files/, dev-python/httpretty/
@ 2018-12-03 12:00 Virgil Dupras
  0 siblings, 0 replies; 3+ messages in thread
From: Virgil Dupras @ 2018-12-03 12:00 UTC (permalink / raw
  To: gentoo-commits

commit:     4e67a7471d8eede5c8ec9fea07c6a81fc1254fa1
Author:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  3 11:58:36 2018 +0000
Commit:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Mon Dec  3 11:58:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e67a747

dev-python/httpretty: remove old

Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-python/httpretty/Manifest                      |  6 --
 .../httpretty/files/httpretty-0.7.0-deps.patch     | 68 ----------------------
 dev-python/httpretty/httpretty-0.7.0.ebuild        | 50 ----------------
 dev-python/httpretty/httpretty-0.7.1.ebuild        | 46 ---------------
 dev-python/httpretty/httpretty-0.8.0-r1.ebuild     | 65 ---------------------
 dev-python/httpretty/httpretty-0.8.0.ebuild        | 45 --------------
 dev-python/httpretty/httpretty-0.8.10.ebuild       | 65 ---------------------
 dev-python/httpretty/httpretty-0.8.12.ebuild       | 68 ----------------------
 dev-python/httpretty/httpretty-0.8.6.ebuild        | 65 ---------------------
 9 files changed, 478 deletions(-)

diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index fd035159718..6a66df776e0 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,7 +1 @@
-DIST httpretty-0.7.0.tar.gz 28066 BLAKE2B e4460fb060efd5b2551218a01f52b9dc6250f1ad0582e8c48ebc98fbaaac053ca914620e7a88d4404e8a15106853caae31ee05434f3756f293c1d01db23e5514 SHA512 9adfd906336aa0ac2c21be8b789eb2e57994f4aac719958fc657291d922fe28b1fcc60d9b39e0e616b6d8565adaecb8228df3a9d1428cc189372b1cc700f664e
-DIST httpretty-0.7.1.tar.gz 28394 BLAKE2B 2b98d2b6f9cca35d5396a038c0851cffc6aa45456f6ae3ef082b0fba90c6cd137a2e99534ee836c7c00b5394668a266206df579253a32b4213b8127b58f8d629 SHA512 53b6f063e0e7863fa77aad1eebb0ad3078528bc97d26df80a3c6491c42b9a9008080da35bbb1e9372674c996f25e5109c84b48a2a6d9f0de5b7c53331bdad857
-DIST httpretty-0.8.0.tar.gz 34291 BLAKE2B 71bc13eeb1153f6b7a1c5e60b6cb197a3e6a7d8bf32db047843d17cdd1fe0eff0904f10c4b9424728e12f12a98574de317a6a7db16b1f1e8315642e872187275 SHA512 0c6193c488a27345b3d98cc6a62e8933b67828b7335700367b28cf328ef86ff2342056bada84ca631d6acc5650b7b456e80d85d8099e873f07cd41140c481650
-DIST httpretty-0.8.10.tar.gz 41741 BLAKE2B 2d0648074eea08223fe2191c1f416af7349ab16d1578e4b259d02e163462bb1c2222f122ed532a9d4c8179d332ef29347a8da67765e34a81643f8fa988f095bd SHA512 5bc734a89c45daa746551ef7d150c02bf6d9cddf1bc5426a8800d2241bb5bf8a834d2736fd9a4846ce150747d9c2064686a3ed63e97e5f131778d834956a9107
-DIST httpretty-0.8.12.tar.gz 43396 BLAKE2B ed2b9e7d8b2e7088a613234c8d60edcc5294506c77f16e5821060e3115bc8521f568abba313b359008add09e47e320bfc7178eca86e5e59158d7e303dc6f017d SHA512 1d1cbc2fd56c4aa8c2ba1e5bdb6d56db57a74f73028ebeab141f93d55eaac4a46a19c66148435e45c91d21a561ecaa6100cbe1ac0dbb65b2bdf2c8551b99a523
 DIST httpretty-0.8.14.tar.gz 43574 BLAKE2B 4015bb234c2fe3017a43fff6e3b51a7f015d9d133756d4326750da1ea06ce1910d91d7b47625a08ec85856d156a0d8b3b18706e582578e3d186994b8e4f55c69 SHA512 5adab6450e8360cc21bab4136f64cd11757b9f292c7e27980fe2561f3e705baf4f0211b9e6ff4ec9ba96a788a6c5b5b1d26657972b67423c9c25491927b0884b
-DIST httpretty-0.8.6.tar.gz 40815 BLAKE2B 6964f96fb6de59f2ff9bc5018e6bec15c391454888fb0f42045257bad8fcc96a9cb6e1c4f4347267e85efc96473ede26c37f6680b67bb47a1632e371dcf313de SHA512 bd5d0b1a33b52ae3d0e09673429e771ce582795bf58d38b34d4df39f74b377ec199d720fa061a84b64175b6ba67a91bdb35c242b4fd754627d2744cb8b33b313

diff --git a/dev-python/httpretty/files/httpretty-0.7.0-deps.patch b/dev-python/httpretty/files/httpretty-0.7.0-deps.patch
deleted file mode 100644
index 26c6ebec4e5..00000000000
--- a/dev-python/httpretty/files/httpretty-0.7.0-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-rebased from https://github.com/jamielennox/HTTPretty/commit/3a7d5a04b2ed5cebc8e1fc14f706f5da7fc5162f
-diff -ur httpretty-0.7.0.orig/requirements.pip httpretty-0.7.0/requirements.pip
---- requirements.pip	2013-10-02 12:44:47.000000000 +0800
-+++ requirements.pip	2013-12-02 15:37:00.611977792 +0800
-@@ -1,12 +1,9 @@
--argparse==1.2.1
--coverage==3.5.3
--httplib2==0.7.6
--misaka==1.0.2
--mock==1.0.1
--nose==1.2.1
--requests==1.1.0
--steadymark==0.4.5
-+coverage>=3.5
-+httplib2
-+mock>=1.0
-+nose>=1.2
-+requests>=1.1
- sure>=1.2.1
--tornado==2.4
--tox==1.4.2
--urllib3
-\ No newline at end of file
-+tornado>=2.2
-+tox>=1.4.2
-+urllib3
-diff -ur httpretty-0.7.0.orig/setup.cfg httpretty-0.7.0/setup.cfg
---- setup.cfg	2013-10-08 05:42:31.000000000 +0800
-+++ setup.cfg	2013-12-02 15:40:34.331985437 +0800
-@@ -2,4 +2,9 @@
- tag_build = 
- tag_date = 0
- tag_svn_revision = 0
--
-+[nosetests]
-+verbosity=2
-+with-coverage=1
-+cover-erase=1
-+cover-package=httpretty
-+cover-inclusive=1
-diff -ur httpretty-0.7.0.orig/setup.py httpretty-0.7.0/setup.py
---- setup.py	2013-10-08 05:42:31.000000000 +0800
-+++ setup.py	2013-12-02 15:42:26.467989448 +0800
-@@ -50,10 +50,11 @@
-     author_email='gabriel@nacaolivre.org',
-     url='http://github.com/gabrielfalcao/httpretty',
-     zip_safe=False,
--    packages=find_packages(HTTPRETTY_PATH, ('tests')),
-+    packages=find_packages(),
-     tests_require=test_packages(),
-     install_requires=['urllib3'],
-     license='MIT',
-+    test_suite='nose.collector',
-     classifiers=["Intended Audience :: Developers",
-                  "License :: OSI Approved :: MIT License",
-                  "Topic :: Software Development :: Testing"],
-diff -ur httpretty-0.7.0.orig/tests/functional/test_requests.py httpretty-0.7.0/tests/functional/test_requests.py
---- tests/functional/test_requests.py	2013-10-08 05:42:31.000000000 +0800
-+++ tests/functional/test_requests.py	2013-12-02 15:43:48.763992391 +0800
-@@ -698,7 +698,7 @@
-     response['response'].should.have.key("status").being.equal(200)
-     response['response'].should.have.key("body").being.an(unicode)
-     response['response'].should.have.key("headers").being.a(dict)
--    response['response']["headers"].should.have.key("server").being.equal("TornadoServer/2.4")
-+    response['response']["headers"].should.have.key("server").being.equal("TornadoServer")
- 
- 
- def test_playing_calls():

diff --git a/dev-python/httpretty/httpretty-0.7.0.ebuild b/dev-python/httpretty/httpretty-0.7.0.ebuild
deleted file mode 100644
index eec8bd8fc2d..00000000000
--- a/dev-python/httpretty/httpretty-0.7.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/steadymark-0.4.5[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.2.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		"
-# I believe we don't need unpackaged package markment
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-PATCHES=( "${FILESDIR}"/${P}-deps.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	if ! use test; then
-		rm -rf tests/
-	fi
-}
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125
-	nosetests tests/unit \
-		-e test_recording_calls \
-		-e test_playing_calls \
-		-e test_callback_setting_headers_and_status_response \
-		-e test_streaming_responses \
-		tests/functional || die "Tests failed under ${EPYTHON}"
-	rm -rf tests/ "${BUILD_DIR}"/lib/tests/ || die
-}

diff --git a/dev-python/httpretty/httpretty-0.7.1.ebuild b/dev-python/httpretty/httpretty-0.7.1.ebuild
deleted file mode 100644
index 9913d5128b5..00000000000
--- a/dev-python/httpretty/httpretty-0.7.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/steadymark-0.4.5[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.2.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	if ! use test; then
-		rm -rf tests/
-	fi
-}
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125
-	nosetests tests/unit \
-		-e test_recording_calls \
-		-e test_playing_calls \
-		-e test_callback_setting_headers_and_status_response \
-		tests/functional || die "Tests failed under ${EPYTHON}"
-	rm -rf tests/ "${BUILD_DIR}"/lib/tests/ || die
-}

diff --git a/dev-python/httpretty/httpretty-0.8.0-r1.ebuild b/dev-python/httpretty/httpretty-0.8.0-r1.ebuild
deleted file mode 100644
index e74338ab415..00000000000
--- a/dev-python/httpretty/httpretty-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-	"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}] )"
-
-#Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
-	# py3.4 hangs on many tests and is deemed underdone
-	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
-	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
-	# Some tests excluded attempt connection to the network
-	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
-	# that occur within the folder tests/unit which upstream should address.
-	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
-
-	if [[ "${EPYTHON}" == python3.4 ]]; then
-		einfo "python3.4 not adequately supported in testsuite"
-	elif [[ "${EPYTHON}" == python2.7 ]]; then
-	rm -f tests/functional/test_requests.py || die
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python2.7"
-	else
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python3.3"
-	fi
-
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}

diff --git a/dev-python/httpretty/httpretty-0.8.0.ebuild b/dev-python/httpretty/httpretty-0.8.0.ebuild
deleted file mode 100644
index 5ed9516eff5..00000000000
--- a/dev-python/httpretty/httpretty-0.8.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-		"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		dev-python/ipdb )"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	if ! use test; then
-		rm -rf tests/
-	fi
-}
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125
-	nosetests tests/unit \
-		-e test_recording_calls \
-		-e test_playing_calls \
-		-e test_callback_setting_headers_and_status_response \
-		tests/functional || die "Tests failed under ${EPYTHON}"
-	rm -rf tests/ "${BUILD_DIR}"/lib/tests/ || die
-}

diff --git a/dev-python/httpretty/httpretty-0.8.10.ebuild b/dev-python/httpretty/httpretty-0.8.10.ebuild
deleted file mode 100644
index d8f9443c6f9..00000000000
--- a/dev-python/httpretty/httpretty-0.8.10.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-	"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}] )"
-
-#Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
-	# py3.4 hangs on many tests and is deemed underdone
-	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
-	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
-	# Some tests excluded attempt connection to the network
-	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
-	# that occur within the folder tests/unit which upstream should address.
-	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
-
-	if [[ "${EPYTHON}" == python3.4 ]]; then
-		einfo "python3.4 not adequately supported in testsuite"
-	elif [[ "${EPYTHON}" == python2.7 ]]; then
-	rm -f tests/functional/test_requests.py || die
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python2.7"
-	else
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python3.3"
-	fi
-
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}

diff --git a/dev-python/httpretty/httpretty-0.8.12.ebuild b/dev-python/httpretty/httpretty-0.8.12.ebuild
deleted file mode 100644
index f0dcd0326bb..00000000000
--- a/dev-python/httpretty/httpretty-0.8.12.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}]
-)"
-
-#Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
-	# py3.4 hangs on many tests and is deemed underdone
-	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
-	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
-	# Some tests excluded attempt connection to the network
-	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
-	# that occur within the folder tests/unit which upstream should address.
-	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
-
-	if [[ "${EPYTHON}" == python3.4 ]]; then
-		einfo "python3.4 not adequately supported in testsuite"
-	elif [[ "${EPYTHON}" == python2.7 ]]; then
-		rm -f tests/functional/test_requests.py || die
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python2.7"
-	else
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python3.3"
-	fi
-
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}

diff --git a/dev-python/httpretty/httpretty-0.8.6.ebuild b/dev-python/httpretty/httpretty-0.8.6.ebuild
deleted file mode 100644
index f4920031695..00000000000
--- a/dev-python/httpretty/httpretty-0.8.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-	"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}] )"
-
-#Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
-	# py3.4 hangs on many tests and is deemed underdone
-	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
-	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
-	# Some tests excluded attempt connection to the network
-	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
-	# that occur within the folder tests/unit which upstream should address.
-	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
-
-	if [[ "${EPYTHON}" == python3.4 ]]; then
-		einfo "python3.4 not adequately supported in testsuite"
-	elif [[ "${EPYTHON}" == python2.7 ]]; then
-	rm -f tests/functional/test_requests.py || die
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python2.7"
-	else
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python3.3"
-	fi
-
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/httpretty/files/, dev-python/httpretty/
@ 2022-05-14 13:00 Michał Górny
  0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2022-05-14 13:00 UTC (permalink / raw
  To: gentoo-commits

commit:     ddc4ed20fe843e71d48ef04d8f3abf843e6aaaf8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 11:57:01 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 14 13:00:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc4ed20

dev-python/httpretty: Use PEP517 build

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../httpretty/files/httpretty-1.1.4-pytest.patch   | 121 +++++++++++++++++++++
 dev-python/httpretty/httpretty-1.1.4-r1.ebuild     |  78 +++++++++++++
 2 files changed, 199 insertions(+)

diff --git a/dev-python/httpretty/files/httpretty-1.1.4-pytest.patch b/dev-python/httpretty/files/httpretty-1.1.4-pytest.patch
new file mode 100644
index 000000000000..ccb465ce98ea
--- /dev/null
+++ b/dev-python/httpretty/files/httpretty-1.1.4-pytest.patch
@@ -0,0 +1,121 @@
+From 299d50c9cb0ba73343d1a88c202e17f6599fde54 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 14 May 2022 13:39:13 +0200
+Subject: [PATCH] Fix functional tests compatibility with pytest
+
+Provide a default value for test parameters provided by decorators
+in order to prevent pytest from recognizing them as fixtures.  This
+is the smaller change needed to run the complete test suite via pytest.
+
+Fixes #449
+---
+ tests/functional/test_bypass.py   |  8 ++++----
+ tests/functional/test_debug.py    | 10 +++++-----
+ tests/functional/test_requests.py |  2 +-
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/tests/functional/test_bypass.py b/tests/functional/test_bypass.py
+index e85dfac..cf7e75d 100644
+--- a/tests/functional/test_bypass.py
++++ b/tests/functional/test_bypass.py
+@@ -88,7 +88,7 @@ def stop_tcp_server(context):
+ 
+ @httpretty.activate
+ @that_with_context(start_http_server, stop_http_server)
+-def test_httpretty_bypasses_when_disabled(context):
++def test_httpretty_bypasses_when_disabled(context=None):
+     "httpretty should bypass all requests by disabling it"
+ 
+     httpretty.register_uri(
+@@ -122,7 +122,7 @@ def test_httpretty_bypasses_when_disabled(context):
+ 
+ @httpretty.activate(verbose=True)
+ @that_with_context(start_http_server, stop_http_server)
+-def test_httpretty_bypasses_a_unregistered_request(context):
++def test_httpretty_bypasses_a_unregistered_request(context=None):
+     "httpretty should bypass a unregistered request by disabling it"
+ 
+     httpretty.register_uri(
+@@ -145,7 +145,7 @@ def test_httpretty_bypasses_a_unregistered_request(context):
+ 
+ @httpretty.activate(verbose=True)
+ @that_with_context(start_tcp_server, stop_tcp_server)
+-def test_using_httpretty_with_other_tcp_protocols(context):
++def test_using_httpretty_with_other_tcp_protocols(context=None):
+     "httpretty should work even when testing code that also use other TCP-based protocols"
+ 
+     httpretty.register_uri(
+@@ -163,7 +163,7 @@ def test_using_httpretty_with_other_tcp_protocols(context):
+ 
+ @httpretty.activate(allow_net_connect=False)
+ @that_with_context(start_http_server, stop_http_server)
+-def test_disallow_net_connect_1(context, verbose=True):
++def test_disallow_net_connect_1(context=None, verbose=True):
+     """
+     When allow_net_connect = False, a request that otherwise
+     would have worked results in UnmockedError.
+diff --git a/tests/functional/test_debug.py b/tests/functional/test_debug.py
+index 86bf09e..ee742f3 100644
+--- a/tests/functional/test_debug.py
++++ b/tests/functional/test_debug.py
+@@ -39,7 +39,7 @@ def create_socket(context):
+ @skip('not currently supported')
+ @httprettified
+ @scenario(create_socket)
+-def test_httpretty_debugs_socket_send(context):
++def test_httpretty_debugs_socket_send(context=None):
+     "HTTPretty should forward_and_trace socket.send"
+ 
+     expect(context.sock.send).when.called_with(b'data').to.throw(
+@@ -50,7 +50,7 @@ def test_httpretty_debugs_socket_send(context):
+ @skip('not currently supported')
+ @httprettified
+ @scenario(create_socket)
+-def test_httpretty_debugs_socket_sendto(context):
++def test_httpretty_debugs_socket_sendto(context=None):
+     "HTTPretty should forward_and_trace socket.sendto"
+ 
+     expect(context.sock.sendto).when.called.to.throw(
+@@ -61,7 +61,7 @@ def test_httpretty_debugs_socket_sendto(context):
+ @skip('not currently supported')
+ @httprettified
+ @scenario(create_socket)
+-def test_httpretty_debugs_socket_recvfrom(context):
++def test_httpretty_debugs_socket_recvfrom(context=None):
+     "HTTPretty should forward_and_trace socket.recvfrom"
+ 
+     expect(context.sock.recvfrom).when.called.to.throw(
+@@ -72,7 +72,7 @@ def test_httpretty_debugs_socket_recvfrom(context):
+ @skip('not currently supported')
+ @httprettified
+ @scenario(create_socket)
+-def test_httpretty_debugs_socket_recv_into(context):
++def test_httpretty_debugs_socket_recv_into(context=None):
+     "HTTPretty should forward_and_trace socket.recv_into"
+     buf = bytearray()
+     expect(context.sock.recv_into).when.called_with(buf).to.throw(
+@@ -83,7 +83,7 @@ def test_httpretty_debugs_socket_recv_into(context):
+ @skip('not currently supported')
+ @httprettified
+ @scenario(create_socket)
+-def test_httpretty_debugs_socket_recvfrom_into(context):
++def test_httpretty_debugs_socket_recvfrom_into(context=None):
+     "HTTPretty should forward_and_trace socket.recvfrom_into"
+ 
+     expect(context.sock.recvfrom_into).when.called.to.throw(
+diff --git a/tests/functional/test_requests.py b/tests/functional/test_requests.py
+index 55aa109..04a5e80 100644
+--- a/tests/functional/test_requests.py
++++ b/tests/functional/test_requests.py
+@@ -768,7 +768,7 @@ def test_unicode_querystrings():
+ 
+ 
+ @use_tornado_server
+-def test_recording_calls(port):
++def test_recording_calls(port=None):
+     ("HTTPretty should be able to record calls")
+     # Given a destination path:
+     destination = FIXTURE_FILE("recording-1.json")
+-- 
+2.35.1
+

diff --git a/dev-python/httpretty/httpretty-1.1.4-r1.ebuild b/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..dd276c46a534
--- /dev/null
+++ b/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="
+	https://github.com/gabrielfalcao/httpretty/
+	https://pypi.org/project/httpretty/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+	)"
+# These are optional test deps, that are used to test compatibility
+# with various HTTP libs.  We prefer pulling them in whenever possible
+# to increase test coverage but we can live without them.
+# We're skipping redis entirely since it requires a running server.
+BDEPEND+="
+	test? (
+		>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.18.1[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/eventlet-0.25.1[${PYTHON_USEDEP}]
+		' python3_{8..9})
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/${P}-pytest.patch"
+)
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# this seems to be a stress test
+		tests/bugfixes/pytest/test_426_mypy_segfault.py
+		# passthrough tests require Internet access
+		tests/functional/test_passthrough.py
+	)
+
+	local ignore_by_dep=(
+		dev-python/boto3:tests/bugfixes/nosetests/test_416_boto3.py
+		dev-python/eventlet:tests/bugfixes/nosetests/test_eventlet.py
+		dev-python/httplib2:tests/functional/test_httplib2.py
+		dev-python/httpx:tests/bugfixes/nosetests/test_414_httpx.py
+		dev-python/pyopenssl:tests/bugfixes/nosetests/test_417_openssl.py
+	)
+
+	local x
+	for x in "${ignore_by_dep[@]}"; do
+		if ! has_version "${x%:*}[${PYTHON_USEDEP}]"; then
+			EPYTEST_IGNORE+=( "${x#*:}" )
+		fi
+	done
+
+	epytest
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/httpretty/files/, dev-python/httpretty/
@ 2025-01-06  6:42 Michał Górny
  0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2025-01-06  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     98b01f09ac0477e23423694033162e2fb828c40c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 06:25:54 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 06:41:26 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98b01f09

dev-python/httpretty: Grab a patch to fix >=dev-python/urllib3-2.3

Pull-Request: https://github.com/gabrielfalcao/HTTPretty/pull/485
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../files/httpretty-1.1.4-urllib3-2.3.patch        | 40 ++++++++++
 dev-python/httpretty/httpretty-1.1.4-r3.ebuild     | 86 ++++++++++++++++++++++
 2 files changed, 126 insertions(+)

diff --git a/dev-python/httpretty/files/httpretty-1.1.4-urllib3-2.3.patch b/dev-python/httpretty/files/httpretty-1.1.4-urllib3-2.3.patch
new file mode 100644
index 000000000000..c559f84fe997
--- /dev/null
+++ b/dev-python/httpretty/files/httpretty-1.1.4-urllib3-2.3.patch
@@ -0,0 +1,40 @@
+From 8e96b1e312d473429fbd08bc867376e9932ad42a Mon Sep 17 00:00:00 2001
+From: Carl Smedstad <carl.smedstad@protonmail.com>
+Date: Mon, 30 Dec 2024 19:08:26 +0100
+Subject: [PATCH] Mock socket.shutdown for compatibility with urllib3 >= 2.3
+
+Version 2.3.0 of urllib3 gets the attribute socket.shutdown which
+HTTPretty does no mock. See the following call stack:
+
+    /usr/lib/python3.13/site-packages/requests/sessions.py:602: in get
+        return self.request("GET", url, **kwargs)
+    /usr/lib/python3.13/site-packages/requests/sessions.py:589: in request
+        resp = self.send(prep, **send_kwargs)
+    /usr/lib/python3.13/site-packages/requests/sessions.py:703: in send
+        r = adapter.send(request, **kwargs)
+    /usr/lib/python3.13/site-packages/requests/adapters.py:667: in send
+        resp = conn.urlopen(
+    /usr/lib/python3.13/site-packages/urllib3/connectionpool.py:787: in urlopen
+        response = self._make_request(
+    /usr/lib/python3.13/site-packages/urllib3/connectionpool.py:534: in _make_request
+        response = conn.getresponse()
+    /usr/lib/python3.13/site-packages/urllib3/connection.py:513: in getresponse
+        _shutdown = getattr(self.sock, "shutdown", None)
+---
+ httpretty/core.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/httpretty/core.py b/httpretty/core.py
+index 69686458..de7e091a 100644
+--- a/httpretty/core.py
++++ b/httpretty/core.py
+@@ -861,6 +861,9 @@ def recv_into(self, *args, **kwargs):
+         def recvfrom(self, *args, **kwargs):
+             return self.forward_and_trace('recvfrom', *args, **kwargs)
+ 
++        def shutdown(self, *args, **kwargs):
++            return self.forward_and_trace('shutdown', *args, **kwargs)
++
+         def recv(self, buffersize=0, *args, **kwargs):
+             if not self._read_buf:
+                 self._read_buf = io.BytesIO()

diff --git a/dev-python/httpretty/httpretty-1.1.4-r3.ebuild b/dev-python/httpretty/httpretty-1.1.4-r3.ebuild
new file mode 100644
index 000000000000..9dd3d3216a85
--- /dev/null
+++ b/dev-python/httpretty/httpretty-1.1.4-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2025 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 pypi
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="
+	https://github.com/gabrielfalcao/httpretty/
+	https://pypi.org/project/httpretty/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		>=dev-python/tornado-2.2[${PYTHON_USEDEP}]
+	)
+"
+# These are optional test deps, that are used to test compatibility
+# with various HTTP libs.  We prefer pulling them in whenever possible
+# to increase test coverage but we can live without them.
+# We're skipping redis entirely since it requires a running server.
+BDEPEND+="
+	test? (
+		test-rust? (
+			dev-python/pyopenssl[${PYTHON_USEDEP}]
+		)
+		>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.18.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/${P}-pytest.patch"
+	# https://github.com/gabrielfalcao/HTTPretty/pull/485
+	"${FILESDIR}/${P}-urllib3-2.3.patch"
+)
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# this seems to be a stress test
+		tests/bugfixes/pytest/test_426_mypy_segfault.py
+		# passthrough tests require Internet access
+		tests/functional/test_passthrough.py
+		# eventlet is masked for removal
+		tests/bugfixes/nosetests/test_eventlet.py
+	)
+	local EPYTEST_DESELECT=(
+		# regressions with newer dev-python/requests
+		tests/functional/test_requests.py::test_httpretty_should_allow_registering_regexes_with_streaming_responses
+		tests/functional/test_requests.py::test_httpretty_should_handle_paths_starting_with_two_slashes
+	)
+
+	local ignore_by_dep=(
+		dev-python/boto3:tests/bugfixes/nosetests/test_416_boto3.py
+		dev-python/httplib2:tests/functional/test_httplib2.py
+		dev-python/httpx:tests/bugfixes/nosetests/test_414_httpx.py
+		dev-python/pyopenssl:tests/bugfixes/nosetests/test_417_openssl.py
+	)
+
+	local x
+	for x in "${ignore_by_dep[@]}"; do
+		if ! has_version "${x%:*}[${PYTHON_USEDEP}]"; then
+			EPYTEST_IGNORE+=( "${x#*:}" )
+		fi
+	done
+
+	epytest
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2025-01-06  6:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-14 13:00 [gentoo-commits] repo/gentoo:master commit in: dev-python/httpretty/files/, dev-python/httpretty/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2025-01-06  6:42 Michał Górny
2018-12-03 12:00 Virgil Dupras

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox