require foolscap >= 0.12.5, for ReconnectionInfo

This commit is contained in:
Brian Warner
2016-12-07 21:42:00 -08:00
parent 6879622894
commit de4295ae60
2 changed files with 4 additions and 3 deletions

View File

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

View File

@ -41,7 +41,8 @@ install_requires = [
# with a FIPS build of OpenSSL. # with a FIPS build of OpenSSL.
# * foolscap >= 0.12.3 provides tcp/tor/i2p connection handlers we need, # * foolscap >= 0.12.3 provides tcp/tor/i2p connection handlers we need,
# and allocate_tcp_port # and allocate_tcp_port
"foolscap >= 0.12.3", # * foolscap >= 0.12.5 has ConnectionInfo and ReconnectionInfo
"foolscap >= 0.12.5",
# 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>