Merge pull request #1027 from tahoe-lafs/3662.pin-decorator

Pin decorator. Fixes ticket:3662
2024-12-20 05:28:04 +00:00 · 2021-04-02 13:01:04 -04:00 · 2021-04-02 13:01:04 -04:00 · b6528249fb
commit b6528249fb
parent b133d0e7a0 add2be1b44
2 changed files with 4 additions and 0 deletions
--- a/newsfragments/3662.minor
+++ b/newsfragments/3662.minor
--- a/setup.py
+++ b/setup.py
@ -389,6 +389,10 @@ setup(name="tahoe-lafs", # also set in __init__.py
              "tox",
              "pytest",
              "pytest-twisted",
+              # XXX: decorator isn't a direct dependency, but pytest-twisted
+              # depends on decorator, and decorator 5.x isn't compatible with
+              # Python 2.7.
+              "decorator < 5",
              "hypothesis >= 3.6.1",
              "treq",
              "towncrier",