Merge branch '3390.3404.3723-dependency-versions' into 3708.bytes-logging
This commit is contained in:
commit
203652d087
7
setup.py
7
setup.py
|
@ -114,12 +114,11 @@ install_requires = [
|
||||||
|
|
||||||
# Pyrsistent 0.17.0 (which we use by way of Eliot) has dropped
|
# 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.
|
# 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 ; python_version < '3.0'",
|
||||||
"pyrsistent < 0.17.0",
|
"pyrsistent ; python_version > '3.0'",
|
||||||
|
|
||||||
# A great way to define types of values.
|
# 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",
|
||||||
"attrs >= 18.2.0, < 20",
|
|
||||||
|
|
||||||
# WebSocket library for twisted and asyncio
|
# WebSocket library for twisted and asyncio
|
||||||
"autobahn >= 19.5.2",
|
"autobahn >= 19.5.2",
|
||||||
|
|
3
tox.ini
3
tox.ini
|
@ -259,8 +259,7 @@ deps =
|
||||||
# PyInstaller 4.0 drops Python 2 support. When we finish porting to
|
# PyInstaller 4.0 drops Python 2 support. When we finish porting to
|
||||||
# Python 3 we can reconsider this constraint.
|
# Python 3 we can reconsider this constraint.
|
||||||
pyinstaller < 4.0
|
pyinstaller < 4.0
|
||||||
# 2021.5.13 broke on Windows. See https://github.com/erocarrera/pefile/issues/318
|
pefile ; platform_system == "Windows"
|
||||||
pefile < 2021.5.13 ; platform_system == "Windows"
|
|
||||||
# Setting PYTHONHASHSEED to a known value assists with reproducible builds.
|
# Setting PYTHONHASHSEED to a known value assists with reproducible builds.
|
||||||
# See https://pyinstaller.readthedocs.io/en/stable/advanced-topics.html#creating-a-reproducible-build
|
# See https://pyinstaller.readthedocs.io/en/stable/advanced-topics.html#creating-a-reproducible-build
|
||||||
setenv=PYTHONHASHSEED=1
|
setenv=PYTHONHASHSEED=1
|
||||||
|
|
Loading…
Reference in New Issue