From 8b594576f678b3db2c4f0023782a04d7c3d6932d Mon Sep 17 00:00:00 2001 From: James Date: Tue, 5 Oct 2021 14:04:51 +0100 Subject: [PATCH] requirements: Upgrade all requirements Had to move to html_js_files - add_javascript was deprecated in 1.8! --- docs/conf.py | 5 +--- requirements.in | 3 ++- requirements.txt | 67 ++++++++++++++++++++++++------------------------ 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 07dece7..860cffc 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -142,8 +142,7 @@ ], } - - +html_js_files = ["custom.js"] # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the @@ -490,8 +489,6 @@ def __init__(self,widths): ) def setup(app): - app.add_javascript("custom.js") - import glob global html_static_path for file in glob.glob("../api-specification/_data/api-commons/*.yaml"): diff --git a/requirements.in b/requirements.in index 17f7170..04fb568 100644 --- a/requirements.in +++ b/requirements.in @@ -6,7 +6,8 @@ Sphinx docutils>=0.16,<0.17 sphinx-intl transifex-client -sphinx-rtd-theme +# Keep to version 0.5 at the moment because the next version (1.0) has some breaking changes to the navigation menu +sphinx-rtd-theme>=0.5,<0.6 myst-parser # erd-from-json-table-schema git+https://github.com/OpenDataServices/erd-from-json-table-schema.git diff --git a/requirements.txt b/requirements.txt index 14dc823..2125e1f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,19 +8,19 @@ # via -r requirements.in alabaster==0.7.12 # via sphinx -attrs==19.3.0 +attrs==21.2.0 # via # jsonschema # markdown-it-py -babel==2.8.0 +babel==2.9.1 # via # sphinx # sphinx-intl -certifi==2020.6.20 +certifi==2021.5.30 # via requests -chardet==3.0.4 +charset-normalizer==2.0.6 # via requests -click==7.1.2 +click==8.0.1 # via sphinx-intl docutils==0.16 # via @@ -32,21 +32,23 @@ docutils==0.16 # sphinxcontrib-opendataservices-jsonschema git+https://github.com/OpenDataServices/erd-from-json-table-schema.git # via -r requirements.in -gitdb==4.0.5 +gitdb==4.0.7 # via gitpython -gitpython==3.1.3 +gitpython==3.1.18 # via transifex-client -idna==2.10 +idna==3.2 # via requests imagesize==1.2.0 # via sphinx -importlib-metadata==4.6.1 - # via jsonschema -jinja2==2.11.2 +importlib-metadata==4.8.1 + # via + # click + # jsonschema +jinja2==3.0.2 # via # myst-parser # sphinx -jsonpointer==2.0 +jsonpointer==2.1 # via # sphinxcontrib-opendataservices # sphinxcontrib-opendataservices-jsonschema @@ -58,53 +60,51 @@ markdown-it-py==1.1.0 # via # mdit-py-plugins # myst-parser -markupsafe==1.1.1 +markupsafe==2.0.1 # via jinja2 mdit-py-plugins==0.2.8 # via myst-parser -myst-parser==0.15.1 +myst-parser==0.15.2 # via # -r requirements.in # sphinxcontrib-opendataservices # sphinxcontrib-opendataservices-jsonschema -packaging==20.4 +packaging==21.0 # via sphinx -pygments==2.6.1 +pygments==2.10.0 # via sphinx pygraphviz==1.6 # via erd-from-json-table-schema pyparsing==2.4.7 # via packaging -pyrsistent==0.16.0 +pyrsistent==0.18.0 # via jsonschema python-slugify==4.0.1 # via transifex-client -pytz==2020.1 +pytz==2021.3 # via babel -pyyaml==5.3.1 +pyyaml==5.4.1 # via # myst-parser # sphinxcontrib-openapi -requests==2.24.0 +requests==2.26.0 # via # sphinx # transifex-client -six==1.15.0 +six==1.16.0 # via # jsonschema - # packaging - # pyrsistent # sphinxcontrib-httpdomain # transifex-client -smmap==3.0.4 +smmap==4.0.0 # via gitdb -snowballstemmer==2.0.0 +snowballstemmer==2.1.0 # via sphinx sphinx-intl==2.0.1 # via -r requirements.in sphinx-rtd-theme==0.5.2 # via -r requirements.in -sphinx==3.1.2 +sphinx==4.2.0 # via # -r requirements.in # myst-parser @@ -116,9 +116,9 @@ sphinxcontrib-applehelp==1.0.2 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx -sphinxcontrib-htmlhelp==1.0.3 +sphinxcontrib-htmlhelp==2.0.0 # via sphinx -sphinxcontrib-httpdomain==1.7.0 +sphinxcontrib-httpdomain==1.8.0 # via sphinxcontrib-openapi sphinxcontrib-jsmath==1.0.1 # via sphinx @@ -130,21 +130,22 @@ sphinxcontrib-opendataservices==0.2.0 # via -r requirements.in sphinxcontrib-qthelp==1.0.3 # via sphinx -sphinxcontrib-serializinghtml==1.1.4 +sphinxcontrib-serializinghtml==1.1.5 # via sphinx text-unidecode==1.3 # via python-slugify -transifex-client==0.13.11 +transifex-client==0.14.3 # via -r requirements.in -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via + # gitpython # importlib-metadata # markdown-it-py -urllib3==1.25.9 +urllib3==1.26.7 # via # requests # transifex-client -zipp==3.5.0 +zipp==3.6.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: