From 6475b4433688492c5e4fdbd2a4cf1a7e1733d734 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Mon, 5 Jul 2021 16:17:26 -0700 Subject: [PATCH] Get rid of unnecessary version constraints. --- newsfragments/3390.minor | 0 newsfragments/3404.minor | 0 newsfragments/3723.minor | 0 setup.py | 7 +++---- tox.ini | 3 +-- 5 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 newsfragments/3390.minor create mode 100644 newsfragments/3404.minor create mode 100644 newsfragments/3723.minor diff --git a/newsfragments/3390.minor b/newsfragments/3390.minor new file mode 100644 index 000000000..e69de29bb diff --git a/newsfragments/3404.minor b/newsfragments/3404.minor new file mode 100644 index 000000000..e69de29bb diff --git a/newsfragments/3723.minor b/newsfragments/3723.minor new file mode 100644 index 000000000..e69de29bb diff --git a/setup.py b/setup.py index 1b64c9b09..3433e93f4 100644 --- a/setup.py +++ b/setup.py @@ -114,12 +114,11 @@ install_requires = [ # Pyrsistent 0.17.0 (which we use by way of Eliot) has dropped # Python 2 entirely; stick to the version known to work for us. - # XXX: drop this bound: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3404 - "pyrsistent < 0.17.0", + "pyrsistent < 0.17.0 ; python_version < '3.0'", + "pyrsistent ; python_version > '3.0'", # A great way to define types of values. - # XXX: drop the upper bound: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3390 - "attrs >= 18.2.0, < 20", + "attrs >= 18.2.0", # WebSocket library for twisted and asyncio "autobahn >= 19.5.2", diff --git a/tox.ini b/tox.ini index 7a7427299..c3bddeb43 100644 --- a/tox.ini +++ b/tox.ini @@ -259,8 +259,7 @@ deps = # PyInstaller 4.0 drops Python 2 support. When we finish porting to # Python 3 we can reconsider this constraint. pyinstaller < 4.0 - # 2021.5.13 broke on Windows. See https://github.com/erocarrera/pefile/issues/318 - pefile < 2021.5.13 ; platform_system == "Windows" + pefile ; platform_system == "Windows" # Setting PYTHONHASHSEED to a known value assists with reproducible builds. # See https://pyinstaller.readthedocs.io/en/stable/advanced-topics.html#creating-a-reproducible-build setenv=PYTHONHASHSEED=1