ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-22 14:22:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

bump foolscap dep to 0.12.3, for the new tor API

Browse Source 
The current version of Foolscap is compatible with the current version
of txtorcon, but not with tahoe. This fixes that.
This commit is contained in:
Brian Warner 2016-09-01 19:44:25 -07:00
parent 1307c7262d
commit 7f9b715b3e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup.py
View File

@ -261,7 +261,7 @@ setup(name="tahoe-lafs", # also set in __init__.py
"coverage", "coverage",
"mock", "mock",
"tox", "tox",
"foolscap[tor]", "foolscap[tor] >= 0.12.3",
"txtorcon", # in case pip's resolver doesn't work "txtorcon", # in case pip's resolver doesn't work
"foolscap[i2p]", "foolscap[i2p]",
"txi2p", # in case pip's resolver doesn't work "txi2p", # in case pip's resolver doesn't work
@ -269,7 +269,7 @@ setup(name="tahoe-lafs", # also set in __init__.py
"pytest-twisted", "pytest-twisted",
], ],
"tor": [ "tor": [
"foolscap[tor]", "foolscap[tor] >= 0.12.3",
"txtorcon", # in case pip's resolver doesn't work "txtorcon", # in case pip's resolver doesn't work
], ],
"i2p": [ "i2p": [

4
src/allmydata/_auto_deps.py
View File

@ -39,8 +39,8 @@ install_requires = [
# * foolscap 0.8.0 generates 2048-bit RSA-with-SHA-256 signatures, # * foolscap 0.8.0 generates 2048-bit RSA-with-SHA-256 signatures,
# rather than 1024-bit RSA-with-MD5. This also allows us to work # rather than 1024-bit RSA-with-MD5. This also allows us to work
# with a FIPS build of OpenSSL. # with a FIPS build of OpenSSL.
# * foolscap >= 0.12.2 provides tcp/tor/i2p connection handlers we need # * foolscap >= 0.12.3 provides tcp/tor/i2p connection handlers we need
"foolscap >= 0.12.2", "foolscap >= 0.12.3",
# Needed for SFTP. # Needed for SFTP.
# pycrypto 2.2 doesn't work due to <https://bugs.launchpad.net/pycrypto/+bug/620253> # pycrypto 2.2 doesn't work due to <https://bugs.launchpad.net/pycrypto/+bug/620253>