diff --git a/.circleci/config.yml b/.circleci/config.yml index 5e5348c..9cd1425 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,11 +11,12 @@ commands: type: string sphinx-version: type: string - default: "1,2,3,4,latest" + default: "1,2,3,4,5,6,latest" steps: - browser-tools/install-browser-tools - checkout - - run: pip install --user tox + # Upgrade tox once https://github.com/tox-dev/tox/issues/2850 is solved. + - run: pip install --user 'tox<4' - run: name: Test with Chrome driver command: tox -e "<>-sphinx{<>}" -- --driver Chrome @@ -24,12 +25,6 @@ commands: command: tox -e "<>-sphinx{<>}" -- --driver Firefox jobs: - py36: - docker: - - image: 'cimg/python:3.6-browsers' - steps: - - run-tox: - version: py36 py37: docker: - image: 'cimg/python:3.7-browsers' @@ -54,14 +49,21 @@ jobs: steps: - run-tox: version: py310 - sphinx-version: 4,latest + sphinx-version: 4,5,6,latest + py311: + docker: + - image: 'cimg/python:3.11-browsers' + steps: + - run-tox: + version: py311 + sphinx-version: 4,5,6,latest workflows: version: 2 tests: jobs: + - py311 - py310 - py39 - py38 - py37 - - py36 diff --git a/docs/conf.py b/docs/conf.py index 94ec1e2..a4d0349 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -68,7 +68,7 @@ # # This is also used if you do content translation via gettext catalogs. # Usually you set "language" from the command line for these cases. -language = None +language = 'en' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. diff --git a/docs/requirements.txt b/docs/requirements.txt index b10cf17..006688d 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -3,7 +3,7 @@ sphinx-prompt==1.5.0 sphinx-tabs==3.2.0 sphinx-rtd-theme==1.0.0 sphinx-notfound-page==0.8 -sphinx-js==3.1 +sphinx-js==3.2.1 # sphinx-js pins jinja to a version that doesn't # pin its version of markupsafe, markupsafe>=2.1 diff --git a/scripts/setup_geckodriver.sh b/scripts/setup_geckodriver.sh index 2f71c06..c9a3c55 100755 --- a/scripts/setup_geckodriver.sh +++ b/scripts/setup_geckodriver.sh @@ -1,4 +1,4 @@ -VERSION=v0.28.0 +VERSION=v0.32.0 wget -N https://github.com/mozilla/geckodriver/releases/download/${VERSION}/geckodriver-${VERSION}-linux64.tar.gz -P ~/ tar xvzf ~/geckodriver-${VERSION}-linux64.tar.gz -C ~/ rm ~/geckodriver-${VERSION}-linux64.tar.gz diff --git a/sphinx_search/static/js/rtd_sphinx_search.js b/sphinx_search/static/js/rtd_sphinx_search.js index 0d22513..c973610 100644 --- a/sphinx_search/static/js/rtd_sphinx_search.js +++ b/sphinx_search/static/js/rtd_sphinx_search.js @@ -586,7 +586,7 @@ const showSearchModal = custom_query => { // removes previous results (if there are any). removeResults(); - $(".search__outer__wrapper").fadeIn(ANIMATION_TIME, () => { + let show_modal = function () { // removes the focus from the initial input field // which as already present in the docs. let search_bar = getInputField(); @@ -608,7 +608,17 @@ const showSearchModal = custom_query => { } search_outer_input.focus(); } - }); + }; + + if (window.jQuery) { + $(".search__outer__wrapper").fadeIn(ANIMATION_TIME, show_modal); + } else { + let element = document.querySelector(".search__outer__wrapper"); + if (element && element.style) { + element.style.display = "block"; + } + show_modal(); + } }; /** @@ -630,7 +640,14 @@ const removeSearchModal = () => { // update url (remove 'rtd_search' param) updateUrl(); - $(".search__outer__wrapper").fadeOut(ANIMATION_TIME); + if (window.jQuery) { + $(".search__outer__wrapper").fadeOut(ANIMATION_TIME); + } else { + let element = document.querySelector(".search__outer__wrapper"); + if (element && element.style) { + element.style.display = "none"; + } + } }; window.addEventListener("DOMContentLoaded", () => { diff --git a/sphinx_search/static/js/rtd_sphinx_search.min.js b/sphinx_search/static/js/rtd_sphinx_search.min.js index ed5d7bb..2b38572 100644 --- a/sphinx_search/static/js/rtd_sphinx_search.min.js +++ b/sphinx_search/static/js/rtd_sphinx_search.min.js @@ -1 +1 @@ -"use strict";var MAX_SUGGESTIONS=50,MAX_SECTION_RESULTS=3,MAX_SUBSTRING_LIMIT=100,ANIMATION_TIME=200,FETCH_RESULTS_DELAY=250,CLEAR_RESULTS_DELAY=300,RTD_SEARCH_PARAMETER="rtd_search",debounce=function(r,n){function e(){var e=this,t=arguments;clearTimeout(o),o=setTimeout(function(){return r.apply(e,t)},n)}var o;return e.cancel=function(){clearTimeout(o),o=null},e},buildSection=function(e,t,r,n){var o=createDomNode("span",{class:"search__result__subheading"});o.innerHTML=t;var a=createDomNode("div",{class:"outer_div_page_results",id:e});a.appendChild(o);for(var c=0;cSearching ....",o.appendChild(e);return debounce(function(){updateUrl(),updateSearchBar();var e=t+"?"+new URLSearchParams(r).toString();fetch(e,{method:"GET"}).then(function(e){if(!e.ok)throw new Error;return e.json()}).then(function(e){var t;0Searching ....",o.appendChild(e);return debounce(function(){updateUrl(),updateSearchBar();var e=t+"?"+new URLSearchParams(r).toString();fetch(e,{method:"GET"}).then(function(e){if(!e.ok)throw new Error;return e.json()}).then(function(e){var t;0