[gentoo-commits] repo/gentoo:master commit in: dev-python/paramiko/files/, dev-python/paramiko/
commit: 4dd98aba7b81efe9aa3744c4f905097f0ec6ef2d
Author: Michał Górny gentoo org>
AuthorDate: Mon Jul 24 12:49:07 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Jul 24 12:49:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd98aba
dev-python/paramiko: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/paramiko/Manifest | 1 -
.../files/paramiko-2.4.2-disable-server.patch | 46 --
.../files/paramiko-3.0.0-nih-test-deps.patch | 98 --
dev-python/paramiko/paramiko-3.1.0-r1.ebuild | 55
4 files changed, 200 deletions(-)
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 1b3bc344a812..0328ed4b9343 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,2 +1 @@
-DIST paramiko-3.1.0.gh.tar.gz 351910 BLAKE2B
7350626f3a8e54d8950085cbd8253f5564355abb4db7c65113c0df22674e3df0081da7299cfad779f1fcf9569b01720b6ab5dc2bde32c4a71500e79910caf4c8
SHA512
1a556a5b7a6ebc72a0c61b59f326a95c9f2784d74fdc1a171455867ba7b4b07a15741e168747b5a3a225685ad069e2d58021f54dadf7feb00f8acf65b0c07d51
DIST paramiko-3.2.0.gh.tar.gz 374709 BLAKE2B
80ec5678a51dc8a0eadd28228ae70a8912fb9a4be1807f5f65a925dd2252fd43ebba6f63b350b62ff7545d9ed0db6e4a78710fb73cff332e6d1ed996b0f1a7d9
SHA512
1d87a19284cef73a76eb7402d0492eb35d4a0588becd2f67ba19fe1498d6c10927127617398de11184d4865c8ce0f3e0c48194d50ef546414a17cf6faff3c39d
diff --git a/dev-python/paramiko/files/paramiko-2.4.2-disable-server.patch
b/dev-python/paramiko/files/paramiko-2.4.2-disable-server.patch
deleted file mode 100644
index 19450cbee1bc..
--- a/dev-python/paramiko/files/paramiko-2.4.2-disable-server.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/paramiko/transport.py b/paramiko/transport.py
-index f72eebaf..ec7a1445 100644
a/paramiko/transport.py
-+++ b/paramiko/transport.py
-@@ -110,6 +110,8 @@ from paramiko.ssh_exception import (
- from paramiko.util import retry_on_signal, ClosingContextManager, clamp_value
-
-
-+SERVER_DISABLED_BY_GENTOO = True
-+
- # for thread cleanup
- _active_threads = []
-
-@@ -633,6 +635,8 @@ class Transport(threading.Thread, ClosingContextManager):
- `.SSHException` -- if negotiation fails (and no ``event`` was
- passed in)
- """
-+if SERVER_DISABLED_BY_GENTOO:
-+raise Exception("Disabled by Gentoo for security reasons. Enable
with 'server' USE flag")
- if server is None:
- server = ServerInterface()
- self.server_mode = True
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 2b509c5c..bb23ac74 100644
a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -4,7 +4,7 @@ import shutil
- import threading
-
- import pytest
--from paramiko import RSAKey, SFTPServer, SFTP, Transport
-+from paramiko import RSAKey, SFTPServer, SFTP, Transport, transport
-
- from .loop import LoopSocket
- from .stub_sftp import StubServer, StubSFTPServer
-@@ -15,6 +15,10 @@ from .util import _support
- # 'nicer'.
-
-
-+# We need the server component for testing
-+transport.SERVER_DISABLED_BY_GENTOO = False
-+
-+
- # Perform logging by default; pytest will capture and thus hide it normally,
- # presenting it on error/failure. (But also allow turning it off when doing
- # very pinpoint debugging - e.g. using breakpoints, so you don't want output
diff --git a/dev-python/paramiko/files/paramiko-3.0.0-nih-test-deps.patch
b/dev-python/paramiko/files/paramiko-3.0.0-nih-test-deps.patch
deleted file mode 100644
index 26b12f0ce154..
--- a/dev-python/paramiko/files/paramiko-3.0.0-nih-test-deps.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From c7d1373554910102846123afb35c8c1a842f2c9a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
-Date: Tue, 17 May 2022 07:26:36 +0200
-Subject: [PATCH] Replace pytest-relaxed with plain pytest.raises
-
-There is really no technical reason to bring pytest-relaxed to call
-@raises as a decorator while plain pytest works just fine. Plus,
-pytest.raises() is used in test_sftp already.
-
-pytest-relaxed causes humongous breakage to other packages
-on the system. It has been banned from Gentoo for this reason.
- dev-requirements.txt | 6 ++
- pytest.ini | 3 ---
- tests/test_client.py | 19 +--
- 3 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/tests/test_client.py b/tests/test_client.py
-index dae5b13a..d0e9c434 100644
a/tests/test_client.py
-+++ b/tests/test_client.py
-@@ -33,7 +33,6 @@ import weakref
- from tempfile import mkstemp
-
- import pytest
--from pytest_relaxed import raises
- from unittest.mock import patch, Mock
-
- import paramiko
-@@ -786,11 +785,11 @@ class PasswordPassphraseTests(ClientTest):
-
- # TODO: more granular exception pending #387; should be signaling "no auth
- # methods available" because no key and no password
--
[gentoo-commits] repo/gentoo:master commit in: dev-python/paramiko/files/, dev-python/paramiko/
commit: f27e72051d86971bcc1876d4689a9acc47a0a665
Author: Michał Górny gentoo org>
AuthorDate: Tue Feb 21 07:45:42 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Tue Feb 21 07:50:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f27e7205
dev-python/paramiko: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/paramiko/Manifest | 1 -
.../files/paramiko-2.12.0-pytest-relaxed.patch | 93 --
dev-python/paramiko/paramiko-2.12.0.ebuild | 61 --
3 files changed, 155 deletions(-)
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index f1b32d05ad16..61fca35b2344 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,2 +1 @@
-DIST paramiko-2.12.0.gh.tar.gz 351956 BLAKE2B
d41668f32f28a5c2c3af1d2b5c85bb4c3d2f5af9028cd5ebcb2b8aa21bc25df2c1ead5ddfe61ff12cfacec4b92913833e267f8a3fef07fa9a794f4b064fdb472
SHA512
1bf325ffd393447cb90009d01dc1104d0d43a6acdd08cc6d28310063a649a23748800dab119ab5e10833975e68f5f5702044fc247a2e8058122a5327f2c7
DIST paramiko-3.0.0.gh.tar.gz 350348 BLAKE2B
ba7211a3f3c7d4f9c0023017d96ed51511039378b4eba1ace13fbbf6902cda40aa09f2cf7b5ce9f7aee666907d9a662e9bf7eccd5d06669685b9aa25fccfa551
SHA512
3754314fcbd64bf3db5fd6a8d55babc13e639675d09e85d796e99f25eecb55b0f987c0b47bce288c3d154a2dbdb586ecc34bbb09d67786bcc13b0a94a78e6654
diff --git a/dev-python/paramiko/files/paramiko-2.12.0-pytest-relaxed.patch
b/dev-python/paramiko/files/paramiko-2.12.0-pytest-relaxed.patch
deleted file mode 100644
index cf34fbfd1c60..
--- a/dev-python/paramiko/files/paramiko-2.12.0-pytest-relaxed.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 935507cc60b6f0b2b83c9c0e3be3900297b41757 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
-Date: Tue, 17 May 2022 07:26:36 +0200
-Subject: [PATCH] Replace pytest-relaxed with plain pytest.raises
-
-There is really no technical reason to bring pytest-relaxed to call
-@raises as a decorator while plain pytest works just fine. Plus,
-pytest.raises() is used in test_sftp already.
-
-pytest-relaxed causes humongous breakage to other packages
-on the system. It has been banned from Gentoo for this reason.
- dev-requirements.txt | 1 -
- pytest.ini | 3 ---
- tests/test_client.py | 19 +--
- 3 files changed, 9 insertions(+), 14 deletions(-)
-
-diff --git a/dev-requirements.txt b/dev-requirements.txt
-index 3ed9eb40..e90f3373 100644
a/dev-requirements.txt
-+++ b/dev-requirements.txt
-@@ -2,7 +2,6 @@
- invoke==1.6.0
- invocations==2.6.0
- pytest==4.4.2
--pytest-relaxed==1.1.5
- # pytest-xdist for test dir watching and the inv guard task
- pytest-xdist==1.28.0
- mock==2.0.0
-diff --git a/pytest.ini b/pytest.ini
-index be207cd8..5a506bcd 100644
a/pytest.ini
-+++ b/pytest.ini
-@@ -1,7 +1,4 @@
- [pytest]
--# We use pytest-relaxed just for its utils at the moment, so disable it at the
--# plugin level until we adapt test organization to really use it.
--addopts = -p no:relaxed
- # Loop on failure
- looponfailroots = tests paramiko
- # Ignore some warnings we cannot easily handle.
-diff --git a/tests/test_client.py b/tests/test_client.py
-index 3eaad4fb..66c41b0b 100644
a/tests/test_client.py
-+++ b/tests/test_client.py
-@@ -34,7 +34,6 @@ import weakref
- from tempfile import mkstemp
-
- import pytest
--from pytest_relaxed import raises
- from mock import patch, Mock
-
- import paramiko
-@@ -787,11 +786,11 @@ class PasswordPassphraseTests(ClientTest):
-
- # TODO: more granular exception pending #387; should be signaling "no auth
- # methods available" because no key and no password
--@raises(SSHException)
- @requires_sha1_signing
- 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 pytest.raises(SSHException):
-+# Using the "right" password in the "wrong" field shouldn't work.
-+self._test_connection(passphrase="pygmalion")
-
- @requires_sha1_signing
- def test_passphrase_kwarg_used_for_key_passphrase(self):
-@@ -811,15 +810,15 @@ class PasswordPassphraseTests(ClientTest):
- password="television",
- )
-
--@raises(AuthenticationException) # TODO: more granular
- @requires_sha1_signing
- 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 pytest.raises(AuthenticationException):
-+self._test_connection(
-+
[gentoo-commits] repo/gentoo:master commit in: dev-python/paramiko/files/, dev-python/paramiko/
commit: 6fd77322868db50f5b0b7f935bb2c771a1f3e9f7
Author: Michał Górny gentoo org>
AuthorDate: Sat Dec 10 08:55:26 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Dec 10 08:57:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd77322
dev-python/paramiko: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/paramiko/Manifest | 1 -
.../files/paramiko-2.11.0-invoke-tests.patch | 40 -
.../files/paramiko-2.11.0-pytest-relaxed.patch | 94 --
dev-python/paramiko/paramiko-2.11.0.ebuild | 62 --
4 files changed, 197 deletions(-)
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index eb655f12f935..aac53d250edf 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,2 +1 @@
-DIST paramiko-2.11.0.tar.gz 350793 BLAKE2B
86358e08407f8a820a9b33a60e771ac3adb8f3e003ccbc4704ba69a52bd427f38a9c49a20e6a07220d07c25dbcc35a472b2091fa9f7bc1447bab0d7a1ce16b35
SHA512
59e439bd54d83938f91d6c9888f2278bafa4ca48582939580bdabc6207dbe6dc856f6006ad26b7ec91b9d39e92ca70dc6270c6b5d4f77a5e1fa0ec8bd084d4b5
DIST paramiko-2.12.0.gh.tar.gz 351956 BLAKE2B
d41668f32f28a5c2c3af1d2b5c85bb4c3d2f5af9028cd5ebcb2b8aa21bc25df2c1ead5ddfe61ff12cfacec4b92913833e267f8a3fef07fa9a794f4b064fdb472
SHA512
1bf325ffd393447cb90009d01dc1104d0d43a6acdd08cc6d28310063a649a23748800dab119ab5e10833975e68f5f5702044fc247a2e8058122a5327f2c7
diff --git a/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch
b/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch
deleted file mode 100644
index 80fe876ef8e3..
--- a/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 529558cc20e448e45e24dc7b7609cd62300838b8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
-Date: Thu, 16 Apr 2020 09:46:39 +0200
-Subject: [PATCH] Skip tests requiring invoke if it's not installed
-
-Since invoke is an optional dependency and only one group of tests
-require it, skip them gracefully rather than failing if it's not
-present.
- tests/test_config.py | 7 ++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_config.py b/tests/test_config.py
-index 45fb262d..017d4bbf 100644
a/tests/test_config.py
-+++ b/tests/test_config.py
-@@ -6,7 +6,11 @@ from socket import gaierror
-
- from paramiko.py3compat import string_types
-
--from invoke import Result
-+try:
-+from invoke import Result
-+except ImportError:
-+Result = None
-+
- from mock import patch
- from pytest import raises, mark, fixture
-
-@@ -742,6 +746,7 @@ def _expect(success_on):
- return inner
-
-
-+@mark.skipif(Result is None, reason="requires invoke package")
- class TestMatchExec(object):
- @patch("paramiko.config.invoke", new=None)
- @patch("paramiko.config.invoke_import_error", new=ImportError("meh"))
---
-2.35.1
-
diff --git a/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch
b/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch
deleted file mode 100644
index 6e746aff1863..
--- a/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 03741e48c83856e53fc3f1487d660165cb718c11 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
-Date: Tue, 17 May 2022 07:26:36 +0200
-Subject: [PATCH] Replace pytest-relaxed with plain pytest.raises
-
-There is really no technical reason to bring pytest-relaxed to call
-@raises as a decorator while plain pytest works just fine. Plus,
-pytest.raises() is used in test_sftp already.
-
-pytest-relaxed causes humongous breakage to other packages
-on the system. It has been banned from Gentoo for this reason.
- dev-requirements.txt | 1 -
- pytest.ini | 3 ---
- tests/test_client.py | 20 ++--
- 3 files changed, 10 insertions(+), 14 deletions(-)
-
-diff --git a/dev-requirements.txt b/dev-requirements.txt
-index 3ed9eb40..e90f3373 100644
a/dev-requirements.txt
-+++ b/dev-requirements.txt
-@@ -2,7 +2,6 @@
- invoke==1.6.0
- invocations==2.6.0
- pytest==4.4.2
--pytest-relaxed==1.1.5
- # pytest-xdist for test dir watching and the inv guard task
- pytest-xdist==1.28.0
- mock==2.0.0
-diff --git a/pytest.ini b/pytest.ini
-index be207cd8..5a506bcd 100644
a/pytest.ini
-+++ b/pytest.ini
-@@ -1,7 +1,4 @@
- [pytest]
--# We use pytest-relaxed just for its utils at the moment, so disable it at the
--# plugin level until we adapt test organization to really use it.
--addopts = -p no:relaxed
- # Loop on failure
- looponfailroots = tests paramiko
- # Ignore some warnings we cannot easily handle.
-diff --git a/tests/test_client.py b/tests/test_client.py
-index fdf19c45..e4af71df 100644
a/tests/test_client.py
-+++ b/tests/test_client.py
-@@ -33,7 +33,7 @@ import warnings
- import weakref
- from tempfile import mkstemp
-
--from
[gentoo-commits] repo/gentoo:master commit in: dev-python/paramiko/files/
commit: 598e2f94abcdbdb2365eec0e182f56fa8bad17ae
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Mon Mar 30 16:18:48 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Thu May 14 22:19:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=598e2f94
dev-python/paramiko: remove unused patch
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger gmail.com>
Signed-off-by: Aaron Bauman gentoo.org>
.../paramiko/files/paramiko-2.6.0-tests.patch | 34 --
1 file changed, 34 deletions(-)
diff --git a/dev-python/paramiko/files/paramiko-2.6.0-tests.patch
b/dev-python/paramiko/files/paramiko-2.6.0-tests.patch
deleted file mode 100644
index 4b15f6a5050..000
--- a/dev-python/paramiko/files/paramiko-2.6.0-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Skip tests requiring pytest-relaxed since it was removed from the tree due to
-breaking pytest.
-
paramiko-2.6.0/tests/test_client.py
-+++ paramiko-2.6.0/tests/test_client.py
-@@ -33,7 +33,7 @@
- import weakref
- from tempfile import mkstemp
-
--from pytest_relaxed import raises
-+#from pytest_relaxed import raises
- from mock import patch, Mock
-
- import paramiko
-@@ -684,7 +684,8 @@
-
- # TODO: more granular exception pending #387; should be signaling "no auth
- # methods available" because no key and no password
--@raises(SSHException)
-+#@raises(SSHException)
-+@unittest.skip("skip tests requiring pytest-relaxed")
- 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")
-@@ -705,7 +706,8 @@
- password="television",
- )
-
--@raises(AuthenticationException) # TODO: more granular
-+#@raises(AuthenticationException) # TODO: more granular
-+@unittest.skip("skip tests requiring pytest-relaxed")
- def
test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given( # noqa
- self
- ):
[gentoo-commits] repo/gentoo:master commit in: dev-python/paramiko/files/, dev-python/paramiko/
commit: cead8d25918c9c59bb84c29e978d1d96b3d20f23
Author: Michał Górny gentoo org>
AuthorDate: Thu Apr 16 08:16:39 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Apr 16 08:37:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cead8d25
dev-python/paramiko: Fix tests to work without dev-python/invoke
While at it, update the pytest_relaxed patch to match the one submitted
upstream.
Closes: https://bugs.gentoo.org/715536
Signed-off-by: Michał Górny gentoo.org>
.../paramiko/files/paramiko-2.7.1-tests.patch | 108 +
dev-python/paramiko/paramiko-2.7.1.ebuild | 6 +-
2 files changed, 91 insertions(+), 23 deletions(-)
diff --git a/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
b/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
index 9c3570c2c58..5791afd044a 100644
--- a/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
+++ b/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
@@ -1,26 +1,60 @@
-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
+From e91cac80d679dfe16897988b0c14c1293a93c805 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Thu, 16 Apr 2020 09:22:59 +0200
+Subject: [PATCH 1/2] Replace pytest-relaxed with plain pytest.raises
-.. since it was removed from the tree due to breaking pytest.
+There is really no technical reason to bring pytest-relaxed to call
+@raises as a decorator while plain pytest works just fine. Plus,
+pytest.raises() is used in test_sftp already.
+
+pytest-relaxed causes humongous breakage to other packages
+on the system. It has been banned from Gentoo for this reason.
---
- tests/test_client.py | 23 +++
- 1 file changed, 11 insertions(+), 12 deletions(-)
+ dev-requirements.txt | 1 -
+ setup.cfg| 3 ---
+ tests/test_client.py | 20 ++--
+ 3 files changed, 10 insertions(+), 14 deletions(-)
+diff --git a/dev-requirements.txt b/dev-requirements.txt
+index f4f84748..b1b0cdf5 100644
+--- a/dev-requirements.txt
b/dev-requirements.txt
+@@ -2,7 +2,6 @@
+ invoke>=1.0,<2.0
+ invocations>=1.2.0,<2.0
+ pytest==4.4.2
+-pytest-relaxed==1.1.5
+ # pytest-xdist for test dir watching and the inv guard task
+ pytest-xdist==1.28.0
+ mock==2.0.0
+diff --git a/setup.cfg b/setup.cfg
+index 44d029c4..99159096 100644
+--- a/setup.cfg
b/setup.cfg
+@@ -17,9 +17,6 @@ ignore =
E124,E125,E128,E261,E301,E302,E303,E402,E721,W503,E203,E722
+ max-line-length = 79
+
+ [tool:pytest]
+-# We use pytest-relaxed just for its utils at the moment, so disable it at the
+-# plugin level until we adapt test organization to really use it.
+-addopts = -p no:relaxed
+ # Loop on failure
+ looponfailroots = tests paramiko
+ # Ignore some warnings we cannot easily handle.
diff --git a/tests/test_client.py b/tests/test_client.py
-index 60ad310..22a2e40 100644
+index 60ad310c..88fd1d53 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
-@@ -33,7 +33,6 @@ import warnings
+@@ -33,7 +33,7 @@ import warnings
import weakref
from tempfile import mkstemp
-from pytest_relaxed import raises
++import pytest
from mock import patch, Mock
import paramiko
-@@ -684,10 +683,10 @@ class PasswordPassphraseTests(ClientTest):
+@@ -684,10 +684,10 @@ class PasswordPassphraseTests(ClientTest):
# TODO: more granular exception pending #387; should be signaling "no auth
# methods available" because no key and no password
@@ -28,13 +62,13 @@ index 60ad310..22a2e40 100644
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):
++with pytest.raises(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):
+@@ -705,14 +705,14 @@ class PasswordPassphraseTests(ClientTest):
password="television",
)
@@ -42,21 +76,59 @@ index 60ad310..22a2e40 100644
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.
+ # 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
[gentoo-commits] repo/gentoo:master commit in: dev-python/paramiko/files/, dev-python/paramiko/
commit: 0f8f02e2d863c8a591ea9bdb1a623527ec2313ba
Author: Sebastian Pipping gentoo org>
AuthorDate: Mon Dec 16 16:57:17 2019 +
Commit: Sebastian Pipping gentoo org>
CommitDate: Mon Dec 16 17:02:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f8f02e2
dev-python/paramiko: 2.7.1
Closes: https://bugs.gentoo.org/702020
Signed-off-by: Sebastian Pipping gentoo.org>
Package-Manager: Portage-2.3.81, Repoman-2.3.20
dev-python/paramiko/Manifest | 1 +
.../paramiko/files/paramiko-2.7.1-tests.patch | 62 ++
dev-python/paramiko/paramiko-2.7.1.ebuild | 60 +
3 files changed, 123 insertions(+)
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index cedc946bc49..5eff383e6d9 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,2 +1,3 @@
DIST paramiko-2.4.2.tar.gz 289126 BLAKE2B
767f81a09b32762241eed6661e520e3b3a96acfe8e6e638ea7ae180a8b6866f8f4adeae0a0146d46ecbfccbe71334c5f5c14e2d049744258ca4808ac21365185
SHA512
894c2ebfcfb35a84fe74670d0eb67022a49b7bf165f31acd929045c17509d8a2be111e8319f20513b5034efd033edc6432b2ca2e7027dc7e3c6703166a96790f
DIST paramiko-2.6.0.tar.gz 304469 BLAKE2B
cde861069c8924b2f685675266fd28600ffd24a39074e9ad5db8fd1d010c6e23ca13a2c78a79b23504dfff395b773b171e7c787119d01e3b92a2eec44ca8b40a
SHA512
1ac2c3486cb786a1e4640d7b7f8628087f9b78ee247b09dbd3ac2646790da4f12cf95fc4291f27f200b63ec6c11d9ebf5a1283f88cf2de7c2eb6e6f76e892ef2
+DIST paramiko-2.7.1.tar.gz 330391 BLAKE2B
0f7a2f3b6c15a68002001d69f8402deea5421a8b1f6cf35061a8a36f4b81b7a291d7b0f0b457f32de4c4769659a2e067f0bdb6cc5dcdd0810ebf917e349e85af
SHA512
2cebed2420cf9af77cb0d459b64a74adcffcdb15bd58c8fc9243855ae91f43e16706665b64ce2851f6e99e59ca6a47d7299a2aae35a4c9d01ab97b343569c4b2
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 000..9c3570c2c58
--- /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.7.1.ebuild
b/dev-python/paramiko/paramiko-2.7.1.ebuild
new file mode 100644
index 000..5587e75a3c8
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.7.1.ebuild
@@ -0,0 +1,60 @@
+# 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,8} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2
[gentoo-commits] repo/gentoo:master commit in: dev-python/paramiko/files/, dev-python/paramiko/
commit: ea7c48747e06a2013badbc5c53cb458636189957
Author: Michał Górny gentoo org>
AuthorDate: Fri Jan 5 09:58:32 2018 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Jan 5 13:26:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea7c4874
dev-python/paramiko: Clean old up
dev-python/paramiko/Manifest | 2 -
.../files/paramiko-1.16.0-install_requires.patch | 18
dev-python/paramiko/paramiko-1.16.0.ebuild | 43 --
dev-python/paramiko/paramiko-2.3.0.ebuild | 52 --
4 files changed, 115 deletions(-)
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 9b7ea39d7b4..cd96fa8ffe1 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,5 +1,3 @@
-DIST paramiko-1.16.0.tar.gz 1335094 BLAKE2B
03d95d50b9a03a112074687b294c628de40400cded065bb89371e3f9a10d373c0b419365a56e6e04e2ec3ff7c4b6dbda4952f920f93941bf06ba3413fd4e79e2
SHA512
d75ed591c12898bab7d3e64b7281c9054ad49d00b6dba9e51826cca43ce30ae7c089ead0c3396f7542c2635183637e00a16f0b3d57360c0f65ec93d081489962
DIST paramiko-2.1.2.tar.gz 1196746 BLAKE2B
c184e171fe550fc231d67473867db283b706a93aebbd13ffb2503e10d69e43b9ab712237e6698fccae13472f0cb8135b6c015381ac687c4c20d4d1cb1620ae00
SHA512
465c5381b1b0a472d2ad8e690f0916a5f51713880486c7b94cadcf85ea0a52569e18337ccfee5440869e4a0c76bd2b1bc15c414128c07326b40ecd36ea021466
DIST paramiko-2.2.1.tar.gz 1205818 BLAKE2B
6b9007c2f653d6e640de4051bb16e5b9a4d039b59b38cb3500d6b2935e4e9e4acddecb0b1eb404f8bc6c5ea94a90cbc9a405ae5189efa0b9026d0550fcd9f259
SHA512
6aa2cce301f32c15d66e2137bc8a5c10ea4a667c599b24047a1e176b10636fe3abd28c7b2974befdde432a86c924acceace056c0572ea3006d3e4a8160b725c3
-DIST paramiko-2.3.0.tar.gz 279279 BLAKE2B
64db3412ac5b64ca345a978442062b9ff14e70ca7bbec85c807421df7dbb47166c694e9882508c2c9eefca37ae12233da3c696212a574bccd16015afbaa6c7ad
SHA512
a7935b76805a938e389fcf38beca0eb653cc1bc370ed7869726361d5758235d282e747c42582781c122f7c8e4299e61292c1ac96dc3921d44aedaf8a699c1ebc
DIST paramiko-2.3.1.tar.gz 282553 BLAKE2B
298bf73d2ecbb47506a7e3b7a03ddd650c8f126ef21b0e443602327a7011ee55c146aa3b6e4d160b47680b50dab3fcf04843597a290ccb166f88fc129bd85a67
SHA512
b63a177f1f03937d5650d6f2a3ca4c00e0c3ffb0080e5e5a8141aab435c3ad415f5af8c61cb2894d176544b854ff26ee510eaa41081b452dfa6213cdc055
diff --git a/dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch
b/dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch
deleted file mode 100644
index fde5e11b19e..000
--- a/dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch
+++ /dev/null
@@ -1,18 +0,0 @@
- setup.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 629c28f..e987dc6 100644
a/setup.py
-+++ b/setup.py
-@@ -41,8 +41,8 @@ try:
- from setuptools import setup
- kw = {
- 'install_requires': [
--'pycrypto >= 2.1, != 2.4',
--'ecdsa >= 0.11',
-+'pycrypto >=2.1,!=2.4',
-+'ecdsa >=0.11',
- ],
- }
- except ImportError:
diff --git a/dev-python/paramiko/paramiko-1.16.0.ebuild
b/dev-python/paramiko/paramiko-1.16.0.ebuild
deleted file mode 100644
index d0620934429..000
--- a/dev-python/paramiko/paramiko-1.16.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/
https://pypi.python.org/pypi/paramiko/;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh
sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="doc examples"
-
-RDEPEND="
- >=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]
- !=dev-python/pycrypto-2.4[${PYTHON_USEDEP}]
- >=dev-python/ecdsa-0.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Required for testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
- "${FILESDIR}"/${P}-install_requires.patch
-)
-
-python_test() {
- "${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/. )
- use examples && local EXAMPLES=( demos/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/paramiko/paramiko-2.3.0.ebuild
b/dev-python/paramiko/paramiko-2.3.0.ebuild
deleted file mode 100644
index 106bbe8627d..000
--- a/dev-python/paramiko/paramiko-2.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the
[gentoo-commits] repo/gentoo:master commit in: dev-python/paramiko/files/, dev-python/paramiko/
commit: 702db76345b0e33dd7cf50b8994b3850b1aa8b4e
Author: Justin Lecher gentoo org>
AuthorDate: Fri Feb 26 08:36:52 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Fri Feb 26 08:36:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=702db763
dev-python/paramiko: Fix broken whitespacing in version declaration of deps
* Add live version
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=575664
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
.../files/paramiko-1.16.0-install_requires.patch | 18 ++
dev-python/paramiko/paramiko-1.16.0.ebuild | 6 +-
.../{paramiko-1.16.0.ebuild => paramiko-.ebuild} | 13 +++--
3 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch
b/dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch
new file mode 100644
index 000..fde5e11
--- /dev/null
+++ b/dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch
@@ -0,0 +1,18 @@
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 629c28f..e987dc6 100644
+--- a/setup.py
b/setup.py
+@@ -41,8 +41,8 @@ try:
+ from setuptools import setup
+ kw = {
+ 'install_requires': [
+-'pycrypto >= 2.1, != 2.4',
+-'ecdsa >= 0.11',
++'pycrypto >=2.1,!=2.4',
++'ecdsa >=0.11',
+ ],
+ }
+ except ImportError:
diff --git a/dev-python/paramiko/paramiko-1.16.0.ebuild
b/dev-python/paramiko/paramiko-1.16.0.ebuild
index fa68870..218aaba 100644
--- a/dev-python/paramiko/paramiko-1.16.0.ebuild
+++ b/dev-python/paramiko/paramiko-1.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
# Required for testsuite
DISTUTILS_IN_SOURCE_BUILD=1
+PATCHES=(
+ "${FILESDIR}"/${P}-install_requires.patch
+)
+
python_test() {
"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
}
diff --git a/dev-python/paramiko/paramiko-1.16.0.ebuild
b/dev-python/paramiko/paramiko-.ebuild
similarity index 68%
copy from dev-python/paramiko/paramiko-1.16.0.ebuild
copy to dev-python/paramiko/paramiko-.ebuild
index fa68870..0048727 100644
--- a/dev-python/paramiko/paramiko-1.16.0.ebuild
+++ b/dev-python/paramiko/paramiko-.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
+inherit distutils-r1 git-r3
DESCRIPTION="SSH2 protocol library"
HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/
https://pypi.python.org/pypi/paramiko/;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/paramiko/paramiko.git;
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh
sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS=""
IUSE="doc examples"
RDEPEND="
@@ -34,7 +35,7 @@ python_test() {
python_install_all() {
use doc && local HTML_DOCS=( docs/. )
- use examples && local EXAMPLES=( demos/. )
+ use examples && dodoc -r demos
distutils-r1_python_install_all
}
