bump Twisted dep to 11.1.0, thus simplify IntishPermissions

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / _auto_deps.py

diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index 5052ab85aca1cbea104df73c54fdb406bed60150..a42bc17b85fca86fc9e47424b138cb3254571133 100644 (file)
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -4,6 +4,17 @@
 # It is ok to import modules from the Python Standard Library if they are
 # always available, or the import is protected by try...except ImportError.
 
+# The semantics for requirement specs changed incompatibly in setuptools 8,
+# which now follows PEP 440. The requirements used in this file must be valid
+# under both the old and new semantics. That can be achieved by limiting
+# requirement specs to one of the following forms:
+#
+#   * >= X, <= Y where X < Y
+#   * >= X, != Y, != Z, ... where X < Y < Z...
+#
+# (In addition, check_requirement in allmydata/__init__.py only supports
+# >=, <= and != operators.)
+
 install_requires = [
     # We require newer versions of setuptools (actually
     # zetuptoolz) to build, but can handle older versions to run.
@@ -16,7 +27,7 @@ install_requires = [
 
     # zope.interface >= 3.6.0 is required for Twisted >= 12.1.0.
     # zope.interface 3.6.3 and 3.6.4 are incompatible with Nevow (#1435).
-    "zope.interface == 3.6.0, == 3.6.1, == 3.6.2, >= 3.6.5",
+    "zope.interface >= 3.6.0, != 3.6.3, != 3.6.4",
 
     # * foolscap < 0.5.1 had a performance bug which spent O(N**2) CPU for
     #   transferring large mutable files of size N.
@@ -28,7 +39,7 @@ install_requires = [
     # Needed for SFTP.
     # pycrypto 2.2 doesn't work due to <https://bugs.launchpad.net/pycrypto/+bug/620253>
     # pycrypto 2.4 doesn't work due to <https://bugs.launchpad.net/pycrypto/+bug/881130>
-    "pycrypto == 2.1.0, == 2.3, >= 2.4.1",
+    "pycrypto >= 2.1.0, != 2.2, != 2.4",
 
     # <http://www.voidspace.org.uk/python/mock/>, 0.8.0 provides "call"
     "mock >= 0.8.0",
@@ -99,10 +110,12 @@ if sys.platform == "win32":
         #   which includes the fix to <https://twistedmatrix.com/trac/ticket/411>.
         # * The SFTP frontend depends on Twisted 11.0.0 to fix the SSH server
         #   rekeying bug <https://twistedmatrix.com/trac/ticket/4395>
-        # * We don't want Twisted >= 12.3.0 to avoid a dependency of its endpoints
+        # * The FTP frontend depends on Twisted >=11.1.0 for
+        #   filepath.Permissions
+        # * We don't want Twisted >= 12.2.0 to avoid a dependency of its endpoints
         #   code on pywin32. <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/2028>
         #
-        "Twisted == 11.0.0, == 11.1.0, == 12.0.0, == 12.1.0, == 12.2.0",
+        "Twisted >= 11.1.0, <= 12.1.0",
 
         # * We need Nevow >= 0.9.33 to avoid a bug in Nevow's setup.py
         #   which imported twisted at setup time.
@@ -110,7 +123,7 @@ if sys.platform == "win32":
         #   which conflicts with the Twisted requirement above.
         #   <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/2291>
         #
-        "Nevow == 0.9.33, == 0.10",
+        "Nevow >= 0.9.33, <= 0.10",
 
         # pyasn1 is needed by twisted.conch in Twisted >= 9.0.
         "pyasn1 >= 0.0.8a",
@@ -193,6 +206,7 @@ if _can_use_pyOpenSSL_0_14:
         "cryptography",
         "cffi >= 0.8",          # latest cryptography depends on this version
         "six >= 1.4.1",         # latest cryptography depends on this version
+        "enum34",               # latest cryptography depends on this
         "pycparser",            # cffi depends on this
     ]
 
@@ -200,11 +214,12 @@ if _can_use_pyOpenSSL_0_14:
         ('cryptography',     'cryptography'),
         ('cffi',             'cffi'),
         ('six',              'six'),
+        ('enum34',           'enum'),
         ('pycparser',        'pycparser'),
     ]
 else:
     install_requires += [
-        "pyOpenSSL == 0.13, == 0.13.1",
+        "pyOpenSSL >= 0.13, <= 0.13.1",
     ]