From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- dev-python/paramiko/Manifest | 7 ++- .../paramiko/files/paramiko-2.7.1-tests.patch | 62 ++++++++++++++++++++++ dev-python/paramiko/paramiko-2.4.2.ebuild | 4 +- dev-python/paramiko/paramiko-2.6.0.ebuild | 4 +- dev-python/paramiko/paramiko-2.7.1.ebuild | 60 +++++++++++++++++++++ 5 files changed, 131 insertions(+), 6 deletions(-) create mode 100644 dev-python/paramiko/files/paramiko-2.7.1-tests.patch create mode 100644 dev-python/paramiko/paramiko-2.7.1.ebuild (limited to 'dev-python/paramiko') diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest index 406e4db37dde..0a68c6fb9867 100644 --- a/dev-python/paramiko/Manifest +++ b/dev-python/paramiko/Manifest @@ -1,7 +1,10 @@ AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd AUX paramiko-2.6.0-tests.patch 1193 BLAKE2B 86063ffd478f5772e2aacbbd6e6a74262ebaa1e67126af598eb589e49484efc15b581df0bbc796c0790a5ca80d6b5a72cbd07782c7790a9782e66f857e9c2336 SHA512 5b5de9c209d6aee83dc57f2f04d1d43f7106ed135fc12427d9237cf63932408c6385f878d02ef5dbb3d09476ee516148208d0390caa21f82a113bf6ed5a8176e +AUX paramiko-2.7.1-tests.patch 2370 BLAKE2B 9d63e9e96a3bc4a1ecc7762ff0b7663c13ae82b6f4d2b46343847059b03bd91ad3b16ddb2e2204f15cf8c6eb14310857ff7c0af7ad420f27d2ef11f500057414 SHA512 4c9dbe97d9c2957f26838b46897d776c08ea20040c452b9dea8466288271811e51f491277c8c5e544c0b47e1eb50fdb5baacce1e6254c7f2cf2f45de6ab20a19 DIST paramiko-2.4.2.tar.gz 289126 BLAKE2B 767f81a09b32762241eed6661e520e3b3a96acfe8e6e638ea7ae180a8b6866f8f4adeae0a0146d46ecbfccbe71334c5f5c14e2d049744258ca4808ac21365185 SHA512 894c2ebfcfb35a84fe74670d0eb67022a49b7bf165f31acd929045c17509d8a2be111e8319f20513b5034efd033edc6432b2ca2e7027dc7e3c6703166a96790f DIST paramiko-2.6.0.tar.gz 304469 BLAKE2B cde861069c8924b2f685675266fd28600ffd24a39074e9ad5db8fd1d010c6e23ca13a2c78a79b23504dfff395b773b171e7c787119d01e3b92a2eec44ca8b40a SHA512 1ac2c3486cb786a1e4640d7b7f8628087f9b78ee247b09dbd3ac2646790da4f12cf95fc4291f27f200b63ec6c11d9ebf5a1283f88cf2de7c2eb6e6f76e892ef2 -EBUILD paramiko-2.4.2.ebuild 1494 BLAKE2B fabb448af23b231105975f393b16c5e81cd39fe5e3838ad7e1298e4b06ba0567e95a4842803c39049f01d1ec7b6df570427c11f5ee9c95b028525f669e0e7870 SHA512 1c8b1663a261fa52b8f582a9f3040e451abbe45f68bbeadc723637bd59c55791c7a20a2619b1bb8f7b1024765b7e11366365b65e07d20880c88b596dd15913ef -EBUILD paramiko-2.6.0.ebuild 1506 BLAKE2B 5c3d9487209d7bff99de46c78dd292721935a514c02bec232bbef5786f5fea5c5c184c4f6ff051766cfe038a526a4ed1aec400ec787ca813f044b14f598119f6 SHA512 c18f2d11b016b2b2c8e3658faa7b8ca859d66e1525b0b0de770d4c07a9abc5ca1075798c7fc83dd0c90e85c4071b2d87f3e5676054a2152c4d6be616ed7fd111 +DIST paramiko-2.7.1.tar.gz 330391 BLAKE2B 0f7a2f3b6c15a68002001d69f8402deea5421a8b1f6cf35061a8a36f4b81b7a291d7b0f0b457f32de4c4769659a2e067f0bdb6cc5dcdd0810ebf917e349e85af SHA512 2cebed2420cf9af77cb0d459b64a74adcffcdb15bd58c8fc9243855ae91f43e16706665b64ce2851f6e99e59ca6a47d7299a2aae35a4c9d01ab97b343569c4b2 +EBUILD paramiko-2.4.2.ebuild 1492 BLAKE2B 2c1fce2e9e0af333e86367108f24fb3198222018a0e51432492bb3eede58413bcd81c8a32badf6ca2b75455554ccc9a3726cb1ffbc6a4f73b98c2cdf964e65a5 SHA512 475752888e86d31cef669184b1cf7c018fe1c708f52be8966b6b51e1ec6b9bd7e1328255ae988d7c9bf9482f52438294b1b5ef8abb8d99de7329a90ee5b83009 +EBUILD paramiko-2.6.0.ebuild 1504 BLAKE2B cb516255c6f6ee6a91414222f470646699f40c682e552898b6a40414bee9ca23f7e8405481c43617a925cadda9a27bdc73577944bb8041dfc3c602d916898cfc SHA512 a09c8dea801857ae470d77bb923f84d8901a462a40711b1a02f06d0caa64f6b77118d1a61da2b34edda3ddceff290772328aed1ea464f4dbbcfb9f4a032580c3 +EBUILD paramiko-2.7.1.ebuild 1504 BLAKE2B cb516255c6f6ee6a91414222f470646699f40c682e552898b6a40414bee9ca23f7e8405481c43617a925cadda9a27bdc73577944bb8041dfc3c602d916898cfc SHA512 a09c8dea801857ae470d77bb923f84d8901a462a40711b1a02f06d0caa64f6b77118d1a61da2b34edda3ddceff290772328aed1ea464f4dbbcfb9f4a032580c3 MISC metadata.xml 1306 BLAKE2B 5bf88516d7d34aa0018b00250edddcc3d7044605e59fd9c799775043f2984a071f743994712cbdc009893a01ee9cbd60df85dcd7f644f7dd33e05a426b06391b SHA512 30bbefd00271e8a61c886e638f30aae8aa751dea4ed0e023e50e31d28d528a203c36e80c8a142573a4b39c958be84eca5c7c19986c2eaa86575ad9b3779ef0d1 diff --git a/dev-python/paramiko/files/paramiko-2.7.1-tests.patch b/dev-python/paramiko/files/paramiko-2.7.1-tests.patch new file mode 100644 index 000000000000..9c3570c2c58d --- /dev/null +++ b/dev-python/paramiko/files/paramiko-2.7.1-tests.patch @@ -0,0 +1,62 @@ +From e3e904cc88a08e88c9051de4f5a6f1b6e78bf4a6 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Mon, 16 Dec 2019 17:39:50 +0100 +Subject: [PATCH] Strip use of pytest-relaxed + +.. since it was removed from the tree due to breaking pytest. +--- + tests/test_client.py | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) + +diff --git a/tests/test_client.py b/tests/test_client.py +index 60ad310..22a2e40 100644 +--- a/tests/test_client.py ++++ b/tests/test_client.py +@@ -33,7 +33,6 @@ import warnings + import weakref + from tempfile import mkstemp + +-from pytest_relaxed import raises + from mock import patch, Mock + + import paramiko +@@ -684,10 +683,10 @@ class PasswordPassphraseTests(ClientTest): + + # TODO: more granular exception pending #387; should be signaling "no auth + # methods available" because no key and no password +- @raises(SSHException) + def test_passphrase_kwarg_not_used_for_password_auth(self): +- # Using the "right" password in the "wrong" field shouldn't work. +- self._test_connection(passphrase="pygmalion") ++ with self.assertRaises(SSHException): ++ # Using the "right" password in the "wrong" field shouldn't work. ++ self._test_connection(passphrase="pygmalion") + + def test_passphrase_kwarg_used_for_key_passphrase(self): + # Straightforward again, with new passphrase kwarg. +@@ -705,14 +704,14 @@ class PasswordPassphraseTests(ClientTest): + password="television", + ) + +- @raises(AuthenticationException) # TODO: more granular + def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given( # noqa + self + ): +- # Sanity: if we're given both fields, the password field is NOT used as +- # a passphrase. +- self._test_connection( +- key_filename=_support("test_rsa_password.key"), +- password="television", +- passphrase="wat? lol no", +- ) ++ with self.assertRaises(AuthenticationException): ++ # Sanity: if we're given both fields, the password field is NOT used as ++ # a passphrase. ++ self._test_connection( ++ key_filename=_support("test_rsa_password.key"), ++ password="television", ++ passphrase="wat? lol no", ++ ) +-- +2.23.0 + diff --git a/dev-python/paramiko/paramiko-2.4.2.ebuild b/dev-python/paramiko/paramiko-2.4.2.ebuild index 751e6e4b1f19..167f6e088cc1 100644 --- a/dev-python/paramiko/paramiko-2.4.2.ebuild +++ b/dev-python/paramiko/paramiko-2.4.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{6,7} ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 diff --git a/dev-python/paramiko/paramiko-2.6.0.ebuild b/dev-python/paramiko/paramiko-2.6.0.ebuild index 5587e75a3c8f..694ab7ad7eee 100644 --- a/dev-python/paramiko/paramiko-2.6.0.ebuild +++ b/dev-python/paramiko/paramiko-2.6.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} ) +PYTHON_COMPAT=( python2_7 python3_{6,7,8} ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 diff --git a/dev-python/paramiko/paramiko-2.7.1.ebuild b/dev-python/paramiko/paramiko-2.7.1.ebuild new file mode 100644 index 000000000000..694ab7ad7eee --- /dev/null +++ b/dev-python/paramiko/paramiko-2.7.1.ebuild @@ -0,0 +1,60 @@ +# 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} ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 + +DESCRIPTION="SSH2 protocol library" +HOMEPAGE="https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/" +# pypi tarballs are missing test data +#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris" +IUSE="examples server test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}] + >=dev-python/cryptography-2.5[${PYTHON_USEDEP}] + >=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}] + >=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + ) +" + +distutils_enable_sphinx sites/docs + +src_prepare() { + eapply "${FILESDIR}"/${P}-tests.patch + + if ! use server; then + eapply "${FILESDIR}/${PN}-2.4.2-disable-server.patch" + fi + + eapply_user +} + +python_test() { + py.test -v || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + distutils-r1_python_install_all + + if use examples; then + docinto examples + dodoc -r demos/* + fi +} -- cgit v1.2.3