From 4f7bb2c96f7ee5dbcc5a699edb5c1d59dabfa797 Mon Sep 17 00:00:00 2001 From: Honza Javorek Date: Thu, 3 Mar 2022 14:13:18 +0100 Subject: [PATCH] downgrade scrapy due to https://github.com/scrapy/scrapy/issues/5435 --- poetry.lock | 116 +++++++++++++++++++++++++------------------------ pyproject.toml | 1 + 2 files changed, 61 insertions(+), 56 deletions(-) diff --git a/poetry.lock b/poetry.lock index 1bd9b69ef92..cf04923c347 100644 --- a/poetry.lock +++ b/poetry.lock @@ -279,18 +279,6 @@ python-versions = ">=3.6" [package.dependencies] sgmllib3k = "*" -[[package]] -name = "filelock" -version = "3.6.0" -description = "A platform independent file lock." -category = "main" -optional = false -python-versions = ">=3.7" - -[package.extras] -docs = ["furo (>=2021.8.17b43)", "sphinx (>=4.1)", "sphinx-autodoc-typehints (>=1.12)"] -testing = ["covdefaults (>=1.2.0)", "coverage (>=4)", "pytest (>=4)", "pytest-cov", "pytest-timeout (>=1.4.2)"] - [[package]] name = "fiobank" version = "3.0.0" @@ -510,6 +498,26 @@ python-versions = ">=3.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" google-auth = ">=1.12.0" google-auth-oauthlib = ">=0.4.1" +[[package]] +name = "h2" +version = "3.2.0" +description = "HTTP/2 State-Machine based protocol implementation" +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +hpack = ">=3.0,<4" +hyperframe = ">=5.2.0,<6" + +[[package]] +name = "hpack" +version = "3.0.0" +description = "Pure-Python HPACK header compression" +category = "main" +optional = false +python-versions = "*" + [[package]] name = "html-text" version = "0.5.2" @@ -550,6 +558,14 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [package.dependencies] pyparsing = {version = ">=2.4.2,<3.0.0 || >3.0.0,<3.0.1 || >3.0.1,<3.0.2 || >3.0.2,<3.0.3 || >3.0.3,<4", markers = "python_version > \"3.0\""} +[[package]] +name = "hyperframe" +version = "5.2.0" +description = "HTTP/2 framing layer for Python" +category = "main" +optional = false +python-versions = "*" + [[package]] name = "hyperlink" version = "21.0.0" @@ -995,6 +1011,14 @@ requests = "*" tinytag = "*" validators = "*" +[[package]] +name = "priority" +version = "1.3.0" +description = "A pure-Python implementation of the HTTP/2 priority tree" +category = "main" +optional = false +python-versions = "*" + [[package]] name = "protego" version = "0.1.16" @@ -1275,18 +1299,6 @@ urllib3 = ">=1.21.1,<1.27" socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] -[[package]] -name = "requests-file" -version = "1.5.1" -description = "File transport adapter for Requests" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -requests = ">=1.0.0" -six = "*" - [[package]] name = "requests-oauthlib" version = "1.3.0" @@ -1357,7 +1369,7 @@ numpy = ">=1.16.5,<1.23.0" [[package]] name = "scrapy" -version = "2.6.1" +version = "2.5.1" description = "A high-level Web Crawling and Web Scraping framework" category = "main" optional = false @@ -1366,6 +1378,7 @@ python-versions = ">=3.6" [package.dependencies] cryptography = ">=2.0" cssselect = ">=0.9.1" +h2 = ">=3.0,<4.0" itemadapter = ">=0.1.0" itemloaders = ">=1.0.1" lxml = [ @@ -1379,8 +1392,7 @@ pyOpenSSL = ">=16.2.0" PyPyDispatcher = {version = ">=2.1.0", markers = "platform_python_implementation == \"PyPy\""} queuelib = ">=1.4.2" service-identity = ">=16.0.0" -tldextract = "*" -Twisted = ">=17.9.0" +Twisted = {version = ">=17.9.0", extras = ["http2"]} w3lib = ">=1.17.0" "zope.interface" = ">=4.1.3" @@ -1459,20 +1471,6 @@ python-versions = ">=2.7" [package.extras] tests = ["pytest", "pytest-cov", "coveralls", "flake8"] -[[package]] -name = "tldextract" -version = "3.2.0" -description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List. By default, this includes the public ICANN TLDs and their exceptions. You can optionally support the Public Suffix List's private domains as well." -category = "main" -optional = false -python-versions = ">=3.7" - -[package.dependencies] -filelock = ">=3.0.8" -idna = "*" -requests = ">=2.1.0" -requests-file = ">=1.4" - [[package]] name = "tomli" version = "2.0.0" @@ -1493,8 +1491,10 @@ python-versions = ">=3.6.7" attrs = ">=19.2.0" Automat = ">=0.8.0" constantly = ">=15.1" +h2 = {version = ">=3.0,<4.0", optional = true, markers = "extra == \"http2\""} hyperlink = ">=17.1.1" incremental = ">=21.3.0" +priority = {version = ">=1.1.0,<2.0", optional = true, markers = "extra == \"http2\""} twisted-iocpsupport = {version = ">=1.0.2,<2", markers = "platform_system == \"Windows\""} typing-extensions = ">=3.6.5" "zope.interface" = ">=4.4.2" @@ -1647,7 +1647,7 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "1.1" python-versions = "3.8.*" -content-hash = "d3b3db9a5ef690f3d2b3e7da25cdfd5ea272889f0eb67b55b916dceaae7ca12c" +content-hash = "5246418f2bb39d30963718ef2fb92aeaf7711fceb2c07478f8d34a7037001aac" [metadata.files] aiohttp = [ @@ -1880,10 +1880,6 @@ feedparser = [ {file = "feedparser-6.0.8-py3-none-any.whl", hash = "sha256:1b7f57841d9cf85074deb316ed2c795091a238adb79846bc46dccdaf80f9c59a"}, {file = "feedparser-6.0.8.tar.gz", hash = "sha256:5ce0410a05ab248c8c7cfca3a0ea2203968ee9ff4486067379af4827a59f9661"}, ] -filelock = [ - {file = "filelock-3.6.0-py3-none-any.whl", hash = "sha256:f8314284bfffbdcfa0ff3d7992b023d4c628ced6feb957351d4c48d059f56bc0"}, - {file = "filelock-3.6.0.tar.gz", hash = "sha256:9cd540a9352e432c7246a48fe4e8712b10acb1df2ad1f30e8c070b82ae1fed85"}, -] fiobank = [ {file = "fiobank-3.0.0-py2.py3-none-any.whl", hash = "sha256:6b335210f92be648342ee879a1156e8fb450ff1d059f6e8757c857611a55ef26"}, {file = "fiobank-3.0.0.tar.gz", hash = "sha256:ecc13d37046bc2f36f50c9ee563e389eedab955c158b6c7293e00d5ee0c39bb3"}, @@ -2013,6 +2009,14 @@ gspread = [ {file = "gspread-5.2.0-py3-none-any.whl", hash = "sha256:05297b49587b5e89c2a0aa39967f43e5b7f170b62c11ddd43214baa1085131a8"}, {file = "gspread-5.2.0.tar.gz", hash = "sha256:25173ac081469cf9d621514c6576c6cf46f39c825f178b8cb9e78374a637b0bf"}, ] +h2 = [ + {file = "h2-3.2.0-py2.py3-none-any.whl", hash = "sha256:61e0f6601fa709f35cdb730863b4e5ec7ad449792add80d1410d4174ed139af5"}, + {file = "h2-3.2.0.tar.gz", hash = "sha256:875f41ebd6f2c44781259005b157faed1a5031df3ae5aa7bcb4628a6c0782f14"}, +] +hpack = [ + {file = "hpack-3.0.0-py2.py3-none-any.whl", hash = "sha256:0edd79eda27a53ba5be2dfabf3b15780928a0dff6eb0c60a3d6767720e970c89"}, + {file = "hpack-3.0.0.tar.gz", hash = "sha256:8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2"}, +] html-text = [ {file = "html_text-0.5.2-py2.py3-none-any.whl", hash = "sha256:3f1e063f05eddf3e099a88f0440219c55fdc01c44f1291fe59c66e5228d7fc56"}, {file = "html_text-0.5.2.tar.gz", hash = "sha256:afd61bbb70651d494a8c32670a29b9140492eccc9690109857beae41c3093ded"}, @@ -2025,6 +2029,10 @@ httplib2 = [ {file = "httplib2-0.20.2-py3-none-any.whl", hash = "sha256:6b937120e7d786482881b44b8eec230c1ee1c5c1d06bce8cc865f25abbbf713b"}, {file = "httplib2-0.20.2.tar.gz", hash = "sha256:e404681d2fbcec7506bcb52c503f2b021e95bee0ef7d01e5c221468a2406d8dc"}, ] +hyperframe = [ + {file = "hyperframe-5.2.0-py2.py3-none-any.whl", hash = "sha256:5187962cb16dcc078f23cb5a4b110098d546c3f41ff2d4038a9896893bbd0b40"}, + {file = "hyperframe-5.2.0.tar.gz", hash = "sha256:a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f"}, +] hyperlink = [ {file = "hyperlink-21.0.0-py2.py3-none-any.whl", hash = "sha256:e6b14c37ecb73e89c77d78cdb4c2cc8f3fb59a885c5b3f819ff4ed80f25af1b4"}, {file = "hyperlink-21.0.0.tar.gz", hash = "sha256:427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b"}, @@ -2411,6 +2419,10 @@ pod2gen = [ {file = "pod2gen-1.0.3-py2.py3-none-any.whl", hash = "sha256:30bb5250e739b76e6a85438ef46a643ba9d564684aff0678a06e5355c3284778"}, {file = "pod2gen-1.0.3.tar.gz", hash = "sha256:8813eb9b23132b8b6c639e511f7e3fdb2c90328657e9ff9805cfaafb7e907aa6"}, ] +priority = [ + {file = "priority-1.3.0-py2.py3-none-any.whl", hash = "sha256:be4fcb94b5e37cdeb40af5533afe6dd603bd665fe9c8b3052610fc1001d5d1eb"}, + {file = "priority-1.3.0.tar.gz", hash = "sha256:6bc1961a6d7fcacbfc337769f1a382c8e746566aaa365e78047abe9f66b2ffbe"}, +] protego = [ {file = "Protego-0.1.16.tar.gz", hash = "sha256:a682771bc7b51b2ff41466460896c1a5a653f9a1e71639ef365a72e66d8734b4"}, ] @@ -2579,10 +2591,6 @@ requests = [ {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"}, ] -requests-file = [ - {file = "requests-file-1.5.1.tar.gz", hash = "sha256:07d74208d3389d01c38ab89ef403af0cfec63957d53a0081d8eca738d0247d8e"}, - {file = "requests_file-1.5.1-py2.py3-none-any.whl", hash = "sha256:dfe5dae75c12481f68ba353183c53a65e6044c923e64c24b2209f6c7570ca953"}, -] requests-oauthlib = [ {file = "requests-oauthlib-1.3.0.tar.gz", hash = "sha256:b4261601a71fd721a8bd6d7aa1cc1d6a8a93b4a9f5e96626f8e4d91e8beeaa6a"}, {file = "requests_oauthlib-1.3.0-py2.py3-none-any.whl", hash = "sha256:7f71572defaecd16372f9006f33c2ec8c077c3cfa6f5911a9a90202beb513f3d"}, @@ -2660,8 +2668,8 @@ scipy = [ {file = "scipy-1.7.3.tar.gz", hash = "sha256:ab5875facfdef77e0a47d5fd39ea178b58e60e454a4c85aa1e52fcb80db7babf"}, ] scrapy = [ - {file = "Scrapy-2.6.1-py2.py3-none-any.whl", hash = "sha256:e977f57d4e828f25d2702e8c2212e8abcd7d6ce45be560f1830a39432a494c09"}, - {file = "Scrapy-2.6.1.tar.gz", hash = "sha256:56fd55a59d0f329ce752892358abee5a6b50b4fc55a40420ea317dc617553827"}, + {file = "Scrapy-2.5.1-py2.py3-none-any.whl", hash = "sha256:1a9a36970004950ee3c519a14c4db945f9d9a63fecb3d593dddcda477331dde9"}, + {file = "Scrapy-2.5.1.tar.gz", hash = "sha256:13af6032476ab4256158220e530411290b3b934dd602bb6dacacbf6d16141f49"}, ] service-identity = [ {file = "service-identity-21.1.0.tar.gz", hash = "sha256:6e6c6086ca271dc11b033d17c3a8bea9f24ebff920c587da090afc9519419d34"}, @@ -2688,10 +2696,6 @@ threadpoolctl = [ tinytag = [ {file = "tinytag-1.7.0.tar.gz", hash = "sha256:513135c156e93026837a177ed336487f4fbdaa5c7efe8b8bfbeab9ce8f1404f7"}, ] -tldextract = [ - {file = "tldextract-3.2.0-py3-none-any.whl", hash = "sha256:427703b65db54644f7b81d3dcb79bf355c1a7c28a12944e5cc6787531ccc828a"}, - {file = "tldextract-3.2.0.tar.gz", hash = "sha256:3d4b6a2105600b7d0290ea237bf30b6b0dc763e50fcbe40e849a019bd6dbcbff"}, -] tomli = [ {file = "tomli-2.0.0-py3-none-any.whl", hash = "sha256:b5bde28da1fed24b9bd1d4d2b8cba62300bfb4ec9a6187a957e8ddb9434c5224"}, {file = "tomli-2.0.0.tar.gz", hash = "sha256:c292c34f58502a1eb2bbb9f5bbc9a5ebc37bee10ffb8c2d6bbdfa8eb13cc14e1"}, diff --git a/pyproject.toml b/pyproject.toml index 8ebce1d3868..8adc7c66038 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,6 +47,7 @@ mkdocs-simple-hooks = "*" ics = { git = "https://github.com/ics-py/ics-py.git", branch = "main" } pod2gen = "^1.0.3" invoke = "^1.6.0" +Scrapy = "2.5.1" [tool.poetry.dev-dependencies] pytest = "*"