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

Add an "sftp" extra and put the Conch dependency there

Browse Source
This commit is contained in:
Jean-Paul Calderone 2019-08-14 09:04:20 -04:00
parent f435b54a8a
commit faed622ee9
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
setup.py
View File

@ -75,13 +75,7 @@ install_requires = [
# leftover timers) # leftover timers)
# * Twisted-16.4.0 introduces `python -m twisted.trial` which is needed # * Twisted-16.4.0 introduces `python -m twisted.trial` which is needed
# for coverage testing # for coverage testing
"Twisted[tls] >= 16.4.0",
# * Twisted 16.6.0 drops the undesirable gmpy dependency from the conch
# extra, letting us use that extra instead of trying to duplicate its
# dependencies here. Twisted[conch] >18.7 introduces a dependency on
# bcrypt. It is nice to avoid that if the user ends up with an older
# version of Twisted. That's hard to express except by using the extra.
"Twisted[tls,conch] >= 16.6.0",
# We need Nevow >= 0.11.1 which can be installed using pip. # We need Nevow >= 0.11.1 which can be installed using pip.
"Nevow >= 0.11.1", "Nevow >= 0.11.1",
@ -108,6 +102,23 @@ setup_requires = [
'setuptools >= 28.8.0', # for PEP-440 style versions 'setuptools >= 28.8.0', # for PEP-440 style versions
] ]
sftp_requires = [
# * Twisted 16.6.0 drops the undesirable gmpy dependency from the conch
# extra, letting us use that extra instead of trying to duplicate its
# dependencies here. Twisted[conch] >18.7 introduces a dependency on
# bcrypt. It is nice to avoid that if the user ends up with an older
# version of Twisted. That's hard to express except by using the extra.
"twisted[conch] >= 16.6.0",
]
tor_requires = [
"foolscap[tor] >= 0.12.5",
]
i2p_requires = [
"foolscap[i2p] >= 0.12.6",
]
if len(sys.argv) > 1 and sys.argv[1] == '--fakedependency': if len(sys.argv) > 1 and sys.argv[1] == '--fakedependency':
del sys.argv[1] del sys.argv[1]
install_requires += ["fakedependency >= 1.0.0"] install_requires += ["fakedependency >= 1.0.0"]
@ -330,10 +341,6 @@ setup(name="tahoe-lafs", # also set in __init__.py
"coverage", "coverage",
"mock", "mock",
"tox", "tox",
"foolscap[tor] >= 0.12.5",
"txtorcon >= 0.17.0", # in case pip's resolver doesn't work
"foolscap[i2p] >= 0.12.6",
"txi2p >= 0.3.2", # in case pip's resolver doesn't work
"pytest", "pytest",
"pytest-twisted", "pytest-twisted",
"hypothesis >= 3.6.1", "hypothesis >= 3.6.1",
@ -341,15 +348,10 @@ setup(name="tahoe-lafs", # also set in __init__.py
"towncrier", "towncrier",
"testtools", "testtools",
"fixtures", "fixtures",
], ] + sftp_requires + tor_requires + i2p_requires,
"tor": [ "sftp": sftp_requires,
"foolscap[tor] >= 0.12.5", "tor": tor_requires,
"txtorcon >= 0.17.0", # in case pip's resolver doesn't work "i2p": i2p_requires,
],
"i2p": [
"foolscap[i2p] >= 0.12.6",
"txi2p >= 0.3.2", # in case pip's resolver doesn't work
],
}, },
package_data={"allmydata.web": ["*.xhtml", package_data={"allmydata.web": ["*.xhtml",
"static/*.js", "static/*.png", "static/*.css", "static/*.js", "static/*.png", "static/*.css",