From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- dev-python/PySocks/Manifest | 7 ++- dev-python/PySocks/PySocks-1.6.7.ebuild | 2 +- dev-python/PySocks/PySocks-1.6.8.ebuild | 2 +- dev-python/PySocks/PySocks-1.7.1.ebuild | 50 ++++++++++++++++++++++ .../PySocks/files/PySocks-1.7.1-test_server.patch | 33 ++++++++++++++ 5 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 dev-python/PySocks/PySocks-1.7.1.ebuild create mode 100644 dev-python/PySocks/files/PySocks-1.7.1-test_server.patch (limited to 'dev-python/PySocks') diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest index 5cc39e0887aa..f571bfb142e8 100644 --- a/dev-python/PySocks/Manifest +++ b/dev-python/PySocks/Manifest @@ -1,5 +1,8 @@ +AUX PySocks-1.7.1-test_server.patch 1382 BLAKE2B 82bbc57a47b4cc0c6ee3177d997a25ba905b0c43eb5cc9b444d31080d20a365a85f1ab1c954d3edf0b9ef54a70985eb3956dd1533c09b46766d407edce085c07 SHA512 810bcbffd4d61db66459a04f422e6789a89f46d1026afd55c2bb06b13302e087613fc643b2f53df5f17992432df82707e776c60d8d0d69a6eebab862351d9ece DIST PySocks-1.6.7.tar.gz 282874 BLAKE2B 9e4ecf57f6cb9b7690ba68e21b3e52a535a08490b78ad5d8bd90384acf26f16e6a08018eaa7e91763b94182119217404b235425fce146af7e989c5e39e5e07dc SHA512 e49ce2f4ce23fd84ce30a62a5585af3c63980db46e7d427571d8fb8f6b85f4b6aeb37066863491496dd322555a5ce261123d613b8e5819dbdcef8a4e17e5dca0 DIST PySocks-1.6.8.tar.gz 283450 BLAKE2B 72b52fcdb9f3dc3bd71ca75cdbaa159c0b35a81fd4ed9476ab043819dad3efac76615bc751fc6014e1358a13a3a735023bae7f502e2863b5e733982c16758db1 SHA512 9b544cf11464142a5f347cd5688b48422249363a425ccf3887117152f2f1969713674c4bba714242432ae85f3d62e03edeb9cb7b73ebd225ed3b47b3da6896d5 -EBUILD PySocks-1.6.7.ebuild 570 BLAKE2B add1debcfe2b317ca10eb252ce706e1201bbc9b8ce50cf4278ca83477bc56ed4ea009d6c1fe1612e558008ee50052fe0bdc7c30baa0061cf4ff8f9c138f0cb53 SHA512 4d115844e12e72e0dcadfc41d53d7596cb422902f7558f9816347a87fd4ca18d844478b0f9c587fa0835050e97adc8b9629156e826b2b8e2937f42cdf4f824be -EBUILD PySocks-1.6.8.ebuild 905 BLAKE2B 47a623b8c235a2ad4a669b260301d9ed466af4b06b379a58763712a9b7a79c5622113b73570a82730396aacce056be5f1626894062ccd3e81de61821b6cf4570 SHA512 dc5cdbdff385bb6dd84a7d2c6fa1ccfb144f8330f5de5912afb232ca1ff3538dbe243c7244ff33626986ca02f32efe2cd2a254207f30f1eba968ce57115f4ebf +DIST PySocks-1.7.1.tar.gz 284429 BLAKE2B 8015e8a0a7ebfbb09ec542393aeb633a769701445c07f24bb9e62b07803d7bb605f22e79ad9ec83e47aa7fe843a1a057073d97e25482e742f42e18b2c7a2f1b3 SHA512 cef4a5ce8c67fb485644696a23bf68a721db47f3211212de2d4431eaf9ebd26077dd5a06f6dfa7fde2dcb9d7c1ed551facd014e999929cb4d7b504972c464016 +EBUILD PySocks-1.6.7.ebuild 571 BLAKE2B e68eea666b1d1dd88406a3fc1d3fde4e16f03f731733ace74329857c9efab63fa8ad5dfea62cb76f83e961b4c2232aac07ec9feca99c114be0b6d3cce18de91d SHA512 bccb459c7442dcc29498d3906a41caeaf4a4ef110f3e1619cf60ffaa85a3b6310678b1f24df16db4d803746808b7c923c629c8be8eb92fdfd0044411b22cbb00 +EBUILD PySocks-1.6.8.ebuild 906 BLAKE2B 3a77147fe6868e55f2da91db1a7e4aacd8280850f29bbfc3d84e2ffd4b4d688a28c1aaa5ab260ace65a19ea43f1e2052d0e31345351e0846b4af366e54e828a7 SHA512 2f0734e4b959c5834233877f4891a99b22665a8324942570aef44691418bcfe9afeadeb06f75f4388b60cad0840cb9a726782d61aa75f822ab7db7c149853f76 +EBUILD PySocks-1.7.1.ebuild 1267 BLAKE2B 8cd5310f289a6e815baf1c6551a7e5637b6648d2be871207532c3f1670139aa7448863dffe7ca7c2ea21ae51c1357107dac1b1c7fb9785780cc7ee49798ba217 SHA512 334034de2127ecf6e6605db75dd3fe66a9ce03529760139a2975c921b99b041e8b9b94a6decd886ceb24592502ecf70d3195379638dc9b155420f3bbd092aed7 MISC metadata.xml 499 BLAKE2B 6eeb0c4905d8f0d6c2d276b36a74ac9e1aaf3f5066ba79ea3b821fa31440a46c4ba49f88be096850032cf8598f6abee09182d84a35345fa53e1001a05137dbe0 SHA512 ec9cc3e4f9a050f78cb0c073efd3698b47aee2ce14d438163b5037509a5d8076509b4954bec0afc7f1e05bc790f26a6a520bb671b1c8590db966456dcf53b9aa diff --git a/dev-python/PySocks/PySocks-1.6.7.ebuild b/dev-python/PySocks/PySocks-1.6.7.ebuild index 35249b1f81fa..285c4a5759f4 100644 --- a/dev-python/PySocks/PySocks-1.6.7.ebuild +++ b/dev-python/PySocks/PySocks-1.6.7.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" IUSE="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/PySocks/PySocks-1.6.8.ebuild b/dev-python/PySocks/PySocks-1.6.8.ebuild index 4ae280e814cf..0a8aee64d45e 100644 --- a/dev-python/PySocks/PySocks-1.6.8.ebuild +++ b/dev-python/PySocks/PySocks-1.6.8.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/dev-python/PySocks/PySocks-1.7.1.ebuild b/dev-python/PySocks/PySocks-1.7.1.ebuild new file mode 100644 index 000000000000..579fd5f5e387 --- /dev/null +++ b/dev-python/PySocks/PySocks-1.7.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="SOCKS client module" +HOMEPAGE="https://github.com/Anorov/PySocks https://pypi.org/project/PySocks/" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +#BDEPEND=" +# test? ( +# net-proxy/3proxy +# $(python_gen_cond_dep 'dev-python/test_server[${PYTHON_USEDEP}]' -3) +# )" + +#distutils_enable_tests pytest + +# tests fail semi-randomly; probably starting proxy server doesn't work +# as expected +RESTRICT="test" + +src_prepare() { + local PATCHES=( + "${FILESDIR}"/PySocks-1.7.1-test_server.patch + ) + + rm test/bin/3proxy || die +# if use test; then +# ln -s "${BROOT}/usr/bin/3proxy" test/bin/3proxy || die +# fi + + # requires Internet + sed -i -e 's:test_socks5_proxy_connect_timeout:_&:' \ + test/test_pysocks.py || die + + distutils-r1_src_prepare +} + +python_test() { + python_is_python3 || return + pytest -vv || die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/PySocks/files/PySocks-1.7.1-test_server.patch b/dev-python/PySocks/files/PySocks-1.7.1-test_server.patch new file mode 100644 index 000000000000..20d208549720 --- /dev/null +++ b/dev-python/PySocks/files/PySocks-1.7.1-test_server.patch @@ -0,0 +1,33 @@ +From 983f0451ed25c755da670a682703ae8f7795782b Mon Sep 17 00:00:00 2001 +From: John Vandenberg +Date: Wed, 4 Dec 2019 10:44:14 +0700 +Subject: [PATCH] Update tests for test-server 0.0.31 + +Closes https://github.com/Anorov/PySocks/issues/117 +--- + requirements_dev.txt | 2 +- + test/test_pysocks.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/test/test_pysocks.py b/test/test_pysocks.py +index 49893b2..03d2649 100644 +--- a/test/test_pysocks.py ++++ b/test/test_pysocks.py +@@ -79,8 +79,7 @@ def setUpClass(cls): + from test_server import TestServer + + cls.test_server = TestServer(address=TEST_SERVER_HOST, +- port=TEST_SERVER_PORT, +- engine='subprocess') ++ port=TEST_SERVER_PORT) + cls.test_server.start() + + @classmethod +@@ -112,6 +111,7 @@ def assert_proxy_response(self, resp_data, content, address, + self.test_server.request['headers']['user-agent']) + self.assertEqual('%s:%d' % address, + self.test_server.request['headers']['host']) ++ content = b'3\r\n' + content + b'\r\n0' + self.assertEqual(content, resp_body) + self.assertEqual(client_ip or PROXY_HOST_IP, + self.test_server.request['client_ip']) -- cgit v1.2.3