From 33485c184ae7ebf1f675c539d1bbdf28a7049ab0 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 19 Jul 2018 14:44:18 -0400 Subject: [PATCH 1/3] No longer needed for SFTP. Twisted's SFTP is now based on ``cryptography``. --- src/allmydata/_auto_deps.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py index 486a09199..dde3da033 100644 --- a/src/allmydata/_auto_deps.py +++ b/src/allmydata/_auto_deps.py @@ -42,11 +42,6 @@ install_requires = [ # * foolscap >= 0.12.6 has an i2p.sam_endpoint() that takes kwargs "foolscap >= 0.12.6", - # Needed for SFTP. - # pycrypto 2.2 doesn't work due to - # pycrypto 2.4 doesn't work due to - "pycrypto >= 2.1.0, != 2.2, != 2.4", - # pycryptopp-0.6.0 includes ed25519 "pycryptopp >= 0.6.0", @@ -112,7 +107,6 @@ package_imports = [ ('platform', None), ('pyOpenSSL', 'OpenSSL'), ('OpenSSL', None), - ('pycrypto', 'Crypto'), ('pyasn1', 'pyasn1'), ('service-identity', 'service_identity'), ('characteristic', 'characteristic'), From 284ea9c3b97c4de1686ac8f5fb8de6ab97138b5e Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 19 Jul 2018 14:48:12 -0400 Subject: [PATCH 2/3] not gonna import from Crypto at all --- src/allmydata/_auto_deps.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py index dde3da033..35503bd8b 100644 --- a/src/allmydata/_auto_deps.py +++ b/src/allmydata/_auto_deps.py @@ -170,5 +170,4 @@ warning_imports = [ 'nevow', 'twisted.persisted.sob', 'twisted.python.filepath', - 'Crypto.Hash.SHA', ] From 0fb9e628f8f5ce7740e77f3d6f34eeb593341767 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 19 Jul 2018 14:51:03 -0400 Subject: [PATCH 3/3] mention the change in the news --- NEWS.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 74b01e8c5..b0cafaac0 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -191,6 +191,7 @@ improvements which shouldn't have any user-visible effects: * `PR410`_ explicit python2.7 virtualenv * `PR419`_ fix list of supported OSes * `PR423`_ switch travis to a supported Ubuntu +* deps: no longer declare a PyCrypto dependency (actual use vanished long ago) `PR514`_ @@ -240,6 +241,7 @@ improvements which shouldn't have any user-visible effects: .. _PR482: https://github.com/tahoe-lafs/tahoe-lafs/pull/482 .. _PR502: https://github.com/tahoe-lafs/tahoe-lafs/pull/502 .. _PR506: https://github.com/tahoe-lafs/tahoe-lafs/pull/506 +.. _PR514: https://github.com/tahoe-lafs/tahoe-lafs/pull/514 .. _AnBuKu: https://github.com/AnBuKu .. _ValdikSS: https://github.com/ValdikSS .. _bookchin: https://github.com/bookchin