diff --git a/docs/news.rst b/docs/news.rst index f714ca8fa..fbceb8126 100644 --- a/docs/news.rst +++ b/docs/news.rst @@ -21,6 +21,8 @@ Scrapy 2.6.3 (to be determined) - Twisted_: 17.9.0 → 18.9.0 + - zope.interface_: 4.1.3 → 4.4.2 + (:issue:`5621`, :issue:`5632`) diff --git a/setup.py b/setup.py index aa064c508..421cd6b9e 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ install_requires = [ 'queuelib>=1.4.2', 'service_identity>=18.1.0', 'w3lib>=1.17.0', - 'zope.interface>=4.1.3', + 'zope.interface>=4.4.2', 'protego>=0.1.15', 'itemadapter>=0.1.0', 'setuptools', diff --git a/tox.ini b/tox.ini index 21ed90b5f..0d9d7987e 100644 --- a/tox.ini +++ b/tox.ini @@ -86,7 +86,7 @@ deps = service_identity==18.1.0 Twisted[http2]==18.9.0 w3lib==1.17.0 - zope.interface==4.1.3 + zope.interface==4.4.2 -rtests/requirements.txt # mitmproxy 4.0.4+ requires upgrading some of the pinned dependencies @@ -102,6 +102,7 @@ install_command = pip install -U {opts} {packages} [testenv:pinned] +basepython = python3.6 deps = {[pinned]deps} lxml==3.5.0 @@ -111,7 +112,7 @@ setenv = {[pinned]setenv} [testenv:windows-pinned] -basepython = python3 +basepython = python3.6 deps = {[pinned]deps} # First lxml version that includes a Windows wheel for Python 3.6, so we do @@ -139,6 +140,7 @@ commands = {[testenv]commands} --reactor=asyncio [testenv:asyncio-pinned] +basepython = python3.6 deps = {[testenv:pinned]deps} commands = {[testenv:asyncio]commands} install_command = {[pinned]install_command}