Scrapy, a fast high-level web crawling & scraping framework for Python.
Merge branch 'master' of https://github.com/scrapy/scrapy into h2-client-protocol
Adityad97cf973ddd0
diff --cc setup.pyindex d872d6472,d0880051f..7f4ff0095--- a/setup.py+++ b/setup.py@@@ -18,6 -18,21 +18,22 @@@ def has_environment_marker_platform_impreturn parse_version(setuptools_version) >= parse_version('18.5')+ install_requires = [+ 'Twisted>=17.9.0',+ 'cryptography>=2.0',+ 'cssselect>=0.9.1',+ 'itemloaders>=1.0.1',+ 'parsel>=1.5.0',+ 'PyDispatcher>=2.0.5',+ 'pyOpenSSL>=16.2.0',+ 'queuelib>=1.4.2',+ 'service_identity>=16.0.0',+ 'w3lib>=1.17.0',+ 'zope.interface>=4.1.3',+ 'protego>=0.1.15',+ 'itemadapter>=0.1.0',++ 'h2>=3.2.0',+ ]extras_require = {}if has_environment_marker_platform_impl_support():@@@ -67,22 -93,6 +94,6 @@@ setup'Topic :: Software Development :: Libraries :: Python Modules',],python_requires='>=3.5.2',- install_requires=[- 'Twisted[http2]>=17.9.0',- 'cryptography>=2.0',- 'cssselect>=0.9.1',- 'lxml>=3.5.0',- 'parsel>=1.5.0',- 'PyDispatcher>=2.0.5',- 'pyOpenSSL>=16.2.0',- 'queuelib>=1.4.2',- 'service_identity>=16.0.0',- 'w3lib>=1.17.0',- 'zope.interface>=4.1.3',- 'protego>=0.1.15',- 'itemadapter>=0.1.0',- 'typing_extensions>=3.7',- 'h2>=3.2.0'- ],+ install_requires=install_requires,extras_require=extras_require,-)+)diff --cc tox.iniindex be3b56e2d,11882c03f..e8fdbd85d--- a/tox.ini+++ b/tox.ini@@@ -83,9 -77,22 +77,23 @@@ deps-rtests/requirements-py3.txt# Extrasbotocore==1.3.23+ h2==3.2.0+ google-cloud-storage==1.29.0Pillow==3.4.2+ [testenv:pinned]+ deps =+ {[pinned]deps}+ lxml==3.5.0++ [testenv:windows-pinned]+ basepython = python3+ deps =+ {[pinned]deps}+ # First lxml version that includes a Windows wheel for Python 3.5, so we do+ # not need to build lxml from sources in a CI Windows job:+ lxml==3.8.0+[testenv:extra-deps]deps ={[testenv]deps}