diff --git a/.circleci/config.yml b/.circleci/config.yml index 4c51eaa2..28390d8d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,6 +13,9 @@ jobs: is-py27: type: boolean default: false + use-scrapyd-v143: + type: boolean + default: true use-git: type: boolean default: false @@ -126,6 +129,16 @@ jobs: pip install -U git+https://github.com/scrapy/scrapyd.git pip install -U git+https://github.com/my8100/logparser.git pip list + - when: + condition: <> + steps: + - run: + name: scrapyd==1.4.3 + command: | + . venv/bin/activate + pip list + pip install scrapyd==1.4.3 + pip list - run: name: Launch Scrapyd command: | @@ -179,6 +192,10 @@ jobs: <<: *test-template docker: - image: cimg/python:3.8 + py39-scrapyd-latest: + <<: *test-template + docker: + - image: cimg/python:3.9 py310-git-postgresql: <<: *test-template docker: @@ -257,15 +274,21 @@ jobs: <<: *test-template docker: - image: cimg/python:3.12 + py312-scrapyd-latest: + <<: *test-template + docker: + - image: cimg/python:3.12 workflows: test: jobs: # - py27: # is-py27: true - - py36 - - py37 + # - py36 + # - py37 - py38 - py39 + - py39-scrapyd-latest: + use-scrapyd-v143: false - py310-git-postgresql: use-git: true use-postgresql: true @@ -281,3 +304,5 @@ workflows: use-mysql: true - py311 - py312 + - py312-scrapyd-latest: + use-scrapyd-v143: false diff --git a/scrapydweb/__version__.py b/scrapydweb/__version__.py index 1818645c..0fce3959 100644 --- a/scrapydweb/__version__.py +++ b/scrapydweb/__version__.py @@ -1,7 +1,7 @@ # coding: utf-8 __title__ = 'scrapydweb' -__version__ = '1.5.0' +__version__ = '1.5.1' __author__ = 'my8100' __author_email__ = 'my8100@gmail.com' __url__ = 'https://github.com/my8100/scrapydweb' diff --git a/scrapydweb/static/v150/css/dropdown.css b/scrapydweb/static/v151/css/dropdown.css similarity index 100% rename from scrapydweb/static/v150/css/dropdown.css rename to scrapydweb/static/v151/css/dropdown.css diff --git a/scrapydweb/static/v150/css/dropdown_mobileui.css b/scrapydweb/static/v151/css/dropdown_mobileui.css similarity index 100% rename from scrapydweb/static/v150/css/dropdown_mobileui.css rename to scrapydweb/static/v151/css/dropdown_mobileui.css diff --git a/scrapydweb/static/v150/css/icon_upload_icon_right.css b/scrapydweb/static/v151/css/icon_upload_icon_right.css similarity index 100% rename from scrapydweb/static/v150/css/icon_upload_icon_right.css rename to scrapydweb/static/v151/css/icon_upload_icon_right.css diff --git a/scrapydweb/static/v150/css/multinode.css b/scrapydweb/static/v151/css/multinode.css similarity index 100% rename from scrapydweb/static/v150/css/multinode.css rename to scrapydweb/static/v151/css/multinode.css diff --git a/scrapydweb/static/v150/css/stacktable.css b/scrapydweb/static/v151/css/stacktable.css similarity index 100% rename from scrapydweb/static/v150/css/stacktable.css rename to scrapydweb/static/v151/css/stacktable.css diff --git a/scrapydweb/static/v150/css/stats.css b/scrapydweb/static/v151/css/stats.css similarity index 100% rename from scrapydweb/static/v150/css/stats.css rename to scrapydweb/static/v151/css/stats.css diff --git a/scrapydweb/static/v150/css/style.css b/scrapydweb/static/v151/css/style.css similarity index 100% rename from scrapydweb/static/v150/css/style.css rename to scrapydweb/static/v151/css/style.css diff --git a/scrapydweb/static/v150/css/style_mobileui.css b/scrapydweb/static/v151/css/style_mobileui.css similarity index 100% rename from scrapydweb/static/v150/css/style_mobileui.css rename to scrapydweb/static/v151/css/style_mobileui.css diff --git a/scrapydweb/static/v150/css/utf8.css b/scrapydweb/static/v151/css/utf8.css similarity index 100% rename from scrapydweb/static/v150/css/utf8.css rename to scrapydweb/static/v151/css/utf8.css diff --git a/scrapydweb/static/v150/css/utf8_mobileui.css b/scrapydweb/static/v151/css/utf8_mobileui.css similarity index 100% rename from scrapydweb/static/v150/css/utf8_mobileui.css rename to scrapydweb/static/v151/css/utf8_mobileui.css diff --git a/scrapydweb/static/v150/element-ui@2.4.6/lib/index.js b/scrapydweb/static/v151/element-ui@2.4.6/lib/index.js similarity index 100% rename from scrapydweb/static/v150/element-ui@2.4.6/lib/index.js rename to scrapydweb/static/v151/element-ui@2.4.6/lib/index.js diff --git a/scrapydweb/static/v150/element-ui@2.4.6/lib/theme-chalk/fonts/element-icons.woff b/scrapydweb/static/v151/element-ui@2.4.6/lib/theme-chalk/fonts/element-icons.woff similarity index 100% rename from scrapydweb/static/v150/element-ui@2.4.6/lib/theme-chalk/fonts/element-icons.woff rename to scrapydweb/static/v151/element-ui@2.4.6/lib/theme-chalk/fonts/element-icons.woff diff --git a/scrapydweb/static/v150/element-ui@2.4.6/lib/theme-chalk/index.css b/scrapydweb/static/v151/element-ui@2.4.6/lib/theme-chalk/index.css similarity index 100% rename from scrapydweb/static/v150/element-ui@2.4.6/lib/theme-chalk/index.css rename to scrapydweb/static/v151/element-ui@2.4.6/lib/theme-chalk/index.css diff --git a/scrapydweb/static/v150/icon/fav.ico b/scrapydweb/static/v151/icon/fav.ico similarity index 100% rename from scrapydweb/static/v150/icon/fav.ico rename to scrapydweb/static/v151/icon/fav.ico diff --git a/scrapydweb/static/v150/icon/fav.png b/scrapydweb/static/v151/icon/fav.png similarity index 100% rename from scrapydweb/static/v150/icon/fav.png rename to scrapydweb/static/v151/icon/fav.png diff --git a/scrapydweb/static/v150/icon/spider-man-spiderman-face-mask-round-avatar-512.png b/scrapydweb/static/v151/icon/spider-man-spiderman-face-mask-round-avatar-512.png similarity index 100% rename from scrapydweb/static/v150/icon/spider-man-spiderman-face-mask-round-avatar-512.png rename to scrapydweb/static/v151/icon/spider-man-spiderman-face-mask-round-avatar-512.png diff --git a/scrapydweb/static/v150/icon/spiderman.png b/scrapydweb/static/v151/icon/spiderman.png similarity index 100% rename from scrapydweb/static/v150/icon/spiderman.png rename to scrapydweb/static/v151/icon/spiderman.png diff --git a/scrapydweb/static/v150/js/common.js b/scrapydweb/static/v151/js/common.js similarity index 100% rename from scrapydweb/static/v150/js/common.js rename to scrapydweb/static/v151/js/common.js diff --git a/scrapydweb/static/v150/js/echarts.min.js b/scrapydweb/static/v151/js/echarts.min.js similarity index 100% rename from scrapydweb/static/v150/js/echarts.min.js rename to scrapydweb/static/v151/js/echarts.min.js diff --git a/scrapydweb/static/v150/js/github_buttons.html b/scrapydweb/static/v151/js/github_buttons.html similarity index 100% rename from scrapydweb/static/v150/js/github_buttons.html rename to scrapydweb/static/v151/js/github_buttons.html diff --git a/scrapydweb/static/v150/js/github_buttons.js b/scrapydweb/static/v151/js/github_buttons.js similarity index 100% rename from scrapydweb/static/v150/js/github_buttons.js rename to scrapydweb/static/v151/js/github_buttons.js diff --git a/scrapydweb/static/v150/js/icons_menu.js b/scrapydweb/static/v151/js/icons_menu.js similarity index 100% rename from scrapydweb/static/v150/js/icons_menu.js rename to scrapydweb/static/v151/js/icons_menu.js diff --git a/scrapydweb/static/v150/js/jquery.min.js b/scrapydweb/static/v151/js/jquery.min.js similarity index 100% rename from scrapydweb/static/v150/js/jquery.min.js rename to scrapydweb/static/v151/js/jquery.min.js diff --git a/scrapydweb/static/v150/js/multinode.js b/scrapydweb/static/v151/js/multinode.js similarity index 100% rename from scrapydweb/static/v150/js/multinode.js rename to scrapydweb/static/v151/js/multinode.js diff --git a/scrapydweb/static/v150/js/stacktable.js b/scrapydweb/static/v151/js/stacktable.js similarity index 100% rename from scrapydweb/static/v150/js/stacktable.js rename to scrapydweb/static/v151/js/stacktable.js diff --git a/scrapydweb/static/v150/js/stats.js b/scrapydweb/static/v151/js/stats.js similarity index 100% rename from scrapydweb/static/v150/js/stats.js rename to scrapydweb/static/v151/js/stats.js diff --git a/scrapydweb/static/v150/js/vue.min.js b/scrapydweb/static/v151/js/vue.min.js similarity index 100% rename from scrapydweb/static/v150/js/vue.min.js rename to scrapydweb/static/v151/js/vue.min.js diff --git a/scrapydweb/templates/scrapydweb/jobs.html b/scrapydweb/templates/scrapydweb/jobs.html index 096f7b49..b3167319 100644 --- a/scrapydweb/templates/scrapydweb/jobs.html +++ b/scrapydweb/templates/scrapydweb/jobs.html @@ -88,7 +88,7 @@