Merge pull request #70 from J-CPelletier/fix-guilded-age

Deploy on earliest supported version
J-CPelletier · Oct 29, 2023 · 898e9c6 · 898e9c6
2 parents 5f1e1f9 + 056dd95
commit 898e9c6
Show file tree

Hide file tree

Showing 6 changed files with 320 additions and 311 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         poetry-version: ["1.4.0"]
 
     steps:
@@ -57,7 +57,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6]
+        python-version: ["3.8"]
     needs: build
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -28,7 +28,7 @@ packages = [
 python = "^3.8"
 click = "^7.1.1"
 tqdm = "^4.43.0"
-Scrapy = "^2.5.1"
+Scrapy = "^2.11.0"
 scrapy-splash = "^0.9.0"
 scrapy-fake-useragent = "^1.4.4"
 pytest-rerunfailures = "^11.1.2"

diff --git a/webcomix/scrapy/verification/verification_spider.py b/webcomix/scrapy/verification/verification_spider.py
@@ -2,7 +2,7 @@
 
 from scrapy import Spider
 
-from webcomix.exceptions import CrawlerBlocked, NextLinkNotFound
+from webcomix.exceptions import NextLinkNotFound
 from webcomix.scrapy.request_factory import RequestFactory
 from webcomix.scrapy.util import is_not_end_of_comic
 from webcomix.scrapy.verification.web_page import WebPage

diff --git a/webcomix/supported_comics.py b/webcomix/supported_comics.py
@@ -42,12 +42,6 @@
         "comic_image_selector": "//div[@id='comic']//img/@src",
         "next_page_selector": "//a[contains(@class, 'comic-nav-next')]/@href",
     },
-    "GuildedAge": {
-        "name": "GuildedAge",
-        "start_url": "https://guildedage.net/comic/chapter-1-cover/",
-        "comic_image_selector": "//div[@id='comic']//img/@src",
-        "next_page_selector": "//a[@class='navi comic-nav-next navi-next']/@href",
-    },
     "TalesOfElysium": {
         "name": "TalesOfElysium",
         "start_url": "https://ssp-comics.com/comics/toe/?page=1&mode=10",

diff --git a/webcomix/tests/test_comic_availability.py b/webcomix/tests/test_comic_availability.py
@@ -9,11 +9,11 @@
 @pytest.mark.slow
 @pytest.mark.parametrize("comic_name", supported_comics.keys())
 def test_supported_comics(comic_name):
-    comic = Comic(**supported_comics[comic_name])
+    comic = Comic(**supported_comics[comic_name], debug=True)
     first_pages = comic.verify_xpath()
     try:
         check_first_pages(first_pages)
-    except:
+    except AssertionError:
         print("Comic failed! First pages:")
         print(first_pages)
         assert False