diff --git a/setup.py b/setup.py index f79a705..f84b754 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,6 @@ install_requires=[ 'Scrapy>=1.6', 'scrapinghub>=2.1.0', - 'scrapy-spider-metadata; python_version >= "3.8"' ], entry_points={ 'console_scripts': [ diff --git a/tests/test_crawl.py b/tests/test_crawl.py index 10f8efe..329e4c6 100644 --- a/tests/test_crawl.py +++ b/tests/test_crawl.py @@ -305,7 +305,6 @@ def test_image_info(tmp_path): assert data == expected -@pytest.mark.skipif(not SPIDER_METADATA_AVAILABLE, reason="scrapy-spider-metadata is not installed") def test_image_info_metadata(tmp_path): project_dir = create_project(tmp_path, spider_text=""" from scrapy import Spider @@ -321,10 +320,11 @@ class MySpider(Spider): "spiders": ["myspider"], "metadata": {"myspider": {"foo": 42}}, } + if not SPIDER_METADATA_AVAILABLE: + del expected["metadata"] assert data == expected -@pytest.mark.skipif(not SPIDER_METADATA_AVAILABLE, reason="scrapy-spider-metadata is not installed") def test_image_info_metadata_skip_broken(tmp_path): project_dir = create_project(tmp_path, spider_text=""" from scrapy import Spider @@ -340,4 +340,6 @@ class MySpider(Spider): "spiders": ["myspider"], "metadata": {}, } + if not SPIDER_METADATA_AVAILABLE: + del expected["metadata"] assert data == expected diff --git a/tox.ini b/tox.ini index 49682e8..c1b6641 100644 --- a/tox.ini +++ b/tox.ini @@ -10,5 +10,7 @@ deps = hubstorage packaging py36-scrapy16: Scrapy==1.6 + scrapy-spider-metadata; python_version >= "3.8" + commands = pytest --verbose --cov=sh_scrapy --cov-report=term-missing --cov-report=html --cov-report=xml {posargs: sh_scrapy tests}